minor changes to highlighter