fix some style and typo issues.
attribution.
Merge branch 'master' into gh-pages