navigation fixes/improvements;