Manual Control: Significant bug fixes especially for master valves