Formatting improvements, more syntax highlighting