Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -353,7 +353,6 @@
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
 
-
     return result;
 }
 
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -ref6d5a5ca314cbe30131156824e9d32792402fc4 -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision ef6d5a5ca314cbe30131156824e9d32792402fc4)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -405,7 +405,7 @@
 /*********************************************************************//**
  * @brief
  * The monitorFans function monitors the fans for RPM.
- * @details Inputs: rpmAlarmStartTimer, hasAlarmBeenRaised
+ * @details Inputs: rpmAlarmStartTime, hasAlarmBeenRaised
  * @details Outputs: hasAlarmBeenRaised, rpmAlarmStartTimer
  * @return none
  *************************************************************************/
@@ -617,14 +617,14 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetFanRPMAlarmStartTimestamp function set the fan RPM alarm start
+ * The testSetFanRPMAlarmStartTime function set the fan RPM alarm start
  * time offset.
  * @details Inputs: none
  * @details Outputs: rpmAlarmStartTimeOffset
  * @param milliSeconds the milliSeconds the time to be offset
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetFanRPMAlarmStartTimestamp( U32 milliSeconds )
+BOOL testSetFanRPMAlarmStartTime( U32 milliSeconds )
 {
     BOOL result = FALSE;
 
Index: firmware/App/Controllers/Fans.h
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -52,7 +52,7 @@
 
 F32  getMeasuredFanRPM( FAN_NAMES_T fan );
 
-BOOL testSetFanRPMAlarmStartTimestamp( U32 milliSeconds );
+BOOL testSetFanRPMAlarmStartTime( U32 milliSeconds );
 
 BOOL testSetFanPublishIntervalOverride( U32 value );
 BOOL testResetFanPublishIntervalOverride( void );
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r050984357442e3ee0d6d5b21e274c1306643c598 -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 050984357442e3ee0d6d5b21e274c1306643c598)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -186,8 +186,6 @@
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, 0, PRES_ALARM_PERSISTENCE );
-
-
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, 0, PRES_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, 0, PRES_ALARM_PERSISTENCE );
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -ra543f09d4d962ad7a9d677af700fbf8620ac272b -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision a543f09d4d962ad7a9d677af700fbf8620ac272b)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -714,7 +714,7 @@
 
     memcpy( &respPayload[0], &reasons[0], sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) );
 
-    sendTreatmentParametersResponseMsg( accepted, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) * sizeof(U32) ); // UF vol. param not included in reject reasons
+    sendTreatmentParametersResponseMsg( accepted, (U08*)(&respPayload[0]), ( NUM_OF_TREATMENT_PARAMS - 1 ) ); // UF vol. param not included in reject reasons
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r19dd008088c2a0ac22040199866cf39eae37f4b4 -r8373758a03ea82b46b4b313d2f2b24e3974a17f6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 19dd008088c2a0ac22040199866cf39eae37f4b4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
@@ -2562,11 +2562,11 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL ) + byteLength;
+    msg.hdr.payloadLen = sizeof( BOOL ) + ( sizeof( U32 ) * byteLength );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
     payloadPtr += sizeof( BOOL );
-    memcpy( payloadPtr, rejectReasons, byteLength );
+    memcpy( payloadPtr, rejectReasons, sizeof( U32 ) * byteLength );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -3217,7 +3217,7 @@
 void handleHDUsageInfoRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    U32 payload = 0;
+    U32 payload = 0; // TODO update this one implemented
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -5921,7 +5921,6 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
-#ifndef _RELEASE_
     // Verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
@@ -5935,7 +5934,6 @@
             result = testResetValvesPositionCountOverride( payload.index );
         }
     }
-#endif
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
@@ -6915,7 +6913,7 @@
     {
         memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
 
-        result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset );
+        result = testSetFanRPMAlarmStartTime( rpmTimeOffset );
     }
 
     // Respond to request
@@ -7227,7 +7225,6 @@
 {
     U08 command;
     U16 commandPayload;
-
     BOOL result = FALSE;
     U08* payloadPtr = message->payload;
 
@@ -7261,7 +7258,6 @@
 {
     BOOL result;
     MESSAGE_T msg;
-
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -7271,7 +7267,6 @@
 
     memcpy( payloadPtr, &responseLen, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-
     memcpy( payloadPtr, response, responseLen );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer