cleaned up by adding in command line overrides for various defaults