various fixes

fixing navigation, standards + minor changes