Misc changes
launcher