Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r021e6ea5f99fd6da424d8ab81d6a106f2cb41294 -rdc7d3658ccc03992b4f093e36d05cfc8bf5e0598
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 021e6ea5f99fd6da424d8ab81d6a106f2cb41294)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision dc7d3658ccc03992b4f093e36d05cfc8bf5e0598)
@@ -95,18 +95,26 @@
     initStandbyMode();
 
     // set initial actuator states
-    setValveState( VPI, VALVE_STATE_CLOSED );
-    setValveState( VSP, VALVE_STATE_CLOSED );
+    setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+    setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+    setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+    setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+    setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
-    setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+    setValveState( VPI, VALVE_STATE_CLOSED );
+    setValveState( VSP, VALVE_STATE_CLOSED );
+
     signalROPumpHardStop();
     signalDrainPumpHardStop();
     stopPrimaryHeater();
     stopTrimmerHeater();
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
+
     // UV off
+    turnOffUVReactor( INLET_UV_REACTOR );
+    turnOffUVReactor( OUTLET_UV_REACTOR );
 
     resetReservoirLoadCellsOffset( DG_RESERVOIR_1 );
     resetReservoirLoadCellsOffset( DG_RESERVOIR_2 );
@@ -145,7 +153,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, standbyState )     // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE, standbyState )
             standbyState = DG_STANDBY_MODE_STATE_START;
             break;
     }