More changes, ready to put in gh-pages