Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r4545a748791772cb1f21ea5e8fbbf661b7f8a062 -r4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b)
@@ -295,7 +295,7 @@
         setValveState( VSP, VALVE_STATE_CLOSED );
         setValveState( VPI, VALVE_STATE_OPEN );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
+        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setROPumpTargetPressure( 120, PUMP_CONTROL_MODE_CLOSED_LOOP );
 #ifdef EMC_TEST_BUILD
@@ -625,7 +625,7 @@
  * @details
  * Inputs : none
  * Outputs : measuredROFlowRateLPM
- * @param value : override measured RO pump motor speed (in RPM)
+ * @param value : override measured RO pump motor speed (in LPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetMeasuredROFlowRateOverride( F32 value )
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rb3b1fa54f778d9f202c28bb1970db2616367f0b1 -r4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision b3b1fa54f778d9f202c28bb1970db2616367f0b1)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b)
@@ -116,9 +116,9 @@
 
     // determine which load cell to use for drain volume - we want weight of inactive reservoir
 #ifndef BETA_V1_BUILD
-    if ( RESERVOIR_2 == getActiveReservoir() )
-#else
     if ( RESERVOIR_1 == getActiveReservoir() )
+#else
+    if ( RESERVOIR_2 == getActiveReservoir() )
 #endif
     {
         drainWeightLoadCell = LOAD_CELL_B1;
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4545a748791772cb1f21ea5e8fbbf661b7f8a062 -r4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b)
@@ -157,9 +157,9 @@
 
     // determine which load cell to use for fill volume - we want weight of inactive reservoir
 #ifndef BETA_V1_BUILD
-    if ( RESERVOIR_2 == getActiveReservoir() )
-#else
     if ( RESERVOIR_1 == getActiveReservoir() )
+#else
+    if ( RESERVOIR_2 == getActiveReservoir() )
 #endif
     {
         fillWeightLoadCell = LOAD_CELL_B1;
Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -r6e0385d7c36a79244119d77b61ed01182b3c4d9f -r4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 6e0385d7c36a79244119d77b61ed01182b3c4d9f)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 4c20f6a3d8c8ff33d2dff4ba27e0732c7614378b)
@@ -14,6 +14,8 @@
  *
  **************************************************************************/
 
+#include "etpwm.h"
+
 #include "DrainPump.h"
 #include "FPGA.h"
 #include "Heaters.h"
@@ -83,6 +85,13 @@
     startPrimaryHeater();
     // UV on
     // conc. pumps off
+
+    {   // TODO - test code to start the fan since we're turning the heater on
+        F32 fanPWM = 0.25;
+        etpwmSetCmpA( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+        etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+    }
+
 }
 
 /*********************************************************************//**