Misc improvements
Merge branch 'master' of github.com:pangel/roguelike-BDD