Made a bunch of changes to launch