more bugfixes
Merge branch 'master' of https://github.com/Walkingmage/OHLALA