sseveral navigation improvements