added traps, tweaked DungeonCollision,-Builder etc.