Fixed some override issues in ControlUnit as well as modified Buoy slightly