Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r234c2cedfa38520fa523a29156de993e9ace9a79 -r863a9c650d97fbf75d56c60b907b9117d033ca94
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 234c2cedfa38520fa523a29156de993e9ace9a79)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 863a9c650d97fbf75d56c60b907b9117d033ca94)
@@ -82,7 +82,7 @@
 #define SYRINGE_FORCE_PLUNGER_THRESHOLD_V             0.25F                                 ///< Force sensor threshold (in V) above which we have engaged with plunger.
 #define SYRINGE_PUMP_SYRINGE_DETECT_THRESHOLD_V       2.0F                                  ///< Syringe pump syringe detected threshold (in V).
 #define SYRINGE_PUMP_HOME_DETECT_THRESHOLD_V          0.25F                                 ///< Syringe pump home detected threshold (in V).
-#define SYRINGE_PUMP_PRIME_VOLUME_ML                  0.353F                                ///< Target syringe prime volume (in mL).
+#define SYRINGE_PUMP_PRIME_VOLUME_ML                  0.353F + 0.2F                         ///< Target syringe prime volume (in mL).  Heparin line volume + volume to coat blood circuit/dialyzer.
 #define SYRINGE_PUMP_MAX_VOL_ERROR_ML                 0.1F                                  ///< Maximum Heparin volume error (in mL).
 #define SYRINGE_PUMP_MAX_RATE_ERROR_ML_HR             0.1F                                  ///< Maximum Heparin delivery rate error (in mL/hr).
 #define TEN_PCT_OVER_ALLOWANCE                        1.1F                                  ///< Allow 10 percent over target before alarming on over travel.
@@ -368,7 +368,6 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
-                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
                 }
                 else
                 {
@@ -381,7 +380,6 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
-                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
@@ -1190,11 +1188,13 @@
     else if ( TRUE == syringePumpBolusRequested )
     {
         heparinDeliveryState = HEPARIN_STATE_INITIAL_BOLUS;
+        sendTreatmentLogEventData( HEPARIN_BOLUS_START_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_BOLUS_STATE;
     }
     else if ( TRUE == syringePumpContinuousRequested )
     {
         heparinDeliveryState = HEPARIN_STATE_DISPENSING;
+        sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_CONTINUOUS_STATE;
     }
     else if ( TRUE == syringePumpDACVrefSetRequested )
@@ -1447,6 +1447,7 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
+        sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }
 
@@ -1491,6 +1492,7 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
+        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }
 
@@ -1509,7 +1511,7 @@
 static SYRINGE_PUMP_STATE_T handleSyringePumpCalibrateForceSensorState( void )
 {
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE;
-    U08 adcDACStatus= getSyringePumpADCandDACStatus();
+    U08 adcDACStatus = getSyringePumpADCandDACStatus();
 
     // Wait for DAC setting write to EEPROM to complete
     if ( ( adcDACStatus & SYRINGE_PUMP_ADC_DAC_ERROR_COUNT_DAC_WR_DONE ) != 0 )