Trivial comment fixes and navigation highlighting