Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r1f91b5a53bda942b0967817bbd5e68a499dbf816 -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1f91b5a53bda942b0967817bbd5e68a499dbf816)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
@@ -109,8 +109,6 @@
 static SALINE_BOLUS_STATE_T handleSalineBolusInProgressState( DIALYSIS_STATE_T *dialysisState );
 static SALINE_BOLUS_STATE_T handleSalineBolusMaxDeliveredState( DIALYSIS_STATE_T *dialysisState );
 
-static void startHeparinPump( void );
-
 static void checkUFAccuracyAndVolume( void );
 static void updateUFVolumes( void );
 
@@ -130,15 +128,17 @@
 {
     U16 i;
 
-    currentDialysisState = DIALYSIS_START_STATE;
-    currentUFState = UF_START_STATE;
+    currentDialysisState = DIALYSIS_UF_STATE;
+    currentUFState = UF_RUNNING_STATE;
     currentSalineBolusState = SALINE_BOLUS_STATE_IDLE;
 
+    lastUFTimeStamp = getMSTimerCount();
+    uFTimeMS = 0;
+
     refUFVolume = 0.0;
     measUFVolume = 0.0;
     measUFVolumeFromPriorReservoirs = 0.0;
-    // Send reset UF volumes to dialysate outlet pump
-    setDialOutUFVolumes( refUFVolume, measUFVolume );
+    setDialOutUFVolumes( refUFVolume, measUFVolume );  // Send reset UF volumes to dialysate outlet pump driver
 
     uFTimeMS = 0;
     lastUFTimeStamp = 0;
@@ -154,11 +154,12 @@
     uFAccuracyCheckTimerCtr = 0;
     lastUFVolumeChecked = 0.0;
 
-    for (i=0; i<NUM_OF_LOAD_CELLS; i++)
+    for ( i = 0; i < NUM_OF_LOAD_CELLS; i++ )
     {
         lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
         lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
     }
+
     resetSalineBolus();
 }
 
@@ -210,42 +211,38 @@
     // Send dialysate outlet pump latest UF volumes
     setDialOutUFVolumes( refUFVolume, measUFVolume );
 
-    // Inform DG interface that dialysis has started/resumed
-    dialysisResumed();
-
     resetReservoirsVariables();
 
     // Set valves for dialysis
     setValvePosition( VDI, VALVE_POSITION_B_OPEN );
     setValvePosition( VDO, VALVE_POSITION_B_OPEN );
     setValvePosition( VBA, VALVE_POSITION_B_OPEN );
     setValvePosition( VBV, VALVE_POSITION_B_OPEN );
-    // Restart pumps
 
+    // Restart pumps
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP ) )
     {
         mode = PUMP_CONTROL_MODE_OPEN_LOOP;
     }
 #endif
-
     setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, mode );
-
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP ) )
     {
         mode = PUMP_CONTROL_MODE_OPEN_LOOP;
     }
 #endif
-
     setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode );
-
     setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+
     // Start Heparin pump as appropriate
     startHeparinPump();
+
     // Tell DG to start heating dialysate
     cmdStartDGTrimmerHeater();
 
+    // Start auto-control of air trap valve
     startAirTrapControl();
 
     // Set user alarm recovery actions allowed in this sub-mode
@@ -262,7 +259,7 @@
  * @details Outputs: Syringe pump started/stopped as appropriate
  * @return none
  *************************************************************************/
-static void startHeparinPump( void )
+void startHeparinPump( void )
 {
     HEPARIN_STATE_T currentHeparinState = getHeparinState();
     U32 preStop  = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
@@ -631,10 +628,6 @@
     // Dialysis state machine
     switch ( currentDialysisState )
     {
-        case DIALYSIS_START_STATE:
-            currentDialysisState = DIALYSIS_UF_STATE;
-            break;
-
         case DIALYSIS_UF_STATE:
             currentDialysisState = handleDialysisUltrafiltrationState();
             break;
@@ -648,6 +641,9 @@
             break;
     }
 
+    // Calculate UF measured volume and provide to dialysate outlet pump controller (watch UF regardless of dialysis state)
+    updateUFVolumes();
+
     if ( priorSubState != currentDialysisState )
     {
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDialysisState );
@@ -677,19 +673,10 @@
         stopSyringePump();
         setHeparinCompleted();
     }
-    // TODO - find a better way to start continuous delivery after bolus completes
-    if ( HEPARIN_STATE_STOPPED == getHeparinState() )
-    {
-        startHeparinPump();
-    }
 
     // Handle current ultrafiltration state
     switch ( currentUFState )
     {
-        case UF_START_STATE:
-            currentUFState = handleUFStartState( &result );
-            break;
-
         case UF_PAUSED_STATE:
             currentUFState = handleUFPausedState( &result );
             break;
@@ -760,27 +747,9 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFStartState function handles the Start state of the
- * ultrafiltration state machine.
- * @details Inputs: maxUFVolumeML
- * @details Outputs: if ultrafiltration prescribed, ultrafiltration time is
- * initialized.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state.
- *************************************************************************/
-static UF_STATE_T handleUFStartState( DIALYSIS_STATE_T *dialysisState )
-{
-    lastUFTimeStamp = getMSTimerCount();
-    uFTimeMS = 0;
-
-    return UF_RUNNING_STATE;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleUFPausedState function handles the Paused state of the
  * ultrafiltration state machine.
- * @details Inputs: none
+ * @details Inputs: salineBolusStartRequested
  * @details Outputs: if ultrafiltration resumption requested, UF time is set to resume.
  * @param dialysisState next dialysis state
  * @return next ultrafiltration state.
@@ -789,9 +758,6 @@
 {
     UF_STATE_T result = UF_PAUSED_STATE;
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {
@@ -839,9 +805,6 @@
         setUFRate = 0.0;
     }
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {
@@ -909,6 +872,7 @@
     {
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
+        expectedSalineBolusVolume_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
 
         // Bypass dialyzer
@@ -943,7 +907,7 @@
     F32 timeSinceLastVolumeUpdateMin = (F32)calcTimeSince( bolusSalineLastVolumeTimeStamp ) / (F32)( MS_PER_SECOND * SEC_PER_MIN );
     F32 bolusTargetVolume = (F32)getTreatmentParameterU32( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
     F32 maxBolusErrorMl = bolusTargetVolume * MAX_BOLUS_ERROR_PCT;
-    F32 bldFlowRate = getMeasuredBloodFlowRate();  // TODO - should I use raw flow instead of filtered here???
+    F32 bldFlowRate = getMeasuredBloodFlowRate();
     F32 volSinceLastUpdateMl = bldFlowRate * timeSinceLastVolumeUpdateMin;
     F32 expVolSinceLastUpdateMl = (F32)getTargetBloodFlowRate() * timeSinceLastVolumeUpdateMin;
 
@@ -986,7 +950,7 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE, bolusSalineVolumeDelivered_mL, expectedSalineBolusVolume_mL );
                 errorFound = TRUE;
                 result = SALINE_BOLUS_STATE_IDLE;
             }
@@ -1097,7 +1061,7 @@
     }
 
     // Check total UF volume error
-    if ( ( fabs( refUFVolume - measUFVolume ) ) >= (F32)MAX_UF_ACCURACY_ERROR_ML )
+    if ( ( fabs( refUFVolume - measUFVolume ) ) > (F32)MAX_UF_ACCURACY_ERROR_ML )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )