Update

Update to search, nav, and avoidance