Enhancements and fixes to navcode