manual fixes + editor syntax highlighting