Fix for new NAVDATA

and brush my codes up