More nav fine tuning