some improvements to navigation