typos and survey
Merge branch 'master' into gh-pages

typos and survey