new tiny version for speediness
a few loose ends
Merge branch 'master' into gh-pages