Updated dungeon generation and other fixes