Fixed up the dungeon matching and drawing code.