Updates to navigation and environment