Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rc7d750b36ffa45ed57c73899aa7861e2d8d63be9 -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision c7d750b36ffa45ed57c73899aa7861e2d8d63be9)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -323,7 +323,7 @@
  * roPumpPWMDutyCyclePctSet, roPumpControlMode
  * @details Outputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct,
  * roPumpPWMDutyCyclePctSet, roPumpControlMode
- * @param: duty which is the duty cycle
+ * @param duty which is the duty cycle
  * @return none
  *************************************************************************/
 BOOL setROPumpTargetDutyCycle( F32 duty )
@@ -944,7 +944,7 @@
  * RO pump data publish interval.
  * @details Inputs: roPumpDataPublishInterval
  * @details Outputs: roPumpDataPublishInterval
- * @param: value : override RO pump data publish interval with (in ms)
+ * @param value : override RO pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value )
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r686955d65645ec1f99350150e49f9030d840b4cc -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 686955d65645ec1f99350150e49f9030d840b4cc)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -448,7 +448,7 @@
  * drain mode data publish interval.
  * @details Inputs: drainModeDataPublishInterval
  * @details Outputs: drainModeDataPublishInterval
- * @param: value override drain mode data publish interval with (in ms)
+ * @param value override drain mode data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDrainModeDataPublishIntervalOverride( U32 value )
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r686955d65645ec1f99350150e49f9030d840b4cc -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 686955d65645ec1f99350150e49f9030d840b4cc)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -1173,7 +1173,9 @@
  * percentFactor.
  * @details Inputs: None
  * @details Outputs: None
- * @param: testValue, baseValue, percentFactor
+ * @param testValue value to check range for
+ * @param baseValue value associated with 100%
+ * @param percentFactor percentage range (100% +/- this value)
  * @return TRUE if testValue is within range.  Otherwise, return FALSE
  *************************************************************************/
 static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor )
@@ -1264,7 +1266,7 @@
  * acid volume.
  * @details Inputs: used acid volume
  * @details Outputs: used acid volume
- * @param: value : override used acid volume in mL
+ * @param value override used acid volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedAcidVolumeMLOverride( F32 value )
@@ -1312,7 +1314,7 @@
  * bicarb volume.
  * @details Inputs: used bicarb volume
  * @details Outputs: used bicarb volume
- * @param: value : override used bicarb volume in mL
+ * @param value override used bicarb volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedBicarbVolumeMLOverride( F32 value )
@@ -1360,7 +1362,7 @@
  * fill mode data publish interval.
  * @details Inputs: FillModeDataPublishInterval
  * @details Outputs: FillModeDataPublishInterval
- * @param: value override fill mode data publish interval with (in ms)
+ * @param value override fill mode data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetFillModeDataPublishIntervalOverride( U32 value )
@@ -1406,7 +1408,7 @@
  * integrated volume.
  * @details Inputs: value
  * @details Outputs: integratedVolumeML
- * @param: value integrated volume in mL
+ * @param value integrated volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetIntegratedVolumeOverride( F32 value )
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r686955d65645ec1f99350150e49f9030d840b4cc -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 686955d65645ec1f99350150e49f9030d840b4cc)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -39,7 +39,7 @@
 #include "Valves.h"
 
 /**
- *  @addtogroup DGRecirculateMode
+ *  @addtogroup DGGenIdleMode
  *  @{
  */
 
@@ -510,7 +510,7 @@
  * bad fill sub-states publish interval.
  * @details Inputs: badFillSubstatesPublishInterval
  * @details Outputs: badFillSubstatesPublishInterval
- * @param: value override bad fill sub-states publish interval with (in ms)
+ * @param value override bad fill sub-states publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetGenIdleSubstatesPublishIntervalOverride( U32 value )
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rcf9f459e2b3fed14f46aeeb95bd70af6abec3122 -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision cf9f459e2b3fed14f46aeeb95bd70af6abec3122)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -481,7 +481,6 @@
  * status event.
  * @details Inputs: currentMode, currentSubMode, currentSubState
  * @details Outputs: dat1, dat2.
- * @param none
  * @return none
  *************************************************************************/
 static void sendOperationStatusEvent()
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r8ee01698b926fa62e7bed563b1137144a3cb32c5 -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8ee01698b926fa62e7bed563b1137144a3cb32c5)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -1224,7 +1224,7 @@
  * @details Outputs: acidConcentrateCalRecord, bicarbConcentrateCalRecord
  * @param acid which is the acid dialysate mixing ratio
  * @param bicarb which is the bicarb dialysate mixing ratio
- * @return TRUE if tare successful, FALSE if not
+ * @return TRUE if set successful, FALSE if not
  *************************************************************************/
 BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb )
 {
@@ -1246,7 +1246,7 @@
  * reservoir data publish interval.
  * @details Inputs: reservoirDataPublishInterval
  * @details Outputs: reservoirDataPublishInterval
- * @param: value override reservoir data publish interval with (in ms)
+ * @param value override reservoir data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetReservoirDataPublishIntervalOverride( U32 value )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5459a8a8b011c5956feb83c14fa98091287be7ac -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5459a8a8b011c5956feb83c14fa98091287be7ac)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -1250,7 +1250,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleStartStopDGHeatDisinfect function handles a request start or
  * stop DG heat disifect mode.
@@ -1707,7 +1707,7 @@
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_UI, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleStartStopDGHeatDisinfectActiveCool function handles a request
  * start or stop DG heat disinfect active cool mode.
@@ -1835,7 +1835,7 @@
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleStartStopDGROPermeateSample function handles a request to
  * start or stop DG RO permeate sample mode.
@@ -2578,7 +2578,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleSetDrainPumpTargetOutletFlowLPM function handles a
  * request to set the drain pump outlet flow in L/min.
@@ -2604,7 +2604,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleSetSwitchesStatusOverrideRequest function handles a
  * request to override the status of a switch in DG.
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5459a8a8b011c5956feb83c14fa98091287be7ac -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5459a8a8b011c5956feb83c14fa98091287be7ac)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -240,9 +240,6 @@
 // MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
 void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_DRAIN_PUMP_SET_RPM
 void handleTestSetDrainPumpRPM( MESSAGE_T *message );
 
@@ -330,9 +327,6 @@
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
-void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW
 void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );