Syntax highlighting, and grammar fix