Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rcd19fd5095128315982b9ef810bd45e68eff8deb -r79c2105d7ec35f3caeb977f6e2cc1b494853d211
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision cd19fd5095128315982b9ef810bd45e68eff8deb)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 79c2105d7ec35f3caeb977f6e2cc1b494853d211)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-#include "TDCommon.h"
 #include "AirTrap.h"
 //#include "BloodFlow.h"
 #include "Buttons.h"
@@ -48,7 +47,7 @@
 #define TREATMENT_STATE_DATA_PUB_INTERVAL       ( 250 / TASK_GENERAL_INTERVAL )
 /// Interval (ms/task time) at which updated, valid treatment setting ranges are published on the CAN bus.
 #define TREATMENT_SETTINGS_RANGES_PUB_INTERVAL  ( ( 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
-/// Saline ultrafiltration data broadcast interval (ms/task time) count.
+/// Ultrafiltration data broadcast interval (ms/task time) count.
 #define ULTRAFILTRATION_DATA_PUB_INTERVAL       ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 /// Saline bolus data broadcast interval (ms/task time) count.  // TODO - move to StateTxSalineBolus.c when implemented
 #define SALINE_BOLUS_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
@@ -81,11 +80,11 @@
 static U32  salineBolusBroadcastTimerCtr;                       ///< Saline bolus data broadcast timer counter used to schedule when to transmit data.
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
-static OVERRIDE_U32_T treatmentTimePublishInterval = { TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, 0 };
+static OVERRIDE_U32_T treatmentTimePublishInterval;
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
-static OVERRIDE_U32_T treatmentStatePublishInterval = { TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, 0 };
+static OVERRIDE_U32_T treatmentStatePublishInterval;
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
-static OVERRIDE_U32_T treatmentParamRangesPublishInterval = { TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, 0 };
+static OVERRIDE_U32_T treatmentParamRangesPublishInterval;
 
 static BOOL resumeTreatmentAlarmResponseRequest;                ///< Flag indicates user has requested treatment resume.
 static BOOL initiateRinsebackAlarmResponseRequest;              ///< Flag indicates user has requested rinseback.
@@ -133,6 +132,19 @@
     rinsebackDone = FALSE;
     resumeBlockedByAlarm = FALSE;
 
+    treatmentTimePublishInterval.data = TREATMENT_TIME_DATA_PUB_INTERVAL;
+    treatmentTimePublishInterval.ovData = TREATMENT_TIME_DATA_PUB_INTERVAL;
+    treatmentTimePublishInterval.ovInitData = TREATMENT_TIME_DATA_PUB_INTERVAL;
+    treatmentTimePublishInterval.override = OVERRIDE_RESET;
+    treatmentStatePublishInterval.data = TREATMENT_STATE_DATA_PUB_INTERVAL;
+    treatmentStatePublishInterval.ovData = TREATMENT_STATE_DATA_PUB_INTERVAL;
+    treatmentStatePublishInterval.ovInitData = TREATMENT_STATE_DATA_PUB_INTERVAL;
+    treatmentStatePublishInterval.override = OVERRIDE_RESET;
+    treatmentParamRangesPublishInterval.data = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL;
+    treatmentParamRangesPublishInterval.ovData = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL;
+    treatmentParamRangesPublishInterval.ovInitData = TREATMENT_SETTINGS_RANGES_PUB_INTERVAL;
+    treatmentParamRangesPublishInterval.override = OVERRIDE_RESET;
+
     treatmentTimeMS = 0;
     lastTreatmentTimeStamp = 0;
     treatmentTimeBroadcastTimerCtr = TREATMENT_TIME_DATA_PUB_INTERVAL;                // So we send time data immediately when we begin treatment mode
@@ -341,7 +353,7 @@
 
 /*********************************************************************//**
  * @brief
- * The signalRinsebackToTreatmentEnd function signals that user wants to end the
+ * The signalEndTreatment function signals that user wants to end the
  * treatment.
  * @details \b Inputs: none
  * @details \b Outputs: endTreatmentRequest
@@ -355,8 +367,10 @@
 /*********************************************************************//**
  * @brief
  * The execTreatmentMode function executes the Treatment Mode state machine.
- * @details Inputs: currentTreatmentState
- * @details Outputs: currentTreatmentState
+ * @details \b Alarm: ALARM_ID_TD_TREATMENT_STOPPED_BY_USER if user presses
+ * the stop button
+ * @details \b Inputs: currentTreatmentState
+ * @details \b Outputs: currentTreatmentState, resumeBlockedByAlarm
  * @return current state (sub-mode)
  *************************************************************************/
 U32 execTreatmentMode( void )
@@ -454,8 +468,8 @@
  * The handleTreatmentStartState function handles the Start state of
  * the Treatment Mode state machine.  Should only pass through this state
  * once at very beginning of treatment.
- * @details Inputs: none
- * @details Outputs: treatmentTimeMS, lastTreatmentTimeStamp
+ * @details \b Inputs: none
+ * @details \b Outputs: treatmentTimeMS, lastTreatmentTimeStamp
  * @return next treatment mode state
  *************************************************************************/
 static TREATMENT_STATE_T handleTreatmentStartState( void )
@@ -472,8 +486,8 @@
  * @brief
  * The handleTreatmentBloodPrimeState function handles the blood prime state of
  * the Treatment Mode state machine.
- * @details Inputs: presUFRate
- * @details Outputs: none
+ * @details \b Inputs: presUFRate
+ * @details \b Outputs: none
  * @return next treatment mode state
  *************************************************************************/
 static TREATMENT_STATE_T handleTreatmentBloodPrimeState( void )