Fixed a long outstanding bug with outputs, added a new control type
Resolved merge conflicts