Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -re58e3385eaf5e920335f963937b2e9f654a32cfe -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision e58e3385eaf5e920335f963937b2e9f654a32cfe)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -526,8 +526,8 @@
 /*********************************************************************//**
  * @brief
  * The setLoadCellsTareValues function sets the load cells tare values
- * @details Inputs: loadcells[]
- * @details Outputs: none
+ * @details Inputs: none
+ * @details Outputs: loadcells[]
  * @param bufferAddress address to the buffer provided to set the load cells
  * tare values
  * @return none
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra0c1350fb3266a722f91298dde1e97876081cd2e -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a0c1350fb3266a722f91298dde1e97876081cd2e)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -972,7 +972,7 @@
         {
             // SRSDG 400
             if ( ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) && ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -982,7 +982,7 @@
             }
 
             if ( ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) && ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -ra0c1350fb3266a722f91298dde1e97876081cd2e -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision a0c1350fb3266a722f91298dde1e97876081cd2e)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -367,8 +367,6 @@
     // Check if the alarm has been cleared by the user and if yes, continue with the fill
     if ( FALSE == isAlarmActive( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE ) )
     {
-        // Save the HD target fill volume before command 1000 mL fill volume
-
         state  = DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL;
 
         // Start the flush fill.
Index: firmware/App/Modes/ModeGenIdle.h
===================================================================
diff -u -r7e1358a440116fedad5a049d49c2d6f9be85d60e -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Modes/ModeGenIdle.h	(.../ModeGenIdle.h)	(revision 7e1358a440116fedad5a049d49c2d6f9be85d60e)
+++ firmware/App/Modes/ModeGenIdle.h	(.../ModeGenIdle.h)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -48,7 +48,7 @@
 void setBadAvgConductivityDetectedFlag( BOOL badAvgConducitivyflag ); // used by fill mode to signal idle mode of bad average conductivity
 
 DG_GEN_IDLE_MODE_STATE_T getCurrentGenIdleState( void );    // get the current state of generation idle mode
-DG_GEN_IDLE_MODE_BAD_FILL_STATE_T getCurrentGenIdleBadFillState( void );
+DG_GEN_IDLE_MODE_BAD_FILL_STATE_T getCurrentGenIdleBadFillState( void );  // get the current bad fill state
 
 BOOL requestDGStop( void );                 // HD requests DG stop (go back to standby mode)
 
Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r7e1358a440116fedad5a049d49c2d6f9be85d60e -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 7e1358a440116fedad5a049d49c2d6f9be85d60e)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -35,9 +35,8 @@
 
 #define MAX_RESERVOIR_VOLUME_ML         2000            ///< Maximum reservoir volume in mL.
 #define RESERVOIR_EXTRA_TEMPERATURE     2.0F            ///< Reservoirs extra margin temperature.
-#define BAD_FLUSH_FILL_TARGET_VOLUME_ML 1000            ///< Target fill volume in the bad flush fill state in millileters.
+#define BAD_FLUSH_FILL_TARGET_VOLUME_ML 1000            ///< Target fill volume in the bad flush fill state in milliliters.
 
-
 /// Fill command data structure.
 typedef struct
 {