more nav fixes, testing