diff --git a/BNpcResist.yml b/BNpcResist.yml
index 48e1a29..f1f36ca 100644
--- a/BNpcResist.yml
+++ b/BNpcResist.yml
@@ -1,13 +1,5 @@
 name: BNpcResist
 fields:
 - name: Unknown0
-- name: Unknown1
-- name: Unknown2
-- name: Unknown3
-- name: Unknown4
-- name: Unknown5
-- name: Unknown6
-- name: Unknown7
-- name: Unknown8
-- name: Unknown9
-- name: Unknown10
+  type: array
+  count: 11
diff --git a/XBMBattleDetail.yml b/XBMBattleDetail.yml
index 3f93d7d..8926d7f 100644
--- a/XBMBattleDetail.yml
+++ b/XBMBattleDetail.yml
@@ -1,13 +1,24 @@
 name: XBMBattleDetail
 fields:
-- name: Unknown0
+- name: Name
+  type: link
+  targets: [BNpcName]
 - name: Unknown1
+  type: icon
 - name: Unknown2
+  type: link
+  targets: [XBMBattleDetailAction]
 - name: Unknown3
-- name: Unknown4
+  type: link
+  targets: [XBMBattleDetailAction]
+- name: Resist
+  type: link
+  targets: [BNpcResist]
 - name: Unknown5
 - name: Unknown6
 - name: Unknown7
 - name: Unknown8
 - name: Unknown9
-- name: Unknown10
+- name: Element
+  type: link
+  targets: [XBMElement]
diff --git a/XBMBattleDetailAction.yml b/XBMBattleDetailAction.yml
index 5eb62f5..5849a31 100644
--- a/XBMBattleDetailAction.yml
+++ b/XBMBattleDetailAction.yml
@@ -1,6 +1,14 @@
 name: XBMBattleDetailAction
 fields:
-- name: Unknown0
-- name: Unknown1
-- name: Unknown2
-- name: Unknown3
+- name: Action
+  type: link
+  targets: [Action]
+- name: Status
+  type: link
+  targets: [Status]
+- name: ActionTarget
+  type: link
+  targets: [XBMActionTarget]
+- name: ActionEffectType
+  type: link
+  targets: [XBMActionEffectType]
diff --git a/XBMContent.yml b/XBMContent.yml
index 4a52fee..d3f7922 100644
--- a/XBMContent.yml
+++ b/XBMContent.yml
@@ -33,7 +33,9 @@ fields:
 - name: Unknown30
 - name: Unknown31
 - name: Unknown32
-- name: Unknown33
+- name: ContentFinderCondition
+  type: link
+  targets: [ContentFinderCondition]
 - name: Unknown34
 - name: Unknown35
 - name: Unknown36
diff --git a/XBMContentBattle.yml b/XBMContentBattle.yml
index 5a59095..5b6681b 100644
--- a/XBMContentBattle.yml
+++ b/XBMContentBattle.yml
@@ -1,3 +1,5 @@
 name: XBMContentBattle
 fields:
-- name: Unknown0
+- name: BattleDetail
+  type: link
+  targets: [XBMBattleDetail]
diff --git a/XBMContentRandomStageEvent.yml b/XBMContentRandomStageEvent.yml
index 8d4eace..555f4d3 100644
--- a/XBMContentRandomStageEvent.yml
+++ b/XBMContentRandomStageEvent.yml
@@ -1,3 +1,5 @@
 name: XBMContentRandomStageEvent
 fields:
-- name: Unknown0
+- name: RandomStageEvent
+  type: link
+  targets: [XBMRandomStageEvent]
diff --git a/XBMElement.yml b/XBMElement.yml
index 7a574a8..d375157 100644
--- a/XBMElement.yml
+++ b/XBMElement.yml
@@ -1,3 +1,4 @@
 name: XBMElement
+displayField: Name
 fields:
-- name: Unknown0
+- name: Name
diff --git a/XBMItem.yml b/XBMItem.yml
index 841e682..e714bf6 100644
--- a/XBMItem.yml
+++ b/XBMItem.yml
@@ -13,4 +13,6 @@ fields:
 - name: Unknown10
 - name: Unknown11
 - name: Unknown12
-- name: Unknown13
+- name: Type
+  type: link
+  targets: [XBMItemType]
diff --git a/XBMItemType.yml b/XBMItemType.yml
index 22dba3f..38791ae 100644
--- a/XBMItemType.yml
+++ b/XBMItemType.yml
@@ -1,3 +1,4 @@
 name: XBMItemType
+displayField: Name
 fields:
-- name: Unknown0
+- name: Name
diff --git a/XBMPet.yml b/XBMPet.yml
index 8012ac0..8a7fcc9 100644
--- a/XBMPet.yml
+++ b/XBMPet.yml
@@ -4,21 +4,23 @@ fields:
 - name: Unknown1
 - name: Unknown2
 - name: Unknown3
-- name: Unknown4
-- name: Unknown5
-- name: Unknown6
+- name: Pet
+  type: link
+  targets: [Pet]
+- name: Action
+  type: link
+  targets: [Action]
+- name: Location
+  type: link
+  condition:
+    switch: LocationKey
+    cases:
+      1: [PlaceName]
+      2: [ContentFinderCondition]
 - name: Unknown7
 - name: Unknown8
 - name: Unknown9
-- name: Unknown10
-- name: Unknown11
-- name: Unknown12
-- name: Unknown13
-- name: Unknown14
-- name: Unknown15
-- name: Unknown16
-- name: Unknown17
-- name: Unknown18
-- name: Unknown19
-- name: Unknown20
-- name: Unknown21
+- name: LocationKey
+- name: Unknown11 # uses the same indexer as BNpcResist.Unknown0
+  type: array
+  count: 11
diff --git a/XBMRandomStageEvent.yml b/XBMRandomStageEvent.yml
index a250bfe..aa3dad3 100644
--- a/XBMRandomStageEvent.yml
+++ b/XBMRandomStageEvent.yml
@@ -1,4 +1,4 @@
 name: XBMRandomStageEvent
 fields:
 - name: Unknown0
-- name: Unknown1
+- name: Unknown1 # XBMContentBattle SubrowId?