Syntax highlighting, minor tweaks

Closes #9