navi added/some fixes