Loads of bug fixes and additions from DungeonRunner