Nav edits and code comments