Fixes bugs, adds a couple of improvments
Merge branch 'master' of https://github.com/MKLOL/monster

:q