bugfix and nav ehancement

:beetle: