Some minor changes to the masterscript