Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r53f4679556eacdd6a93dd358550b4ea7c7c34962 -rc7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 53f4679556eacdd6a93dd358550b4ea7c7c34962)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision c7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b)
@@ -92,6 +92,7 @@
         // Get the current switch status
         switch ( i )
         {
+            // Process the status of the switches
             case CONCENTRATE_CAP:
                 currentSwitchStatus = ( getFPGAConcentrateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r9226e7b5b52c30057e93453ced523f563fbd89fe -rc7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 9226e7b5b52c30057e93453ced523f563fbd89fe)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b)
@@ -1335,7 +1335,6 @@
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectState )
     }
-
     requestNewOperationMode( nextOpMode );
 }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9226e7b5b52c30057e93453ced523f563fbd89fe -rc7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9226e7b5b52c30057e93453ced523f563fbd89fe)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b)
@@ -1611,7 +1611,6 @@
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevHeatDisinfectState )
     }
-
     requestNewOperationMode( nextOpMode );
 }
 
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r9226e7b5b52c30057e93453ced523f563fbd89fe -rc7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 9226e7b5b52c30057e93453ced523f563fbd89fe)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision c7cf4f78cbf2cc1ed8a19850a94f4d63ef14a26b)
@@ -44,9 +44,9 @@
 // ********** private data **********
 
 #define HEAT_DISINFECT_ACTIVE_COOL_DATA_PUB_INTERVAL    ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                   ///< Mode heat disinfect active cool data publish interval in counts.
-#define ACID_PUMP_SPEED_ML_PER_MIN                      30.6F                                                       ///< Acid concentrate pump speed in mL/min.
+#define ACID_PUMP_SPEED_ML_PER_MIN                      -30.0F                                                      ///< Acid concentrate pump speed in mL/min.
 // The acid pump is 2% faster than the acid pump to create a flow from acid to bicarb line during heat disinfect
-#define BICARB_PUMP_SPEED_ML_PER_MIN                    -30.0F                                                      ///< Bicarb concentrate pump speed in mL/min.
+#define BICARB_PUMP_SPEED_ML_PER_MIN                    30.6F                                                       ///< Bicarb concentrate pump speed in mL/min.
 #define RSRVR_FILL_TIMEOUT_MS                           ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoir fill timeout in milliseconds.
 #define RSRVR_DRAIN_TIMEOUT_MS                          ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoir drain timeout in milliseconds.
 #define RSRVR_DRAIN_STEADY_TIMEOUT_MS                   ( 6 * MS_PER_SECOND )                                       ///< Reservoir drain steady timeout in milliseconds.