Tiny bugfixes & roguelike

---