Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r1c74566ff86f1df5e1929b8715d68715dc21a93b -r51bdd8eedc05856cf35998d1348e3138edecfaf8
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
@@ -119,6 +119,7 @@
     checkInletPressure();
     checkRORejectionRatio();
 
+    // Transition to generation idle mode when HD is not communicating
     if ( FALSE == isHDCommunicating() )
     {
         requestNewOperationMode( DG_MODE_GENE );
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r1c74566ff86f1df5e1929b8715d68715dc21a93b -r51bdd8eedc05856cf35998d1348e3138edecfaf8
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
@@ -58,7 +58,7 @@
         /* INIT     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_INIT, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* STAN     */{ DG_MODE_FAUL, DG_MODE_SERV, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM },
         /* SOLO     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_HEAT, DG_MODE_CHEM /*DG_MODE_NLEG*/ }, // TODO for testing only
-        /* CIRC     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
+        /* GENE     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* FILL     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_FILL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* DRAI     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_NLEG, DG_MODE_GENE, DG_MODE_NLEG, DG_MODE_DRAI, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG },
         /* FLUS     */{ DG_MODE_FAUL, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_STAN, DG_MODE_SOLO, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_NLEG, DG_MODE_FLUS, DG_MODE_NLEG, DG_MODE_NLEG },
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r5d82009d1baa2b52122065934481745bf4de223b -r51bdd8eedc05856cf35998d1348e3138edecfaf8
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 5d82009d1baa2b52122065934481745bf4de223b)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
@@ -70,7 +70,6 @@
     can1ParityCnt       = 0;
 
     // initialize various time windowed counts for monitoring CAN & UART errors and warnings
-//    initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PASSIVE, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_UART_FRAME_ERROR, MAX_COMM_ERRORS, COMM_ERROR_TIME_WINDOW_MS );
@@ -184,16 +183,8 @@
         }
         else if ( notification & canLEVEL_WARNING )
         {
-            can1WarningCnt++;
+            can1WarningCnt++;
         }
-        else if ( notification & canLEVEL_PASSIVE )
-        {
-            can1PassiveCnt++;
-//            if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PASSIVE ) )
-//            {
-//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PASSIVE_WARNING )
-//            }
-        }
         else
         {
             // ignore - other notifications undefined
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r1c74566ff86f1df5e1929b8715d68715dc21a93b -r51bdd8eedc05856cf35998d1348e3138edecfaf8
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 1c74566ff86f1df5e1929b8715d68715dc21a93b)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
@@ -130,7 +130,7 @@
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-#ifndef V_2_SYSTEM
+#ifdef V_2_SYSTEM
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
 #endif
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
@@ -141,7 +141,7 @@
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-#ifndef V_2_SYSTEM
+#ifdef V_2_SYSTEM
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
 #endif
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
@@ -397,12 +397,12 @@
 
 /*********************************************************************//**
  * @brief
- * The getReservoirWeight function returns the large filtered weight
+ * The getReservoirWeight function returns the small filtered weight
  * of the reservoir's associated load cell.
  * @details Inputs: associatedLoadCell[]
  * @details Outputs: none
  * @param reservoirId id of reservoir to get weight from
- * @return large filtered weight
+ * @return small filtered weight
  *************************************************************************/
 F32 getReservoirWeight( DG_RESERVOIR_ID_T reservoirId )
 {