some more updates
Merge branch 'working-copy' into gh-pages