more improvements to the highlighting