#15 Fixed a couple of highlighting bugs.