Renamed gate and uprights to match the naming scheme. Added buffers to uprights, and removed unnecessary passcounter and switch.