diff --git a/chip_data/odyssey/node_dlx_err_rpt.json b/chip_data/odyssey/node_dlx_err_rpt.json
index e452de6..64d3e0d 100644
--- a/chip_data/odyssey/node_dlx_err_rpt.json
+++ b/chip_data/odyssey/node_dlx_err_rpt.json
@@ -75,12 +75,6 @@
                 }
             ],
             "bits": {
-                "50": {
-                    "desc": "buffer UE"
-                },
-                "51": {
-                    "desc": "insufficient working lanes"
-                },
                 "52": {
                     "desc": "bad CRC from TLXT"
                 },
diff --git a/chip_data/odyssey/node_dlx_fir.json b/chip_data/odyssey/node_dlx_fir.json
index 4efd5c4..c42f877 100644
--- a/chip_data/odyssey/node_dlx_fir.json
+++ b/chip_data/odyssey/node_dlx_fir.json
@@ -306,7 +306,7 @@
                 "22": {
                     "desc": "DL0 skitter drift detected"
                 },
-                "23:63": {
+                "23:44": {
                     "desc": "reserved"
                 }
             },
diff --git a/chip_data/odyssey/node_mem_local_fir.json b/chip_data/odyssey/node_mem_local_fir.json
index c919250..b7bc2f0 100644
--- a/chip_data/odyssey/node_mem_local_fir.json
+++ b/chip_data/odyssey/node_mem_local_fir.json
@@ -36,6 +36,21 @@
             "instances": {
                 "0": "0x08040108"
             }
+        },
+        "MEM_PSCOM_STATUS_ERR": {
+            "instances": {
+                "0": "0x08010001"
+            }
+        },
+        "MEM_ERR_STATUS": {
+            "instances": {
+                "0": "0x0803000F"
+            }
+        },
+        "MEM_DTS_ERR": {
+            "instances": {
+                "0": "0x0805002F"
+            }
         }
     },
     "isolation_nodes": {
@@ -179,7 +194,37 @@
                 "63": {
                     "desc": "external local checkstop"
                 }
-            }
+            },
+            "capture_groups": [
+                {
+                    "group_name": "MEM_LOCAL_FIR",
+                    "group_inst": {
+                        "0": 0
+                    }
+                }
+            ]
         }
+    },
+    "capture_groups": {
+        "MEM_LOCAL_FIR": [
+            {
+                "reg_name": "MEM_PSCOM_STATUS_ERR",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "MEM_ERR_STATUS",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "MEM_DTS_ERR",
+                "reg_inst": {
+                    "0": 0
+                }
+            }
+        ]
     }
 }
