Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rc6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2 -r4459be59bdc2896b44bcf6cd42d2762190e23c16
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision c6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4459be59bdc2896b44bcf6cd42d2762190e23c16)
@@ -77,8 +77,8 @@
 
 /*********************************************************************//**
  * @brief
- * The initDialysis function initializes the Dialysis sub-mode module. \n
- * Calling this function will reset dialysis and therefore should only \n
+ * The initDialysis function initializes the Dialysis sub-mode module.
+ * Calling this function will reset dialysis and therefore should only
  * be called when a new treatment is due to begin.
  * @details
  * Inputs : none
@@ -112,10 +112,10 @@
 
 /*********************************************************************//**
  * @brief
- * The transitionToDialysis function prepares for transition to dialysis sub-mode. \n
- * This function will reset anything required for resuming dialysis in a \n
- * treatment that has already begun.  It does not reset everything as dialysis \n
- * may be stopped and resumed multiple times due to alarms or user intervention \n
+ * The transitionToDialysis function prepares for transition to dialysis sub-mode.
+ * This function will reset anything required for resuming dialysis in a
+ * treatment that has already begun.  It does not reset everything as dialysis
+ * may be stopped and resumed multiple times due to alarms or user intervention
  * and we don't want to start the treatment all over again.
  * @details
  * Inputs : none
@@ -129,8 +129,8 @@
 
 /*********************************************************************//**
  * @brief
- * The setDialysisParams function sets the dialysis treatment parameters. \n
- * This function should be called prior to beginning dialysis treatment \n
+ * The setDialysisParams function sets the dialysis treatment parameters.
+ * This function should be called prior to beginning dialysis treatment
  * and when the user changes one or more parameters during treatment.
  * @details
  * Inputs : none
@@ -156,8 +156,8 @@
 
 /*********************************************************************//**
  * @brief
- * The startDialysis function starts/resumes dialysis.  This function \n
- * will be called by Treatment Mode when beginning or resuming dialysis \n
+ * The startDialysis function starts/resumes dialysis.  This function
+ * will be called by Treatment Mode when beginning or resuming dialysis
  * treatment.
  * @details
  * Inputs : none
@@ -176,8 +176,8 @@
 
 /*********************************************************************//**
  * @brief
- * The stopDialysis function stops dialysis.  This function will be called \n
- * by Treatment Mode when an alarm occurs or the user pressed the stop button. \n
+ * The stopDialysis function stops dialysis.  This function will be called
+ * by Treatment Mode when an alarm occurs or the user pressed the stop button.
  * Dialysis may be resumed later.
  * @details
  * Inputs : none
@@ -219,7 +219,7 @@
 
 /*********************************************************************//**
  * @brief
- * The getUltrafiltrationVolumeCollected function gets the current ultrafiltration \n
+ * The getUltrafiltrationVolumeCollected function gets the current ultrafiltration
  * volume collected so far for current treatment.
  * @details
  * Inputs : measUFVolume, measUFVolumeFromPriorReservoirs
@@ -357,7 +357,7 @@
             currentDialysisState = handleDialysisUltrafiltrationState();
             break;
 
-        case DIALYSIS_SOLUTION_INFUSION_STATE:
+        case DIALYSIS_SALINE_BOLUS_STATE:
             currentDialysisState = handleDialysisSolutionInfusionState();
             break;
 
@@ -369,7 +369,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleDialysisUltrafiltrationState function handles the ultrafiltration \n
+ * The handleDialysisUltrafiltrationState function handles the ultrafiltration
  * state of the Dialysis state machine.
  * @details
  * Inputs : currentUFState
@@ -412,7 +412,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleDialysisSolutionInfusionState function handles the solution \n
+ * The handleDialysisSolutionInfusionState function handles the solution
  * infustion state of the Dialysis state machine.
  * @details
  * Inputs : TBD
@@ -421,7 +421,7 @@
  *************************************************************************/
 static DIALYSIS_STATE_T handleDialysisSolutionInfusionState( void )
 {
-    DIALYSIS_STATE_T result = DIALYSIS_SOLUTION_INFUSION_STATE;
+    DIALYSIS_STATE_T result = DIALYSIS_SALINE_BOLUS_STATE;
 
     // TODO -
 
@@ -430,7 +430,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFStartState function handles the Start state of the \n
+ * The handleUFStartState function handles the Start state of the
  * ultrafiltration state machine.
  * @details
  * Inputs : maxUFVolumeML
@@ -458,7 +458,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFPausedState function handles the Paused state of the \n
+ * The handleUFPausedState function handles the Paused state of the
  * ultrafiltration state machine.
  * @details
  * Inputs : none
@@ -484,11 +484,11 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFRunningState function handles the Running state of the \n
+ * The handleUFRunningState function handles the Running state of the
  * ultrafiltration state machine.
  * @details
  * Inputs : ms timer, lastUFTimeStamp
- * Outputs : UF timer incremented, UF volumes updated and provided to DPo \n
+ * Outputs : UF timer incremented, UF volumes updated and provided to DPo
  * pump controller.
  * @return next ultrafiltration state.
  *************************************************************************/
@@ -526,7 +526,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFCompletedOrOffState function handles the UF Off state \n
+ * The handleUFCompletedOrOffState function handles the UF Off state
  * of the ultrafiltration state machine.
  * @details
  * Inputs : none
@@ -545,7 +545,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFCompletedState function handles the UF Completed \n
+ * The handleUFCompletedState function handles the UF Completed
  * state of the ultrafiltration state machine.  This is a terminal state.
  * @details
  * Inputs : none
@@ -564,7 +564,7 @@
 
 /*********************************************************************//**
  * @brief
- * The checkUF function checks ultrafiltration accuracy for the last \n
+ * The checkUF function checks ultrafiltration accuracy for the last
  * minute and checks total UF volume.  Triggers an alarm if out of spec.
  * @details
  * Inputs : uFAccuracyCheckTimerCtr, lastUFVolumeChecked, measUFVolume
@@ -601,9 +601,9 @@
 
 /*********************************************************************//**
  * @brief
- * The updateUFVolumes function updates the ultrafiltration volumes based on \n
- * set UF rate, latest UF elapsed time, and the latest load cell weight for the \n
- * currently used reservoir.  Updated UF volumes are then sent to the dialysate \n
+ * The updateUFVolumes function updates the ultrafiltration volumes based on
+ * set UF rate, latest UF elapsed time, and the latest load cell weight for the
+ * currently used reservoir.  Updated UF volumes are then sent to the dialysate
  * outlet pump controller.
  * @details
  * Inputs : setUFRate, uFTimeMS, load cell weight
@@ -633,8 +633,8 @@
 
 /*********************************************************************//**
  * @brief
- * The setStartReservoirVolume function updates the baseline volume of the \n
- * next reservoir to be drawn from before it is switched to (i.e. while it \n
+ * The setStartReservoirVolume function updates the baseline volume of the
+ * next reservoir to be drawn from before it is switched to (i.e. while it
  * is the inactive reservoir) in order to get a more stable volume.
  * @details
  * Inputs : active reservoir, load cell reading from inactive reservoir
@@ -665,8 +665,8 @@
 
 /*********************************************************************//**
  * @brief
- * The signalReservoirsSwitched function informs this module that the \n
- * reservoirs have been switched.  The UF volume from prior reservoirs is \n
+ * The signalReservoirsSwitched function informs this module that the
+ * reservoirs have been switched.  The UF volume from prior reservoirs is
  * tentatively added to with a load cell reading of the inactive reservoir.
  * @details
  * Inputs : resFinalVolume[], resStartVolume[]
@@ -684,8 +684,8 @@
 
 /*********************************************************************//**
  * @brief
- * The setFinalReservoirVolume function updates the UF volume from prior reservoirs \n
- * with a more stable final reservoir volume of the prior reservoir after it's \n
+ * The setFinalReservoirVolume function updates the UF volume from prior reservoirs
+ * with a more stable final reservoir volume of the prior reservoir after it's
  * had a moment to settle.
  * @details
  * Inputs : active reservoir, load cell reading from inactive reservoir