diff --git a/Age of Sigmar 4.0.gst b/Age of Sigmar 4.0.gst
index d870b56..5ea738d 100644
--- a/Age of Sigmar 4.0.gst	
+++ b/Age of Sigmar 4.0.gst	
@@ -86,10 +86,31 @@
   </profileTypes>
   <categoryEntries>
     <categoryEntry name="DEATH" hidden="false" id="d484-a2d7-cf4f-c4a0"/>
-    <categoryEntry name="HERO" hidden="false" id="6e72-1656-d554-528a"/>
+    <categoryEntry name="HERO" hidden="false" id="6e72-1656-d554-528a">
+      <infoLinks>
+        <infoLink name="Guarded Hero" id="a27b-f91f-4ad0-d8a4" hidden="false" type="profile" targetId="3bc-444a-5cf8-e4d">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="6d54-625c-d063-13e2" shared="true" includeChildSelections="true"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="f7bc-b618-4b5d-2bae" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
+      </infoLinks>
+    </categoryEntry>
     <categoryEntry name="WIZARD (1)" hidden="false" id="6f28-c3f6-4b1b-8aff"/>
     <categoryEntry name="INFANTRY" hidden="false" id="75d6-6995-dfcc-3898"/>
-    <categoryEntry name="WARD (6+)" hidden="false" id="70a4-383f-421f-52cd"/>
+    <categoryEntry name="WARD (6+)" hidden="false" id="70a4-383f-421f-52cd">
+      <infoLinks>
+        <infoLink name="Ward Save" id="2f4b-a2bc-b51a-2542" hidden="false" type="profile" targetId="ed70-f30-2f5a-747f"/>
+      </infoLinks>
+    </categoryEntry>
     <categoryEntry name="OSSIARCH BONEREAPERS" hidden="false" id="5603-d1-a021-331e"/>
     <categoryEntry name="MORTISAN" hidden="false" id="a2d-c08d-4d7d-fe93"/>
     <categoryEntry name="UNIQUE" hidden="false" id="72ce-2188-70bf-2dbd"/>
@@ -103,8 +124,16 @@
     <categoryEntry name="WARMASTER" hidden="false" id="c203-51a0-3d44-6b07"/>
     <categoryEntry name="MONSTER" hidden="false" id="6d54-625c-d063-13e2"/>
     <categoryEntry name="WIZARD (9)" hidden="false" id="5a9b-95b7-c807-341f"/>
-    <categoryEntry name="FLY" hidden="false" id="b979-4c3e-7d0e-6921"/>
-    <categoryEntry name="WARD (5+)" hidden="false" id="52cc-95fd-6cd3-8f72"/>
+    <categoryEntry name="FLY" hidden="false" id="b979-4c3e-7d0e-6921">
+      <infoLinks>
+        <infoLink name="Fly" id="0fb5-79bc-38be-2693" hidden="false" type="profile" targetId="8e01-c601-8a44-8f74"/>
+      </infoLinks>
+    </categoryEntry>
+    <categoryEntry name="WARD (5+)" hidden="false" id="52cc-95fd-6cd3-8f72">
+      <infoLinks>
+        <infoLink name="Ward Save" id="f6f6-14d4-4515-9ed2" hidden="false" type="profile" targetId="ed70-f30-2f5a-747f"/>
+      </infoLinks>
+    </categoryEntry>
     <categoryEntry name="WIZARD (3)" hidden="false" id="8bc-6d63-e37f-9239"/>
     <categoryEntry name="CAVALRY" hidden="false" id="926c-df8c-6841-d49e"/>
     <categoryEntry name="CHAMPION (1/8)" hidden="false" id="d131-3bfe-3ff4-a703"/>
@@ -126,7 +155,11 @@
     <categoryEntry name="Restrict General" id="abcb-73d0-2b6c-4f17" hidden="true"/>
     <categoryEntry name="Reference" id="3360-1158-e879-9606" hidden="false"/>
     <categoryEntry name="NIGHTHAUNT" id="e3a4-4581-9f76-4215" hidden="false"/>
