Add syntax highlighting, minor improvements