some more changes to syntax highlighting