diff --git a/chip_data/odyssey/node_srq_fir.json b/chip_data/odyssey/node_srq_fir.json
index a6da7a1..8989871 100644
--- a/chip_data/odyssey/node_srq_fir.json
+++ b/chip_data/odyssey/node_srq_fir.json
@@ -312,6 +312,9 @@
                 },
                 "45": {
                     "desc": "DSM errors port1"
+                },
+                "46:48": {
+                    "desc": "reserved"
                 }
             },
             "capture_groups": [
diff --git a/chip_data/odyssey/node_tp_local_fir.json b/chip_data/odyssey/node_tp_local_fir.json
index f8e1a50..f67d7ed 100644
--- a/chip_data/odyssey/node_tp_local_fir.json
+++ b/chip_data/odyssey/node_tp_local_fir.json
@@ -36,6 +36,91 @@
             "instances": {
                 "0": "0x01040108"
             }
+        },
+        "TP_ERR_STATUS": {
+            "instances": {
+                "0": "0x0103000F"
+            }
+        },
+        "TP_PSCOM_STATUS_ERR": {
+            "instances": {
+                "0": "0x01010001"
+            }
+        },
+        "TP_DTS_ERR": {
+            "instances": {
+                "0": "0x0105002F"
+            }
+        },
+        "TP_FMU_ERR_RPT": {
+            "instances": {
+                "0": "0x01010786"
+            }
+        },
+        "PCBCTL_ERR": {
+            "instances": {
+                "0": "0x000F001F"
+            }
+        },
+        "RESET_REG_B": {
+            "instances": {
+                "0": "0x000A0001"
+            }
+        },
+        "PPE_XIRAMDBG": {
+            "instances": {
+                "0": "0x000D0003"
+            }
+        },
+        "PPE_XIRAMEDR": {
+            "instances": {
+                "0": "0x000D0004"
+            }
+        },
+        "PPE_XIDBGPRO": {
+            "instances": {
+                "0": "0x000D0005"
+            }
+        },
+        "PPE_XIMEM": {
+            "instances": {
+                "0": "0x000D0007"
+            }
+        },
+        "PPE_XIICAC": {
+            "instances": {
+                "0": "0x000D0009"
+            }
+        },
+        "PPE_XIDBGINF": {
+            "instances": {
+                "0": "0x000D000F"
+            }
+        },
+        "PPE_PIBMEM_CNTL_REG": {
+            "instances": {
+                "0": "0x000D0010"
+            }
+        },
+        "PPE_PIBMEM_ADDR_REG": {
+            "instances": {
+                "0": "0x000D0011"
+            }
+        },
+        "PPE_PIBMEM_STATUS_REG": {
+            "instances": {
+                "0": "0x000D0015"
+            }
+        },
+        "PPE_FIR_MASK_REG": {
+            "instances": {
+                "0": "0x000D0018"
+            }
+        },
+        "PPE_ECC_CAPTURE_REG": {
+            "instances": {
+                "0": "0x000D001B"
+            }
         }
     },
     "isolation_nodes": {
@@ -192,10 +277,26 @@
                     "desc": "Error reported from one or more PCB responder - PLL lock/unlock"
                 },
                 "19": {
-                    "desc": "SBE - PPE internal hardware error"
+                    "desc": "SBE - PPE internal hardware error",
+                    "capture_groups": [
+                        {
+                            "group_name": "SPPE_HW_ERROR",
+                            "group_inst": {
+                                "0": 0
+                            }
+                        }
+                    ]
                 },
                 "20": {
-                    "desc": "SBE - PPE external hardware error"
+                    "desc": "SBE - PPE external hardware error",
+                    "capture_groups": [
+                        {
+                            "group_name": "SPPE_HW_ERROR",
+                            "group_inst": {
+                                "0": 0
+                            }
+                        }
+                    ]
                 },
                 "21": {
                     "desc": "SBE - PPE code error"
@@ -228,10 +329,10 @@
                     "desc": "unused"
                 },
                 "36": {
-                    "desc": "PIBMEM"
+                    "desc": "PIB interface - RAM UE ECC error"
                 },
                 "37": {
-                    "desc": "PIBMEM"
+                    "desc": "Direct interface to PIBMEM - RAM UE ECC error"
                 },
                 "38:44": {
                     "desc": "unused"
@@ -245,7 +346,123 @@
                 "63": {
                     "desc": "external local checkstop"
                 }
-            }
+            },
+            "capture_groups": [
+                {
+                    "group_name": "TP_LOCAL_FIR",
+                    "group_inst": {
+                        "0": 0
+                    }
+                }
+            ]
         }
+    },
+    "capture_groups": {
+        "TP_LOCAL_FIR": [
+            {
+                "reg_name": "TP_ERR_STATUS",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "TP_PSCOM_STATUS_ERR",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "TP_DTS_ERR",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "TP_FMU_ERR_RPT",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PCBCTL_ERR",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "RESET_REG_B",
+                "reg_inst": {
+                    "0": 0
+                }
+            }
+        ],
+        "SPPE_HW_ERROR": [
+            {
+                "reg_name": "PPE_XIRAMDBG",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_XIRAMEDR",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_XIDBGPRO",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_XIMEM",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_XIICAC",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_XIDBGINF",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_PIBMEM_CNTL_REG",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_PIBMEM_ADDR_REG",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_PIBMEM_STATUS_REG",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_FIR_MASK_REG",
+                "reg_inst": {
+                    "0": 0
+                }
+            },
+            {
+                "reg_name": "PPE_ECC_CAPTURE_REG",
+                "reg_inst": {
+                    "0": 0
+                }
+            }
+        ]
     }
 }