-    <categoryEntry name="WARD (4+)" id="f99f-98ee-909f-57cd" hidden="false"/>
+    <categoryEntry name="WARD (4+)" id="f99f-98ee-909f-57cd" hidden="false">
+      <infoLinks>
+        <infoLink name="Ward Save" id="bda6-d02e-20b0-c04a" hidden="false" type="profile" targetId="ed70-f30-2f5a-747f"/>
+      </infoLinks>
+    </categoryEntry>
     <categoryEntry name="MUSICIAN (1/4)" id="fe9c-1d27-a698-5f31" hidden="false"/>
     <categoryEntry name="FLESH-EATER COURTS" id="8d10-dc24-7ece-50df" hidden="false"/>
     <categoryEntry name="ABHORRENT" id="b59b-b9ff-5e6e-87b2" hidden="false"/>
diff --git a/Blades of Khorne - Library.cat b/Blades of Khorne - Library.cat
index 9d238f9..ecf1f1a 100644
--- a/Blades of Khorne - Library.cat	
+++ b/Blades of Khorne - Library.cat	
@@ -809,16 +809,16 @@
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Claw of Karanak" hidden="false" id="7aa7-9314-1840-5d8b" defaultAmount="1,7">
           <constraints>
-            <constraint type="min" value="5" field="selections" scope="parent" shared="false" id="7e68-e6c4-276d-4c86"/>
-            <constraint type="max" value="5" field="selections" scope="parent" shared="false" id="bef0-16a1-5df5-ce32"/>
+            <constraint type="min" value="8" field="selections" scope="parent" shared="false" id="7e68-e6c4-276d-4c86"/>
+            <constraint type="max" value="8" field="selections" scope="parent" shared="false" id="bef0-16a1-5df5-ce32"/>
           </constraints>
           <modifiers>
-            <modifier type="increment" value="5" field="7e68-e6c4-276d-4c86">
+            <modifier type="increment" value="8" field="7e68-e6c4-276d-4c86">
               <repeats>
                 <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="1b37-82b8-c062-eb82" shared="true" roundUp="false"/>
               </repeats>
             </modifier>
-            <modifier type="increment" value="5" field="bef0-16a1-5df5-ce32">
+            <modifier type="increment" value="8" field="bef0-16a1-5df5-ce32">
               <repeats>
                 <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="1b37-82b8-c062-eb82" shared="true" roundUp="false"/>
               </repeats>
@@ -961,7 +961,7 @@
                     </modifier>
                   </modifiers>
                 </entryLink>
-                <entryLink import="true" name="Musician" hidden="false" id="716-4bb0-9453-8eca" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount=",0,1,0,0">
+                <entryLink import="true" name="Musician" hidden="false" id="716-4bb0-9453-8eca" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount="0,1,0,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="187b-b09b-5efa-c1e5" shared="true" id="98eb-7510-d4b5-4225"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5c7d-fd95-e600-963b"/>
diff --git a/Lumineth Realm-lords - Library.cat b/Lumineth Realm-lords - Library.cat
index 68fa9bf..75990ca 100644
--- a/Lumineth Realm-lords - Library.cat	
+++ b/Lumineth Realm-lords - Library.cat	
@@ -448,12 +448,12 @@ If Ellathor takes the lead, until the start of your next turn, add the current
       </profiles>
       <categoryLinks>
         <categoryLink name="CHAMPION" hidden="false" id="ed76-3cbd-c930-2a06" targetId="f679-3bcb-d664-9ac3" primary="false"/>
-        <categoryLink name="INFANTRY" hidden="false" id="fe2d-3626-dbb9-e0a6" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="ORDER" hidden="false" id="87c4-989f-a006-c43e" targetId="ee22-3575-6590-25c" primary="false"/>
         <categoryLink name="LUMINETH REALM-LORDS" hidden="false" id="976e-139-44ae-68ff" targetId="879-a29f-5c33-2e92" primary="false"/>
         <categoryLink name="AELF" hidden="false" id="8228-e6bb-8b16-f34d" targetId="5ef2-db09-d3cc-4b27" primary="false"/>
         <categoryLink name="VANARI" hidden="false" id="9541-2f68-f7ef-866" targetId="9958-c5c0-c246-8010" primary="false"/>
         <categoryLink name="STANDARD BEARER (1/5)" hidden="false" id="4085-724d-366a-bfc4" targetId="73c-8e22-9dde-f97" primary="false"/>
