Index: Messages/Unhandled.conf
===================================================================
diff -u -r7083425507fa01b2e296f2becb20a6bc6ece913f -r1f876c30e2eb3934936b092417cb1454e8e75513
--- Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 7083425507fa01b2e296f2becb20a6bc6ece913f)
+++ Messages/Unhandled.conf	(.../Unhandled.conf)	(revision 1f876c30e2eb3934936b092417cb1454e8e75513)
@@ -807,7 +807,7 @@
 
 [0x7000]
 SET_RTC
-U32=message=>payload
+U32=messagePayload
 BOOL=result
 U32=rejReason
 
@@ -1159,20 +1159,15 @@
 
 [0xA400]
 EVENT
+
+[0xA500]
+EVENT
 U32=event
 U32=dataType1
 union=data2
 U32=dataType2
 union=data3
 
-[0xA500]
-EVENT
-U32=e
-U32=dataType1
-union=data1
-U32=dataType2
-union=data1
-
 [0xA600]
 SET_SERVICE_TIME
 
@@ -1196,8 +1191,8 @@
 
 [0xAA00]
 CONCENTRATE_MIXING_RATIOS
-F32=acid.acidConcentrate[CAL_DATA_ACID_CONCENTRATE_1].acidConcMixRatio
-F32=bicarb.bicarbConcentrate[CAL_DATA_BICARB_CONCENTRATE_1].bicarbConcMixRatio
+F32=acidConcMixRatio
+F32=bicarbConcMixRatio
 U32=fillPrepTimeMS
 
 [0xAB00]
@@ -1704,6 +1699,9 @@
 
 [0x3D80]
 SET_CALIBRATION_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x3E80]
 GET_CALIBRATION_RECORD
@@ -1717,6 +1715,9 @@
 
 [0x4080]
 SET_SYSTEM_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x4180]
 GET_SYSTEM_RECORD
@@ -1733,6 +1734,9 @@
 
 [0x4480]
 SET_SERVICE_RECORD
+U32=currentMessage
+U32=totalMessages
+U32=payloadLength
 
 [0x4580]
 SEND_SERVICE_RECORD
@@ -2003,11 +2007,6 @@
 BOOL=reset
 union=data2
 
-[0x7A80]
-SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE
-BOOL=reset
-union=data2
-
 [0x7B80]
 REQ_CURRENT_TREATMENT_PARAMETERS
 
@@ -2030,7 +2029,8 @@
 S32=venousPressureLimitAsymmetric_mmHg
 F32=heparinDispenseRate_mL_hr
 F32=heparinBolusVolume_mL
-F32=dialysateTemperature_degCF32=uFVolume_L
+F32=dialysateTemperature_degC
+F32=uFVolume_L
 
 [0x7D80]
 SET_FANS_RPM_ALARM_START_TIME_OFFSET
@@ -2184,7 +2184,8 @@
 LOAD_CELL_OVERRIDE
 BOOL=reset
 union=data3
-U32=indexBOOL=flag
+U32=index
+BOOL=flag
 
 [0x06A0]
 PRESSURE_OVERRIDE
@@ -2222,7 +2223,7 @@
 union=data2
 
 [0x0DA0]
-LOAD_CELLL_SEND_INTERVAL_OVERRIDE
+LOAD_CELL_SEND_INTERVAL_OVERRIDE
 BOOL=reset
 union=data2
 
@@ -2336,7 +2337,8 @@
 MEASURED_FLOW_SENSORS_OVERRIDE
 BOOL=reset
 union=data3
-U32=indexBOOL=flag
+U32=index
+BOOL=flag
 
 [0x22A0]
 SOFTWARE_RESET
@@ -2473,6 +2475,10 @@
 BOOL=reset
 union=data2
 
+[0x41A0]
+RUN_MODE_FILL_FOR_CAL_CHECK
+U32=modeFillForCalibrationState
+
 [0x42A0]
 FILTER_FLUSH_TIME_PERIOD_OVERRIDE
 BOOL=reset