changes to launcher + cmake