fixed some issues in hallway/branch generation