Approach debug

Fixes for new passage and minor fixes in takeoff