syntax highlighting improvements