Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r421ffbd3887d136b66da26ee3eeb17dcd9a773b8 -r765a17e8b525704386d48df1431688b07b785b40
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 421ffbd3887d136b66da26ee3eeb17dcd9a773b8)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 765a17e8b525704386d48df1431688b07b785b40)
@@ -394,8 +394,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 )
     }
 }
 
@@ -997,8 +997,6 @@
         }
     }
 
-    // TODO - if no open slot found, s/w fault
-
     return result;
 }
 
@@ -1060,8 +1058,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
             }
         }
@@ -1267,6 +1265,10 @@
             handleUIPOSTFinalResult( message );
             break;
 
+        case MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST:
+            handleUIActiveAlarmsListRequest( message );
+            break;
+
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
@@ -1511,14 +1513,14 @@
                 handleSetFluidLeakStateOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE:
-                handleSetBloodLeakDataBroadcastIntervalOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE:
                 handleSetBloodLeakStatusOverrideRequest( 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;
@@ -1619,6 +1621,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;