Wording
Navdata improvements