Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -r0f9838d6b8606a6a9853ccb6157e4c25d70ddd02 -r6872cd9877a06d2246640b57444b857c6935b677
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 0f9838d6b8606a6a9853ccb6157e4c25d70ddd02)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 6872cd9877a06d2246640b57444b857c6935b677)
@@ -46,6 +46,7 @@
 } OFF_BUTTON_MESSAGE_FROM_UI_PAYLOAD_T;
 #pragma pack(pop)
 
+/// Power off warning message payload data.
 typedef struct
 {
     U32 powerOffWarning;                        ///< Power off warning message.
Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -r1cefdd82890709898ba4f5c8d8d93db1e650bec0 -r6872cd9877a06d2246640b57444b857c6935b677
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 1cefdd82890709898ba4f5c8d8d93db1e650bec0)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 6872cd9877a06d2246640b57444b857c6935b677)
@@ -31,6 +31,7 @@
  */
 
 // ********** public definitions **********
+
 #define USE_NORMAL_STABILIZATION_PERIOD     FALSE
 #define USE_SHORT_STABILIZATION_PERIOD      TRUE
 
@@ -42,15 +43,6 @@
     NUM_OF_PRESSURE_SENSORS                 ///< Number of pressure sensors
 } PRESSURE_SENSORS_T;
 
-/// Enumeration of occlusion sensors monitored by this module.
-typedef enum OcclusionSensors
-{
-    OCCLUSION_SENSOR_BLOOD_PUMP = 0,        ///< Blood pump occlusion sensor
-    OCCLUSION_SENSOR_DIAL_IN_PUMP,          ///< Dialysate inlet pump occlusion sensor
-    OCCLUSION_SENSOR_DIAL_OUT_PUMP,         ///< Dialysate outlet pump occlusion sensor
-    NUM_OF_OCCLUSION_SENSORS                ///< Number of occlusion sensors
-} OCCLUSION_SENSORS_T;
-
 /// Enumeration of arterial/venous pressure limits states.
 typedef enum PressureLimitsStates
 {
Index: firmware/App/Controllers/SyringePump.h
===================================================================
diff -u -rec4abf209e338090e861defd54e38b692d85e2b1 -r6872cd9877a06d2246640b57444b857c6935b677
--- firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision ec4abf209e338090e861defd54e38b692d85e2b1)
+++ firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 6872cd9877a06d2246640b57444b857c6935b677)
@@ -38,13 +38,13 @@
 /// Enumeration of syringe pump operations.
 typedef enum SyringePumpOperations
 {
-    SYRINGE_PUMP_OP_STOP = 0,
-    SYRINGE_PUMP_OP_RETRACT = 1,
-    SYRINGE_PUMP_OP_SEEK = 2,
-    SYRINGE_PUMP_OP_PRIME = 3,
-    SYRINGE_PUMP_OP_BOLUS = 4,
-    SYRINGE_PUMP_OP_CONTINUOUS = 5,
-    NUM_OF_SYRINGE_PUMP_OPS
+    SYRINGE_PUMP_OP_STOP = 0,                       ///< Syringe pump stopped - no operation.
+    SYRINGE_PUMP_OP_RETRACT = 1,                    ///< Syringe pump retract operation.  Retract to home postion.
+    SYRINGE_PUMP_OP_SEEK = 2,                       ///< Syringe pump seek operation.  Seek syringe plunger.
+    SYRINGE_PUMP_OP_PRIME = 3,                      ///< Syringe pump prime operation.  Prime Heparin line.
+    SYRINGE_PUMP_OP_BOLUS = 4,                      ///< Syringe pump bolus operation.  Deliver bolus volume of Heparin.
+    SYRINGE_PUMP_OP_CONTINUOUS = 5,                 ///< Syringe pump continuous dispense operation.  Deliver Heparin at set rate.
+    NUM_OF_SYRINGE_PUMP_OPS = 6                     ///< Number of syringe pump operation.
 } SYRINGE_PUMP_OPERATION_T;
 
 /// Payload record structure for the syringe pump operation request message.
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -ra56db4650fe5652d633e0c51b29da32d5d708608 -r6872cd9877a06d2246640b57444b857c6935b677
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision a56db4650fe5652d633e0c51b29da32d5d708608)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6872cd9877a06d2246640b57444b857c6935b677)
@@ -272,7 +272,9 @@
 static VALVE_STATE_T handleValveStateHomingFindDeenergizedEdge( VALVE_T valve );
 static VALVE_STATE_T handleValveStateIdle( VALVE_T valve );
 static VALVE_STATE_T handleValveStateInTransition( VALVE_T valve );
+#ifdef DEBUG_ENABLED
 static VALVE_STATE_T handleValveStateInBypassMode( VALVE_T valve );
+#endif
 
 // Private function prototypes
 static void setValveControlMode( VALVE_T valve, VALVE_MODE_T mode );