improvements to navigator