Minor movearounds and fixes
Merge branch 'master' into gh-pages