added navigation_feature and some tweaks.