navigation update / bug fixes