minor subway hideout work and some overworld cleanup