Final Flight 2 Changes

Final changes for flight 2 (hopefully)