Fixed a bunch more commands in teardown and launch