tweaks and corrections
draining
Merge branch 'master' into gh-pages