Tidying up Launcher.
Incremental improvements