bunch of Nav improvements. house cleannig.