Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r37d6f3341f62349589f63975779c0df952c0cfd4 -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 37d6f3341f62349589f63975779c0df952c0cfd4)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
@@ -255,10 +255,10 @@
  *************************************************************************/
 U32 execBalancingChamberControl( void )
 {
-    updateBalChamberSwitchingPeriod();
-
     LVL_STATE_T bicarbChamberLevel        = getBicarbChamberLevelStatus();
 
+    updateBalChamberSwitchingPeriod();
+
     // Increment counter indicating fill is in progress.
     currentBalChamberSwitchingCounter += 1;
     currentBalChamberFillCounter += 1;
Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -r37d6f3341f62349589f63975779c0df952c0cfd4 -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 37d6f3341f62349589f63975779c0df952c0cfd4)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
@@ -457,11 +457,11 @@
 void execDryBicart( void )
 {
     //( TRUE == getBicarbChamberFillRequested() )
-    //supply dryBicartStartRequest = DRY_BICART_SUPPLY ;
+    //  supply dryBicartStartRequest = DRY_BICART_SUPPLY ;
     //( TRUE == getBicartFillRequested() )
-    //fill dryBicartStartRequest = DRY_BICART_INITIAL_FILL;
+    //  fill dryBicartStartRequest = DRY_BICART_INITIAL_FILL;
     //( TRUE == getBicartDrainRequested() )
-    //drain dryBicartStartRequest = DRY_BICART_DRAIN;
+    //  drain dryBicartStartRequest = DRY_BICART_DRAIN;
     //else idle dryBicartStartRequest = DRY_BICART_IDLE;
     updateDrybicartOperation();
 
@@ -1178,11 +1178,12 @@
         //if(FP_MODE_GENP == getCurrentFPOperationMode())
         {
             // TODO: pre gen should start the D12 pump and D14 valve
-            //setValveState( D14_VALV, VALVE_STATE_OPEN );
+            setValveState( D14_VALV, VALVE_STATE_OPEN );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM_B1_9_B2_0, TRUE );
 
             state = DRY_BICART_FILL_WATER_START_STATE;
         }
+        // alrm
     }
 
     return state;
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r323024b3c7b988f4da87d3e5ef54f395db1142f8 -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 323024b3c7b988f4da87d3e5ef54f395db1142f8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
@@ -722,12 +722,12 @@
             if ( D5_HEAT == heater )
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON;
-                isLevelLow  = ( ( getFloaterStatus( D6_LEVL ) != LVL_STATE_EMPTY )? FALSE : TRUE );
+                isLevelLow  = ( ( getFloaterStatus( D6_LEVL ) != LVL_STATE_EMPTY ) ? FALSE : TRUE );
             }
             else
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON;
-                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != LEVEL_STATE_LOW )? FALSE : TRUE );
+                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != LEVEL_STATE_LOW ) ? FALSE : TRUE );
             }
 
             checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F );
Index: firmware/App/Modes/FPModes/StateFlushPermeate.c
===================================================================
diff -u -r7aa0c684cca238a9697867ff72e5c3f5f2edb379 -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0
--- firmware/App/Modes/FPModes/StateFlushPermeate.c	(.../StateFlushPermeate.c)	(revision 7aa0c684cca238a9697867ff72e5c3f5f2edb379)
+++ firmware/App/Modes/FPModes/StateFlushPermeate.c	(.../StateFlushPermeate.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
@@ -209,7 +209,6 @@
                 state = PERM_FLUSH_PAUSED;
             }
         }
-
     }
 
     return state;
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r37d6f3341f62349589f63975779c0df952c0cfd4 -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 37d6f3341f62349589f63975779c0df952c0cfd4)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
@@ -613,17 +613,15 @@
  * the level sensor to override and the state to override the level sensor to.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-
 BOOL testDDFloaterLevelStateOverride( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-
     BOOL                          result = FALSE;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
     if ( ( payload.index >= D6_LEVL ) && ( payload.index <= D6_LEVL ) )
     {
-        BOOL result = u32ArrayOverride( message, &status[0], D6_LEVL, 0, NUM_OF_LVL_STATES -1 );
+        result = u32ArrayOverride( message, &status[0], D6_LEVL, 0, NUM_OF_LVL_STATES -1 );
     }
 
     return result;
@@ -659,13 +657,12 @@
 BOOL testFPFloaterLevelStateOverride( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-
     BOOL                          result = FALSE;
     OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
     if ( ( payload.index >= P25_LEVL ) && ( payload.index <= P25_LEVL ) )
     {
-        BOOL result = u32ArrayOverride( message, &status[ 0 ], P25_LEVL, 0, NUM_OF_LVL_STATES -1 );
+        result = u32ArrayOverride( message, &status[ 0 ], P25_LEVL, 0, NUM_OF_LVL_STATES -1 );
     }
 
     return result;