Address fix and syntax highlighting