Fixed some of the highlighting issues.