Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r3461c140ba07e74863dee1d4c51d0119076fecf8
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3461c140ba07e74863dee1d4c51d0119076fecf8)
@@ -15,10 +15,12 @@
 *
 ***************************************************************************/
 
+#include "ConcentratePumps.h"
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "OperationModes.h"
+#include "Reservoirs.h"
 #include "ROPump.h"
 #include "SystemComm.h"
 #include "Timers.h"
@@ -49,9 +51,8 @@
 /*********************************************************************//**
  * @brief
  * The initStandbyMode function initializes the standby mode module.
- * @details
- * Inputs : none
- * Outputs : Standby mode module initialized
+ * @details Inputs: none
+ * @details Outputs: Standby mode module initialized
  * @return none
  *************************************************************************/
 void initStandbyMode( void )
@@ -65,9 +66,8 @@
 /*********************************************************************//**
  * @brief
  * The transitionToStandbyMode function prepares for transition to standby mode.
- * @details
- * Inputs : none
- * Outputs : Re-initialized standby mode
+ * @details Inputs: none
+ * @details Outputs: Re-initialized standby mode
  * @return none
  *************************************************************************/
 void transitionToStandbyMode( void )
@@ -85,16 +85,19 @@
     signalDrainPumpHardStop();
     stopPrimaryHeater();
     stopTrimmerHeater();
-    // conc. pumps off
+    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1 );
+    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2 );
     // UV off
+
+    resetReservoirLoadCellsOffset( RESERVOIR_1 );
+    resetReservoirLoadCellsOffset( RESERVOIR_2 );
 }
 
 /*********************************************************************//**
  * @brief
  * The execStandbyMode function executes the standby mode state machine.
- * @details
- * Inputs : none
- * Outputs : Standby mode state machine executed
+ * @details Inputs: none
+ * @details Outputs: Standby mode state machine executed
  * @return current state
  *************************************************************************/
 U32 execStandbyMode( void )
@@ -127,9 +130,8 @@
  * @brief
  * The handleStandbyIdleState function executes the idle state of the
  * standby mode state machine.
- * @details
- * Inputs : pendingSampleWaterRequest, pendingStartDGRequest
- * Outputs : Idle state of the standby mode executed
+ * @details Inputs: pendingSampleWaterRequest, pendingStartDGRequest
+ * @details Outputs: Idle state of the standby mode executed
  * @return the next state
  *************************************************************************/
 static DG_STANDBY_MODE_STATE_T handleStandbyIdleState( void )
@@ -163,9 +165,8 @@
  * @brief
  * The handleStandbySampleWaterState function executes the sample water state
  * of the standby mode state machine.
- * @details
- * Inputs : none
- * Outputs : Sample water state of the standby mode executed
+ * @details Inputs: none
+ * @details Outputs: Sample water state of the standby mode executed
  * @return the next state
  *************************************************************************/
 static DG_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void )
@@ -186,9 +187,8 @@
 /*********************************************************************//**
  * @brief
  * The requestWaterSample function handles an HD request to sample water.
- * @details
- * Inputs : standbyState
- * Outputs : pendingSampleWaterRequest
+ * @details Inputs: standbyState
+ * @details Outputs: pendingSampleWaterRequest
  * @return TRUE if request accepted, FALSE if not.
  *************************************************************************/
 BOOL requestWaterSample( void )
@@ -207,9 +207,8 @@
 /*********************************************************************//**
  * @brief
  * The requestDGStart function handles an HD request to start (go to re-circulate mode).
- * @details
- * Inputs : standbyState
- * Outputs : pendingSampleWaterRequest
+ * @details Inputs: standbyState
+ * @details Outputs: pendingSampleWaterRequest
  * @return TRUE if request accepted, FALSE if not.
  *************************************************************************/
 BOOL requestDGStart( void )
@@ -228,9 +227,8 @@
 /*********************************************************************//**
  * @brief
  * The getCurrentStandbyState function returns the current state of standby mode.
- * @details
- * Inputs : standbyState
- * Outputs : none
+ * @details Inputs: standbyState
+ * @details Outputs: none
  * @return the current state of standby mode.
  *************************************************************************/
 DG_STANDBY_MODE_STATE_T getCurrentStandbyState( void )