Add comments and clean up some sections.
Merge branch 'master' into gh-pages