bugfixes and tuning for approach_controller