Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rb01c6571b1ffade6de3e0bf6890de918f4d8b47d -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision b01c6571b1ffade6de3e0bf6890de918f4d8b47d)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -1052,8 +1052,8 @@
 static void updateUFVolumes( void )
 {
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    LOAD_CELL_ID_T lc = ( activeRes == DG_RESERVOIR_1 ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
-    F32 latestResVolume = getLoadCellWeight( lc );
+    LOAD_CELL_ID_T loadCell = ( activeRes == DG_RESERVOIR_1 ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY );
+    F32 latestResVolume = getLoadCellWeight( loadCell );
 #ifndef DISABLE_UF_ALARMS
     F32 deltaVolume = latestResVolume - resFinalVolume[ activeRes ];
 
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -44,7 +44,7 @@
  *************************************************************************/
 void initFaultMode( void )
 {
-    // nothing to do here
+    // Nothing to do here
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -1462,7 +1462,7 @@
 /*********************************************************************//**
  * @brief
  * The getFPGASyringePumpADCChannel0 function gets the latest syringe pump ADC
- * channel 0 register reading.
+ * channel 0 register reading (syringe pump force sensor).
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last syringe pump ADC channel 0 reading
@@ -1475,7 +1475,7 @@
 /*********************************************************************//**
  * @brief
  * The getFPGASyringePumpADCChannel1 function gets the latest syringe pump ADC
- * channel 1 register reading.
+ * channel 1 register reading (syringe detection switch).
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last syringe pump ADC channel 1 reading
@@ -1488,7 +1488,7 @@
 /*********************************************************************//**
  * @brief
  * The getFPGASyringePumpADCChannel2 function gets the latest syringe pump ADC
- * channel 2 register reading.
+ * channel 2 register reading (syringe pump home position sensor).
  * @details Inputs: fpgaSensorReadings
  * @details Outputs: none
  * @return last syringe pump ADC channel 2 reading
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -1184,10 +1184,14 @@
             handleTreatmentParametersFromUI( message );
             break;
 
-        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
-            handleUIStartTreatmentMsg( message );
+        case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
+            handleInitiateTreatmentRequest( message );
             break;
 
+        case MSG_ID_UI_START_TREATMENT_REQUEST:
+            handleStartTreatmentRequest( message );
+            break;
+
         case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
             handleUIUserConfirmTreatmentParameters( message );
             break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -452,7 +452,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE;
+    msg.hdr.msgID = MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE;
     msg.hdr.payloadLen = sizeof( U32 ) * 2;
 
     memcpy( payloadPtr, &accepted, sizeof( U32 ) );
@@ -1920,14 +1920,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIStartTreatmentMsg function handles a treatment start/cancel
+ * The handleInitiateTreatmentRequest function handles a treatment initiate/cancel
  * message from the UI.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleUIStartTreatmentMsg( MESSAGE_T *message )
+void handleInitiateTreatmentRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -1937,17 +1937,13 @@
 
         memcpy( &cmd, message->payload, sizeof(U32) );
 
-        if ( 0 == cmd )         // Initiate treatment (go to treatment params mode)
+        if ( 0 == cmd )         // Cancel treatment (return from aborted treatment params mode)
         {
-            result = signalUserStartingTreatment();
-        }
-        else if ( 1 == cmd )    // Cancel treatment (return from aborted treatment params mode)
-        {
             result = signalUserCancelTreatment();
         }
-        else if ( 2 == cmd )    // Start treatment
+        else if ( 1 == cmd )    // Initiate treatment (go to treatment params mode)
         {
-            result = signalUserBeginningTreatment();
+            result = signalUserStartingTreatment();
         }
     }
 
@@ -1956,6 +1952,27 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleStartTreatmentRequest function handles a treatment start
+ * message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleStartTreatmentRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        result = signalUserBeginningTreatment();
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendTreatmentStartResponseMsg function constructs a treatment start
  * request response message to the UI and queues the msg for transmit on
  * the appropriate CAN channel.
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rb01c6571b1ffade6de3e0bf6890de918f4d8b47d -rba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b01c6571b1ffade6de3e0bf6890de918f4d8b47d)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ba15d3e6250e8cd3cd3ef39cb64a93f91c3caba2)
@@ -95,9 +95,12 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( MESSAGE_T *message );
 
+// MSG_ID_UI_INITIATE_TREATMENT_REQUEST
+void handleInitiateTreatmentRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );