fix indent, and tweak syntax highlights