few more bits from master that we'll just update directly in gh-pages branch from now