General cleanup, removed redundancies, added support for turbine port.

Also, sorry @MichiyoRavencroft for removing all that code you wrote :-(