support for color-highlight, minor tweaks