Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -446,7 +446,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 -rb766ff89da93aeb7f423a61487933477ff3ec82d -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b766ff89da93aeb7f423a61487933477ff3ec82d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -1156,7 +1156,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 )
@@ -1247,7 +1249,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 )
@@ -1295,7 +1297,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 )
@@ -1343,7 +1345,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 )
@@ -1389,7 +1391,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 -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -39,7 +39,7 @@
 #include "Valves.h"
 
 /**
- *  @addtogroup DGRecirculateMode
+ *  @addtogroup DGGenIdleMode
  *  @{
  */
 
@@ -518,7 +518,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 -r7ba136ce79068f9a09cb04bea35532d5caa48193 -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 7ba136ce79068f9a09cb04bea35532d5caa48193)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -466,7 +466,6 @@
  * status event.
  * @details Inputs: currentMode, currentSubMode, currentSubState
  * @details Outputs: dat1, dat2.
- * @param none
  * @return none
  *************************************************************************/
 static void sendOperationStatusEvent()
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbd1f452097afa4da0f60f64ecc6b6aab0a341d8c -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bd1f452097afa4da0f60f64ecc6b6aab0a341d8c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -1229,7 +1229,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleStartStopDGHeatDisinfect function handles a request start or
  * stop DG heat disifect mode.
@@ -1686,7 +1686,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.
@@ -1814,7 +1814,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.
@@ -2557,7 +2557,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.
@@ -2583,7 +2583,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 -rb607a94701f5844f2e850783239d1cb2df87fcd5 -rb67373adbc581690febb1e1c2bb521f108d9b92e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b607a94701f5844f2e850783239d1cb2df87fcd5)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
@@ -237,9 +237,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 );
 
@@ -327,9 +324,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 );