Improve text contrast when highlighted.
Tidy up comments.