Gh-pages: various tweaks and cleanup

Sorry for not splitting this up, but I made the patches a long time ago...