Changes to takeoff and landing

Implements possible permanent fixes for takeoff and landing.