Fix most edge-cases of the hallway generator, kind of sloppy