Further amendments to Stop start collectors script

Please don't merge this till we're done!