Minor changes to script and defaults