Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r848865316d989b1e541b234aefcb99891c92a481 -r3477dd649f67442ad4bdea810ce5a251c1b0a2bf
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 848865316d989b1e541b234aefcb99891c92a481)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 3477dd649f67442ad4bdea810ce5a251c1b0a2bf)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
- *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- *  @file Dialysis.c
- *
- *  @date 15-Jan-2020
- *  @author S. Nash
- *
- *  @brief State machine for the dialysis sub-mode of treatment mode.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file Dialysis.c
+*
+* @author (last) Sean Nash
+* @date (last) 24-Jun-2020
+*
+* @author (original) Sean
+* @date (original) 15-Jan-2020
+*
+***************************************************************************/
 
 #include "BloodFlow.h"
 #include "Buttons.h"
@@ -33,8 +34,8 @@
 // ********** private definitions **********
 
 #define MAX_UF_RATE_ML_PER_MIN                  45.83                           ///< Maximum ultrafiltration rate in mL/min (2750 mL/hr).
-#define MAX_UF_ACCURACY_ERROR_ML                25.0                            ///< Maximum ultrafiltration accuracy error in mL over the entire treatment.
-#define UF_ACCURACY_CHECK_INTERVAL          ((1 * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL)  ///< Ultrafiltration rate accuracy check interval count
+#define MAX_UF_ACCURACY_ERROR_ML                250.0                           ///< Maximum ultrafiltration accuracy error in mL over the entire treatment.
+#define UF_ACCURACY_CHECK_INTERVAL              ((1 * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL)  ///< Ultrafiltration rate accuracy check interval count
 
 // ********** private data **********
 
@@ -165,8 +166,8 @@
 {
     lastUFTimeStamp = getMSTimerCount();
     setDialOutUFVolumes( refUFVolume, measUFVolume );
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     // TODO - Heparin pump
 }
@@ -354,12 +355,12 @@
             currentDialysisState = handleDialysisUltrafiltrationState();
             break;
 
-        case DIALYSIS_SOLUTION_INFUSION_STATE:
+        case DIALYSIS_SALINE_BOLUS_STATE:
             currentDialysisState = handleDialysisSolutionInfusionState();
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_STATE, currentDialysisState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_STATE, currentDialysisState )
             break;
     }
 }
@@ -400,7 +401,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, currentUFState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, currentUFState )
             break;
     }
 
@@ -418,7 +419,7 @@
  *************************************************************************/
 static DIALYSIS_STATE_T handleDialysisSolutionInfusionState( void )
 {
-    DIALYSIS_STATE_T result = DIALYSIS_SOLUTION_INFUSION_STATE;
+    DIALYSIS_STATE_T result = DIALYSIS_SALINE_BOLUS_STATE;
 
     // TODO -