Merged Highlighting issues fix

Merged Steven and Erics work