Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r326e3597e1555ef2ac4978f58786e7ce638b1287 -r7334590e610cd1543e128ad2dbc0de17e824b619
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 326e3597e1555ef2ac4978f58786e7ce638b1287)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7334590e610cd1543e128ad2dbc0de17e824b619)
@@ -409,8 +409,8 @@
     }
     else
     {
-        // Should not get here - not an active message box
-        // TODO - s/w fault?
+        // Should not get here - not an active message box
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
     }
 }
 
@@ -1019,8 +1019,6 @@
         }
     }
 
-    // TODO - if no open slot found, s/w fault
-
     return result;
 }
 
@@ -1082,8 +1080,8 @@
             {
                 U16 msgID;
 
-                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }
@@ -1261,6 +1259,18 @@
             handleTreatmentEndCmd( message );
             break;
 
+        case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
+            handlePatientDisconnectionConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+            handleDisposableRemovalConfirmCmd( message );
+            break;
+
+        case MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST:
+            handleUITreatmentLogDataRequest( message );
+            break;
+
         case MSG_ID_DG_COMMAND_RESPONSE:
             handleDGCmdResp( message );
             break;
@@ -1518,9 +1528,21 @@
                 break;
 
             case MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE:
-                handleSetFluidLeakStateDetectorOverrideRequest( message );
+                handleSetFluidLeakStateOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE:
+                handleSetFluidLeakStateOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE:
+                handleSetBloodLeakDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST:
+                handleBloodLeakZeroRequest( message );
+                break;
+
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );
                 break;
@@ -1605,6 +1627,14 @@
                 handleTestSyringePumpADCReadCtrOverrideRequest( message );
                 break;
 
+            case MSG_ID_HD_VALVES_CURRENT_OVERRIDE:
+                handleTestValvesCurrentOverrideRequest( message );
+                break;
+
+            case MSD_ID_HD_VALVES_POSITION_COUNT_OVERRIDE:
+                handleTestValvesPositionCountOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_SET_CALIBRATION_RECORD:
                 handleSetHDCalibrationRecord( message );
                 break;