validator checks & corrections
Merge branch 'master' into gh-pages