syntax highlighting and some commens added