bug fixes to launcher