more bugfixes
Merge branch 'master' of ssh://github.com/moritzg91/rwb
MOAR bugs