More overhaul of the startup scripts