+        <categoryLink name="CAVALRY" hidden="false" id="83a1-0b06-360b-cc9b" targetId="926c-df8c-6841-d49e" primary="true"/>
       </categoryLinks>
       <costs>
         <cost name="‎" id="4af-c45d-b2af-ac8a" hidden="false" typeId="1dd2-2af7-76a2-2423" value="0"/>
diff --git a/Lumineth Realm-lords.cat b/Lumineth Realm-lords.cat
index 30be11c..36c8c68 100644
--- a/Lumineth Realm-lords.cat	
+++ b/Lumineth Realm-lords.cat	
@@ -888,7 +888,7 @@ Subtract 1 from hit rolls for attacks that target friendly **^^Vanari^^** units
       <modifierGroups>
         <modifierGroup type="and">
           <modifiers>
-            <modifier type="set" value="0" field="2b4e-1c18-6de5-5c89">
+            <modifier type="set" value="1" field="2b4e-1c18-6de5-5c89">
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
diff --git a/Ogor Mawtribes - Library.cat b/Ogor Mawtribes - Library.cat
index 6186082..1702014 100644
--- a/Ogor Mawtribes - Library.cat	
+++ b/Ogor Mawtribes - Library.cat	
@@ -308,18 +308,6 @@
                     <characteristic name="Ability" typeId="d793-3dd7-9c13-741e">Anti-**^^Infantry^^** (+1 Rend), Crit (Auto-wound)</characteristic>
                   </characteristics>
                 </profile>
-                <profile name="Ironblaster Cannon: Hail Shot" typeId="1fd-a42f-41d3-fe05" typeName="Ranged Weapon" hidden="false" id="ac8d-85db-d71b-f40">
-                  <characteristics>
-                    <characteristic name="Rng" typeId="c6b5-908c-a604-1a98">12&quot;</characteristic>
-                    <characteristic name="Atk" typeId="aa17-4296-2887-e05d">8</characteristic>
-                    <characteristic name="Hit" typeId="194d-aeb6-5ba7-83b4">4+</characteristic>
-                    <characteristic name="Wnd" typeId="d3d5-9dc6-13de-8d1">3+</characteristic>
-                    <characteristic name="Rnd" typeId="d03f-a9ae-3eec-755">1</characteristic>
-                    <characteristic name="Dmg" typeId="96c2-d0a5-ea1e-653b">2</characteristic>
-                    <characteristic name="Ability" typeId="d793-3dd7-9c13-741e">-</characteristic>
-                  </characteristics>
-                  <alias/>
-                </profile>
               </profiles>
               <constraints>
                 <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="7515-11bf-a444-d"/>
@@ -2335,37 +2323,38 @@
             </modifier>
           </modifiers>
           <selectionEntries>
-            <selectionEntry type="upgrade" import="true" name="Irongut Weapon" hidden="false" id="1592-b1c0-ad1e-1454">
+            <selectionEntry type="upgrade" import="true" name="Leadbelcher Gun" hidden="false" id="acfa-507b-a4c0-4ddf">
               <constraints>
-                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4202-15c6-d363-bd53"/>
-                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="dcfc-fccd-434c-176f"/>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="375d-a24f-1e28-cad0"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3c86-a595-de67-7823"/>
               </constraints>
               <profiles>
-                <profile name="Irongut Weapon" typeId="9074-76b6-9e2f-81e3" typeName="Melee Weapon" hidden="false" id="5b78-fe43-70b2-3d17">
+                <profile name="Leadbelcher Gun" typeId="1fd-a42f-41d3-fe05" typeName="Ranged Weapon" hidden="false" id="5b5e-61bb-c592-c812">
                   <characteristics>
