Edits and better syntax highlighting