These are the changes to try and make running this easier for Phil. Parameters that should be set in config has been moved back.