Various changes, includes test dungeon