Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -re22cea17af706bcdaed705302094b096818147b0
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision e22cea17af706bcdaed705302094b096818147b0)
@@ -94,8 +94,6 @@
 static UF_STATE_T handleUFStartState( DIALYSIS_STATE_T *dialysisState );
 static UF_STATE_T handleUFPausedState( DIALYSIS_STATE_T *dialysisState );
 static UF_STATE_T handleUFRunningState( DIALYSIS_STATE_T *dialysisState );
-static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState );
-static UF_STATE_T handleUFCompletedState( DIALYSIS_STATE_T *dialysisState );
 
 static SALINE_BOLUS_STATE_T handleSalineBolusIdleState( DIALYSIS_STATE_T *dialysisState );
 static SALINE_BOLUS_STATE_T handleSalineBolusWait4Pumps2Stop( DIALYSIS_STATE_T *dialysisState );
@@ -448,9 +446,7 @@
  *************************************************************************/
 F32 getUltrafiltrationReferenceVolume( void )
 {
-    F32 result = refUFVolume;
-
-    return result;
+    return refUFVolume;
 }
 
 /*********************************************************************//**
@@ -619,17 +615,9 @@
             currentUFState = handleUFRunningState( &result );
             break;
 
-        case UF_OFF_STATE:
-            currentUFState = handleUFOffState( &result );
-            break;
-
-        case UF_COMPLETED_STATE:
-            currentUFState = handleUFCompletedState( &result );
-            break;
-
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, currentUFState )
-            currentUFState = UF_COMPLETED_STATE;
+            currentUFState = UF_PAUSED_STATE;
             break;
     }
 
@@ -796,38 +784,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFCompletedOrOffState function handles the UF Off state
- * of the ultrafiltration state machine.
- * @details Inputs: none
- * @details Outputs: UF volumes updated and provided to DPo pump controller.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state
- *************************************************************************/
-static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState )
-{
-    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleUFCompletedState function handles the UF Completed
- * state of the ultrafiltration state machine.  This is a terminal state.
- * @details Inputs: none
- * @details Outputs: UF volumes updated and provided to DPo pump controller.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state
- *************************************************************************/
-static UF_STATE_T handleUFCompletedState( DIALYSIS_STATE_T *dialysisState )
-{
-    UF_STATE_T result = UF_RUNNING_STATE;  // TODO - remove this state and handler
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSalineBolusIdleState function handles the idle state of the
  * saline bolus state machine.
  * @details Inputs: none
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r88fd90befbce61886ae47ad7d20ec863319cfa34 -re22cea17af706bcdaed705302094b096818147b0
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 88fd90befbce61886ae47ad7d20ec863319cfa34)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision e22cea17af706bcdaed705302094b096818147b0)
@@ -1336,66 +1336,174 @@
     return fpgaSensorReadings.venousPressure;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setFPGASyringePumpControlFlags function sets the syringe pump control
+ * register per given bit flags.
+ * @details Inputs: none
+ * @details Outputs: fpgaActuatorSetPoints
+ * @param bitFlags control bit settings for syringe pump
+ * @return none
+ *************************************************************************/
 void setFPGASyringePumpControlFlags( U08 bitFlags )
 {
     fpgaActuatorSetPoints.syringePumpControl = bitFlags;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setFPGASyringePumpADCandDACControlFlags function sets the syringe pump
+ * ADC/DAC control register per given bit flags.
+ * @details Inputs: none
+ * @details Outputs: fpgaActuatorSetPoints
+ * @param bitFlags ADC/DAC control bit settings for syringe pump
+ * @return none
+ *************************************************************************/
 void setFPGASyringePumpADCandDACControlFlags( U08 bitFlags )
 {
     fpgaActuatorSetPoints.syringePumpADCandDACControl = bitFlags;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setFPGASyringePumpDACOutputLevel function sets the syringe pump force
+ * sensor DAC output level register to a given value.
+ * @details Inputs: none
+ * @details Outputs: fpgaActuatorSetPoints
+ * @param counts level to set syringe pump force sensor DAC to
+ * @return none
+ *************************************************************************/
 void setFPGASyringePumpDACOutputLevel( U16 counts )
 {
     fpgaActuatorSetPoints.syringePumpDACOut = counts;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setFPGASyringePumpStepToggleTime function sets the syringe pump stepper
+ * toggle time register to a given period (in uSec).
+ * @details Inputs: none
+ * @details Outputs: fpgaActuatorSetPoints
+ * @param microSeconds toggle the stepper motor at this time interval to set pump speed
+ * @return none
+ *************************************************************************/
 void setFPGASyringePumpStepToggleTime( U32 microSeconds )
 {
     fpgaActuatorSetPoints.syringePumpStepToggleTime = microSeconds;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpStatus function gets the latest syringe pump status
+ * register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump status reading
+ *************************************************************************/
 U08 getFPGASyringePumpStatus( void )
 {
     return fpgaSensorReadings.syringePumpStatus;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCReadCounter function gets the latest syringe pump
+ * ADC read counter.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC read counter
+ *************************************************************************/
 U08 getFPGASyringePumpADCReadCounter( void )
 {
     return fpgaSensorReadings.syringePumpADCReadCounter;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCandDACStatus function gets the latest syringe pump
+ * ADC/DAC status register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC/DAC status reading
+ *************************************************************************/
 U08 getFPGASyringePumpADCandDACStatus( void )
 {
     return fpgaSensorReadings.syringePumpADCandDACStatus;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpEncoderStatus function gets the latest syringe pump
+ * encoder status register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump encoder status reading
+ *************************************************************************/
 U08 getFPGASyringePumpEncoderStatus( void )
 {
     return fpgaSensorReadings.syringePumpEncoderStatus;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpEncoderPosition function gets the latest syringe pump
+ * encoder position reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump encoder position reading
+ *************************************************************************/
 U32 getFPGASyringePumpEncoderPosition( void )
 {
     return fpgaSensorReadings.syringePumpEncPosition;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCChannel0 function gets the latest syringe pump ADC
+ * channel 0 register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC channel 0 reading
+ *************************************************************************/
 U16 getFPGASyringePumpADCChannel0( void )
 {
     return fpgaSensorReadings.syringePumpAdcDataReadCh0;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCChannel1 function gets the latest syringe pump ADC
+ * channel 1 register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC channel 1 reading
+ *************************************************************************/
 U16 getFPGASyringePumpADCChannel1( void )
 {
     return fpgaSensorReadings.syringePumpAdcDataReadCh1;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCChannel2 function gets the latest syringe pump ADC
+ * channel 2 register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC channel 2 reading
+ *************************************************************************/
 U16 getFPGASyringePumpADCChannel2( void )
 {
     return fpgaSensorReadings.syringePumpAdcDataReadCh2;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGASyringePumpADCChannel3 function gets the latest syringe pump ADC
+ * channel 3 register reading.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return last syringe pump ADC channel 3 reading
+ *************************************************************************/
 U16 getFPGASyringePumpADCChannel3( void )
 {
     return fpgaSensorReadings.syringePumpAdcDataReadCh3;