various bugfixes
Merge branch 'master' of github.com:una/blackout-bunny