bugfixes (from gh-pages)