-                    <characteristic name="Atk" typeId="60e-35aa-31ed-e488">3</characteristic>
-                    <characteristic name="Hit" typeId="26dc-168-b2fd-cb93">4+</characteristic>
-                    <characteristic name="Wnd" typeId="61c1-22cc-40af-2847">2+</characteristic>
-                    <characteristic name="Rnd" typeId="eccc-10fa-6958-fb73">2</characteristic>
-                    <characteristic name="Dmg" typeId="e948-9c71-12a6-6be4">3</characteristic>
-                    <characteristic name="Ability" typeId="eda3-7332-5db1-4159">-</characteristic>
+                    <characteristic name="Rng" typeId="c6b5-908c-a604-1a98">15&quot;</characteristic>
+                    <characteristic name="Atk" typeId="aa17-4296-2887-e05d">D3</characteristic>
+                    <characteristic name="Hit" typeId="194d-aeb6-5ba7-83b4">4+</characteristic>
+                    <characteristic name="Wnd" typeId="d3d5-9dc6-13de-8d1">3+</characteristic>
+                    <characteristic name="Rnd" typeId="d03f-a9ae-3eec-755">1</characteristic>
+                    <characteristic name="Dmg" typeId="96c2-d0a5-ea1e-653b">1</characteristic>
+                    <characteristic name="Ability" typeId="d793-3dd7-9c13-741e">-</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
             </selectionEntry>
-            <selectionEntry type="upgrade" import="true" name="Irongut Weapon" hidden="false" id="acfa-507b-a4c0-4ddf">
+            <selectionEntry type="upgrade" import="true" name="Bludgeoning Blows" hidden="false" id="fbf0-55d3-2cb4-ec90">
               <constraints>
-                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="375d-a24f-1e28-cad0"/>
-                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3c86-a595-de67-7823"/>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="0a40-736e-538a-040e"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="f046-708f-6f80-73ef"/>
               </constraints>
               <profiles>
-                <profile name="Irongut Weapon" typeId="9074-76b6-9e2f-81e3" typeName="Melee Weapon" hidden="false" id="5b5e-61bb-c592-c812">
+                <profile name="Bludgeoning Blows" typeId="9074-76b6-9e2f-81e3" typeName="Melee Weapon" hidden="false" id="818a-7a07-8aff-340d">
                   <characteristics>
-                    <characteristic name="Atk" typeId="60e-35aa-31ed-e488">3</characteristic>
+                    <characteristic name="Atk" typeId="60e-35aa-31ed-e488">2</characteristic>
                     <characteristic name="Hit" typeId="26dc-168-b2fd-cb93">4+</characteristic>
                     <characteristic name="Wnd" typeId="61c1-22cc-40af-2847">2+</characteristic>
-                    <characteristic name="Rnd" typeId="eccc-10fa-6958-fb73">2</characteristic>
-                    <characteristic name="Dmg" typeId="e948-9c71-12a6-6be4">3</characteristic>
+                    <characteristic name="Rnd" typeId="eccc-10fa-6958-fb73">-</characteristic>
+                    <characteristic name="Dmg" typeId="e948-9c71-12a6-6be4">2</characteristic>
                     <characteristic name="Ability" typeId="eda3-7332-5db1-4159">-</characteristic>
                   </characteristics>
                 </profile>
diff --git a/Ogor Mawtribes.cat b/Ogor Mawtribes.cat
index 2f138c4..a7871cf 100644
--- a/Ogor Mawtribes.cat	
+++ b/Ogor Mawtribes.cat	
@@ -264,7 +264,7 @@
             <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f"/>
           </characteristics>
         </profile>
-        <profile name="Muster Guard" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="4d77-faf5-cd3e-90d8" publicationId="1ac6-e227-a186-12">
+        <profile name="Feast on Flesh" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="4d77-faf5-cd3e-90d8" publicationId="1ac6-e227-a186-12">
           <characteristics>
             <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle (Army), End of Any Turn</characteristic>
             <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb">Pick each friendly **^^Ogor^^** unit that is in combat or that used a **^^Fight^^** ability this turn to be the targets.</characteristic>
