More overhaul of the startup scripts
4 files changed