Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r62aa7e7cbfb6b0dd33987a086df53481ffe4420c -r0dc2d5103f7fd8b8a66f0c385afaa0438898da14
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 62aa7e7cbfb6b0dd33987a086df53481ffe4420c)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0dc2d5103f7fd8b8a66f0c385afaa0438898da14)
@@ -158,8 +158,8 @@
  * The handleStandbyModeStartState function handles the standby start state.
  * This state waits for the door to be closed and then initiates homing of
  * pumps and valves and transitions to the wait for treatment state.
- * @details \b Inputs:
- * @details \b Outputs:
+ * @details \b Inputs: homingInitiated
+ * @details \b Outputs: homingInitiated
  * @return next state of the standby mode state machine
  *************************************************************************/
 static TD_STANDBY_STATE_T handleStandbyModeStartState( void )
@@ -189,53 +189,6 @@
     return state;
 }
 
-
-//static TD_STANDBY_STATE_T handleStandbyModeStartState( void )
-//{
-//    TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
-//
-//    // If we haven't already initiated homing of actuators, initiate now
-//    if ( homingInitiated != TRUE )
-//    {
-//        VALVE_T valve;
-//
-//        // Home pumps and valves
-//        for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
-//        {
-//            homeValve( valve, FALSE, TRUE );
-//        }
-////            homeBloodPump();
-////            homeDialInPump();
-////            homeDialOutPump();
-////            retractSyringePump();
-//
-//        homingInitiated = TRUE;
-//    }
-////        else
-////        {
-////            // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration
-////#ifndef _RELEASE_
-////            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP )  )
-////            {
-////                state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
-////            }
-////            else
-////#endif
-////            {
-////                if ( ( TRUE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
-////                {
-////                    syringePumpVerifyForceSensorDACCalibration();
-////                    homingInitiated = FALSE;                        // reset for next time
-////                    doorClosedRequired( FALSE );                    // door no longer required to be closed in standby mode
-////                    state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
-////                }
-////            }
-////        }
-////    }
-//
-//    return state;
-//}
-
 /*********************************************************************//**
  * @brief
  * The handleStandbyModeWaitForTreatmentState function handles wait for
Index: firmware/App/Services/FpgaTD.c
===================================================================
diff -u -r08fdaaf70ab5133cbe7d019905f745074a756027 -r0dc2d5103f7fd8b8a66f0c385afaa0438898da14
--- firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 08fdaaf70ab5133cbe7d019905f745074a756027)
+++ firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 0dc2d5103f7fd8b8a66f0c385afaa0438898da14)
@@ -1711,8 +1711,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1CmdHeader function sets the H1 Magellan command header.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param cmdHeader H1 Magellan command header.
  * @return none
  *************************************************************************/
@@ -1724,8 +1724,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1InputWord1 function sets H1 Magellan input word 1.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 1 value.
  * @return none
  *************************************************************************/
@@ -1737,8 +1737,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1InputWord2 function sets H1 Magellan input word 2.hh
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 2 value.
  * @return none
  *************************************************************************/
@@ -1750,8 +1750,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1InputWord3 function sets H1 Magellan input word 3.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 3 value.
  * @return none
  *************************************************************************/
@@ -1763,8 +1763,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1FPGACmd function sets the H1 Magellan FPGA command register.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param cmd FPGA command value.
  * @return none
  *************************************************************************/
@@ -1776,8 +1776,8 @@
 /*********************************************************************//**
  * @brief
  * The setH1EnableReset function sets the H1 Magellan enable/reset register.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param value Enable/reset register value.
  * @return none
  *************************************************************************/
@@ -1789,8 +1789,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19CmdHeader function sets the H19 Magellan command header.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param cmdHeader H19 Magellan command header.
  * @return none
  *************************************************************************/
@@ -1802,8 +1802,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19InputWord1 function sets H19 Magellan input word 1.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 1 value.
  * @return none
  *************************************************************************/
@@ -1815,8 +1815,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19InputWord2 function sets H19 Magellan input word 2.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 2 value.
  * @return none
  *************************************************************************/
@@ -1828,8 +1828,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19InputWord3 function sets H19 Magellan input word 3.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param inputWord Input word 3 value.
  * @return none
  *************************************************************************/
@@ -1841,8 +1841,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19FPGACmd function sets the H19 Magellan FPGA command register.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param cmd FPGA command value.
  * @return none
  *************************************************************************/
@@ -1854,8 +1854,8 @@
 /*********************************************************************//**
  * @brief
  * The setH19EnableReset function sets the H19 Magellan enable/reset register.
- * @details \b Inputs: fpgaActuatorSetPoints
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaActuatorSetPoints
  * @param value Enable/reset register value.
  * @return none
  *************************************************************************/
@@ -1878,10 +1878,10 @@
 
 /*********************************************************************//**
  * @brief
- * The getH1ReadCount function reads the H1 status.
+ * The getH1ReadCount function shows read count of H1.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return H1 motor status.
+ * @return H1 read count.
  *************************************************************************/
 U08 getH1ReadCount( void )
 {
@@ -1891,9 +1891,9 @@
 /*********************************************************************//**
  * @brief
  * The getH1ErrorCount function shows error count of H1.
- * @details \b Inputs: fpgaSensorReadings
- * @details \b Outputs: none
- * @return H1 error status.
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaSensorReadings
+ * @return H1 error count.
  *************************************************************************/
 U08 getH1ErrorCount( void )
 {
@@ -1950,10 +1950,10 @@
 
 /*********************************************************************//**
  * @brief
- * The getH19ReadCount function reads the H19 status.
+ * The getH19ReadCount function shows the read count of H19.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return H19 motor status.
+ * @return H19 read count.
  *************************************************************************/
 U08 getH19ReadCount( void )
 {
@@ -1965,7 +1965,7 @@
  * The getH19ErrorCount function shows error count of H19.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return H19 error status.
+ * @return H19 error count.
  *************************************************************************/
 U08 getH19ErrorCount( void )
 {
@@ -2010,10 +2010,10 @@
 
 /*********************************************************************//**
  * @brief
- * The geth1ReadEnableRest function reads the H19 status.
- * @details \b Inputs: fpgaSensorReadings
+ * The geth1ReadEnableRest function reads the H1 status.
+ * @details \b Inputs: fpgaActuatorSetPoints
  * @details \b Outputs: none
- * @return H19 motor status.
+ * @return H1 enable/rest status.
  *************************************************************************/
 U08 geth1ReadEnableRest( void )
 {
@@ -2023,9 +2023,9 @@
 /*********************************************************************//**
  * @brief
  * The geth19ReadEnableRest function reads the H19 status.
- * @details \b Inputs: fpgaSensorReadings
+ * @details \b Inputs: fpgaActuatorSetPoints
  * @details \b Outputs: none
- * @return H19 motor status.
+ * @return H19 enable/rest status.
  *************************************************************************/
 U08 geth19ReadEnableRest( void )
 {