Clean up the startup script a bit more. Should be mostly usable now.