diff --git a/Skaven.cat b/Skaven.cat
index 1157144..b923614 100644
--- a/Skaven.cat
+++ b/Skaven.cat
@@ -1371,6 +1371,7 @@ Start of Battle Round</characteristic>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="476b-6ecb-c5f8-cdee" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="6b0b-367d-ec80-2727" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="98d0-7e0e-b303-6db0" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="a894-c0e3-2a4-79d0" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
diff --git a/Soulblight Gravelords.cat b/Soulblight Gravelords.cat
index 261d906..92a9e80 100644
--- a/Soulblight Gravelords.cat	
+++ b/Soulblight Gravelords.cat	
@@ -1925,11 +1925,11 @@
             </profile>
             <profile name="Vile Transference" typeId="7312-8367-c171-f2ef" typeName="Ability (Spell)" hidden="false" id="45d3-46ca-d40-6784">
               <characteristics>
-                <characteristic name="Timing" id="34e1-8be-a910-f9ca" hidden="false" typeId="de6f-d57b-248a-83be">Your Hero Phase</characteristic>
-                <characteristic name="Casting Value" id="6230-df4b-51e9-204a" hidden="false" typeId="9fc7-b0f6-d018-a608">7</characteristic>
-                <characteristic name="Declare" id="7981-c8ae-f469-5c44" hidden="false" typeId="24f8-3803-4ab1-3b6c">Pick a friendly **^^Soulblight Gravelord Wizard^^** to cast this spell, pick a visible enemy unit within 18&quot; of them that has not been picked to be the target of this ability this turn to be the target, then make a casting roll of 2D6.</characteristic>
-                <characteristic name="Effect" id="94f0-4763-e243-b1e" hidden="false" typeId="1cb9-a-1345-907f">Until the start of your next turn, subtract 1 from hit rolls for the target’s attacks and subtract 1 from save rolls for the target.</characteristic>
-                <characteristic name="Keywords" id="3fe2-aa9-9c5b-77ae" hidden="false" typeId="353f-565e-c351-1cf2">**^^Spell^^**, **^^Unlimited^^**</characteristic>
+                <characteristic name="Timing" typeId="de6f-d57b-248a-83be">Your Hero Phase</characteristic>
+                <characteristic name="Casting Value" typeId="9fc7-b0f6-d018-a608">7</characteristic>
+                <characteristic name="Declare" typeId="24f8-3803-4ab1-3b6c">Pick a friendly **^^Soulblight Gravelord Wizard^^** to cast this spell, pick a visible enemy unit within 18&quot; of them that has not been picked to be the target of this ability this turn to be the target, then make a casting roll of 2D6.</characteristic>
+                <characteristic name="Effect" typeId="1cb9-a-1345-907f">Roll a number of dice equal to the number of models in the target unit. For each 6, inflict 1 mortal damage on that unit. If any enemy models were slain by this spell, **Heal(D3)** the caster.</characteristic>
+                <characteristic name="Keywords" typeId="353f-565e-c351-1cf2">**^^Spell^^**, **^^Unlimited^^**</characteristic>
               </characteristics>
             </profile>
             <profile name="Prison of Grief" typeId="7312-8367-c171-f2ef" typeName="Ability (Spell)" hidden="false" id="6ab8-a7d1-4c01-2d77">
diff --git a/Stormcast Eternals - Library.cat b/Stormcast Eternals - Library.cat
index 6484348..aca26d7 100644
--- a/Stormcast Eternals - Library.cat	
+++ b/Stormcast Eternals - Library.cat	
@@ -3627,12 +3627,12 @@ While this unit has 10 or more damage points, add 2 to the Attacks characterist
             </modifier>
             <modifier type="set" value="1" field="1945-a7c0-b012-4e36">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="4fcf-b770-62ff-9013" childId="c461-2ebb-5bbc-81a2" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="c461-2ebb-5bbc-81a2" shared="true"/>
               </conditions>
             </modifier>
             <modifier type="set" value="1" field="e169-9dec-47ff-6a33">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="4fcf-b770-62ff-9013" childId="c461-2ebb-5bbc-81a2" shared="true"/>
+                <condition type="atLeast" value="1" field="selections" scope="parent" childId="c461-2ebb-5bbc-81a2" shared="true"/>
               </conditions>
             </modifier>
           </modifiers>