Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -r8f5cbb3766f745c63896e76bc6a206e6f5d4dc28
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 8f5cbb3766f745c63896e76bc6a206e6f5d4dc28)
@@ -100,7 +100,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -r8f5cbb3766f745c63896e76bc6a206e6f5d4dc28
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 8f5cbb3766f745c63896e76bc6a206e6f5d4dc28)
@@ -22,7 +22,7 @@
 
 /**
  *  @defgroup ROPump ROPump
- *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump.
+ *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump and the flow meter.
  *  The flow meter is manufactured by SwissFlow, PN: 82015311.
  *  The diaphragm (RO) pump is manufactured by Aquatec, PN: 5889-2MM1-V724DY.
  *
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r9ccd6ebcabbf9991fe49120201e9fd90124a3952 -r8f5cbb3766f745c63896e76bc6a206e6f5d4dc28
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 9ccd6ebcabbf9991fe49120201e9fd90124a3952)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 8f5cbb3766f745c63896e76bc6a206e6f5d4dc28)
@@ -94,11 +94,11 @@
         {
             // Process the status of the switches
             case CONCENTRATE_CAP:
-                currentSwitchStatus =  ( getFPGAConcentrateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = ( getFPGAConcentrateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
 
             case DIALYSATE_CAP:
-                currentSwitchStatus =  ( getFPGADialysateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = ( getFPGADialysateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
                 break;
 
 #ifndef _VECTORCAST_
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -r8f5cbb3766f745c63896e76bc6a206e6f5d4dc28
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8f5cbb3766f745c63896e76bc6a206e6f5d4dc28)
@@ -80,7 +80,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r726a133c94e8a0901ffd5233b3db547f3b6407ca -r8f5cbb3766f745c63896e76bc6a206e6f5d4dc28
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 726a133c94e8a0901ffd5233b3db547f3b6407ca)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8f5cbb3766f745c63896e76bc6a206e6f5d4dc28)
@@ -414,7 +414,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3606,37 +3605,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3775,10 +3743,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3801,7 +3800,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none