improved navigation-array, code improvements