Add section about comments, also fix some code blocks
Merge branch 'master' into gh-pages