Flight 74: A few tweaks and updates

New fixes and tweaks