More bug fixes

Trying to get “nav” to work!