Minor improvements to Tombs, some map feature spawning changes