added some comments overwritings and some navigation fixes