fixed highlighting erros, should be much more consistent now