some more on navigation. not perfect