diff --git a/Blades of Khorne - Library.cat b/Blades of Khorne - Library.cat
index d437f6e..c9b47d2 100644
--- a/Blades of Khorne - Library.cat	
+++ b/Blades of Khorne - Library.cat	
@@ -1187,7 +1187,7 @@
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="48ed-cf24-6e48-889e" includeChildSelections="false"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Champion" hidden="false" id="2fb4-a8f1-5664-c668" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1">
+                <entryLink import="true" name="Champion" hidden="false" id="2fb4-a8f1-5664-c668" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="4c6b-352c-715-cda7" shared="true" id="728-5ec1-a959-d939"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e3eb-c654-f606-46ec"/>
@@ -1350,10 +1350,11 @@
         </profile>
         <profile name="&apos;Bring Me Their Skull!&apos;" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="82c7-f740-e2fd-74c">
           <characteristics>
-            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle (Army), Your Combat Phase</characteristic>
+            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Turn (Army), Your Combat Phase</characteristic>
             <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb">Pick a friendly **^^Gorechosen^^** unit wholly within 12&quot; of this unit to be the target.</characteristic>
             <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">The target has **^^Strike-first^^** for the rest of the turn.</characteristic>
             <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f"/>
+            <characteristic name="Used By" typeId="1b32-c9d6-3106-166b"/>
           </characteristics>
         </profile>
       </profiles>
diff --git a/Blades of Khorne.cat b/Blades of Khorne.cat
index 902ada1..7944fe2 100644
--- a/Blades of Khorne.cat	
+++ b/Blades of Khorne.cat	
@@ -1144,6 +1144,7 @@
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="43ef-7759-bb6d-81e4" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="2276-240a-fde6-d60a" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="d4b7-ee4a-45ab-18c7" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="e0c4-7af2-b0a2-4718" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -1181,6 +1182,7 @@
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="d4b7-ee4a-45ab-18c7" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="43ef-7759-bb6d-81e4" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="2276-240a-fde6-d60a" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="e0c4-7af2-b0a2-4718" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -1262,6 +1264,7 @@
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="3b5f-188e-d4b6-f639" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="43ef-7759-bb6d-81e4" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="2276-240a-fde6-d60a" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="e0c4-7af2-b0a2-4718" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -1379,6 +1382,7 @@
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="2a37-2478-7c6-2125" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="43ef-7759-bb6d-81e4" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="2276-240a-fde6-d60a" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="e0c4-7af2-b0a2-4718" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
diff --git a/Cities of Sigmar - Library.cat b/Cities of Sigmar - Library.cat
index 3784d3e..5a821b5 100644
--- a/Cities of Sigmar - Library.cat	
+++ b/Cities of Sigmar - Library.cat	
@@ -5257,8 +5257,8 @@ If this unit is destroyed, remove its **Relic Envoy** from the battlefield.</cha
         </selectionEntry>
         <selectionEntry type="model" import="true" name="Arbalester" hidden="false" id="b246-d959-7247-1b72">
           <constraints>
-            <constraint type="min" value="2" field="selections" scope="parent" shared="true" id="5b5c-eb9a-8178-6fa5"/>
-            <constraint type="max" value="2" field="selections" scope="parent" shared="true" id="dbe3-a91b-ba00-49cd"/>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="5b5c-eb9a-8178-6fa5"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="dbe3-a91b-ba00-49cd"/>
           </constraints>
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Hunting Arbalest" hidden="false" id="372d-b969-97ce-beac">
diff --git a/Cities of Sigmar.cat b/Cities of Sigmar.cat
index b740887..4ac8a5d 100644
--- a/Cities of Sigmar.cat	
+++ b/Cities of Sigmar.cat	
@@ -1829,9 +1829,8 @@ In addition, if the target is **^^Duardin^^**, subtract 1 from hit rolls for co
               <conditionGroups>
                 <conditionGroup type="and">
                   <conditions>
-                    <condition type="lessThan" value="1" field="selections" scope="force" childId="4ef2-9b6f-2205-6e1a" shared="true"/>
-                    <condition type="lessThan" value="1" field="selections" scope="force" childId="d448-6492-8fc1-ed92" shared="true"/>
-                    <condition type="lessThan" value="1" field="selections" scope="force" childId="e4b8-863b-6d0b-c9d7" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="db4f-981-b206-2fc5" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="a676-2bc6-ff1a-959c" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
diff --git a/Daughters of Khaine - The Croneseer's Pariahs.cat b/Daughters of Khaine - The Croneseer's Pariahs.cat
index 119aeb6..fee5ab5 100644
--- a/Daughters of Khaine - The Croneseer's Pariahs.cat	
+++ b/Daughters of Khaine - The Croneseer's Pariahs.cat	
@@ -260,7 +260,7 @@
         </modifier>
       </modifiers>
       <costs>
-        <cost name="pts" typeId="points" value="100"/>
+        <cost name="pts" typeId="points" value="110"/>
       </costs>
       <categoryLinks>
         <categoryLink name="CRONESEER&apos;S PARIAHS" hidden="false" id="7f16-a47f-b425-6514" targetId="b5ae-3746-e5a6-7010" primary="false"/>
@@ -420,7 +420,7 @@
         </modifier>
       </modifiers>
       <costs>
-        <cost name="pts" typeId="points" value="110"/>
+        <cost name="pts" typeId="points" value="100"/>
       </costs>
       <categoryLinks>
         <categoryLink name="CRONESEER&apos;S PARIAHS" hidden="false" id="6966-1917-808-6a8a" targetId="b5ae-3746-e5a6-7010" primary="false"/>
diff --git a/Daughters of Khaine.cat b/Daughters of Khaine.cat
index a9856dc..30a8783 100644
--- a/Daughters of Khaine.cat	
+++ b/Daughters of Khaine.cat	
@@ -386,7 +386,7 @@ If the target unit has 20 or more models, inflict 6 mortal damage on the target
         <entryLink import="true" name="Heroic Traits" hidden="false" id="a8e6-4849-b2f2-2023" type="selectionEntryGroup" targetId="9734-20e7-d9c1-322e"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="180"/>
+        <cost name="pts" typeId="points" value="220"/>
       </costs>
     </entryLink>
     <entryLink import="true" name="Bloodwrack Shrine" hidden="false" id="7d3b-1f93-9e59-9a2a" type="selectionEntry" targetId="c881-aa4e-db19-f0a">
@@ -639,7 +639,7 @@ If the target unit has 20 or more models, inflict 6 mortal damage on the target
         <entryLink import="true" name="Artefacts of Power" hidden="false" id="98fb-2853-a1fe-7de6" type="selectionEntryGroup" targetId="784d-e1b4-30d5-3167"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="180"/>
+        <cost name="pts" typeId="points" value="220"/>
       </costs>
     </entryLink>
     <entryLink import="true" name="Bloodwrack Shrine" hidden="false" id="f9e8-542c-3020-b170" type="selectionEntry" targetId="c881-aa4e-db19-f0a">
@@ -1020,7 +1020,7 @@ If the target unit has 20 or more models, inflict 6 mortal damage on the target
         </modifier>
       </modifiers>
       <costs>
-        <cost name="pts" typeId="points" value="100"/>
+        <cost name="pts" typeId="points" value="110"/>
       </costs>
     </entryLink>
     <entryLink import="true" name="Khinerai Lifetakers" hidden="false" id="5390-3187-25da-fda3" type="selectionEntry" targetId="2194-f219-8c36-54d2">
@@ -1165,7 +1165,7 @@ If the target unit has 20 or more models, inflict 6 mortal damage on the target
         </modifier>
       </modifiers>
       <costs>
-        <cost name="pts" typeId="points" value="110"/>
+        <cost name="pts" typeId="points" value="100"/>
       </costs>
     </entryLink>
     <entryLink import="true" name="Gryselle&apos;s Arenai" hidden="false" id="d339-5695-e369-16c9" type="selectionEntry" targetId="1b40-a642-bb25-f40a">
diff --git a/Flesh-eater Courts - Library.cat b/Flesh-eater Courts - Library.cat
index eb42853..e285ff0 100644
--- a/Flesh-eater Courts - Library.cat	
+++ b/Flesh-eater Courts - Library.cat	
@@ -1086,7 +1086,7 @@ with this unit to be the target.</characteristic>
         <categoryLink name="WARD (6+)" hidden="false" id="c0ba-bf79-1e39-46eb" targetId="70a4-383f-421f-52cd" primary="false"/>
         <categoryLink name="INFANTRY" hidden="false" id="d502-2268-834c-ab40" targetId="75d6-6995-dfcc-3898" primary="false"/>
         <categoryLink name="ABHORRENT" hidden="false" id="ffb7-60c0-b3a6-16af" targetId="b59b-b9ff-5e6e-87b2" primary="false"/>
-        <categoryLink name="WIZARD (1)" hidden="false" id="329e-f133-ed4c-aea9" targetId="6f28-c3f6-4b1b-8aff" primary="false"/>
+        <categoryLink name="WIZARD (2)" hidden="false" id="b78e-d208-8a21-e689" targetId="8179-697a-9f4c-91d4" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="c901-e5e2-39df-510e" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
@@ -1110,7 +1110,7 @@ with this unit to be the target.</characteristic>
             <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f">**^^Core^^**</characteristic>
           </characteristics>
         </profile>
-        <profile name="Bounding Strides" typeId="7312-8367-c171-f2ef" typeName="Ability (Spell)" hidden="false" id="df26-4753-6761-c134">
+        <profile name="Carrion Call" typeId="7312-8367-c171-f2ef" typeName="Ability (Spell)" hidden="false" id="df26-4753-6761-c134">
           <characteristics>
             <characteristic name="Timing" typeId="de6f-d57b-248a-83be">Your Hero Phase</characteristic>
             <characteristic name="Casting Value" typeId="9fc7-b0f6-d018-a608">6</characteristic>
diff --git a/Gloomspite Gitz.cat b/Gloomspite Gitz.cat
index bba9c02..697f9c3 100644
--- a/Gloomspite Gitz.cat	
+++ b/Gloomspite Gitz.cat	
@@ -1745,7 +1745,7 @@ While a friendly **^^Gloomspite Gitz^^** unit is **under the light of the Bad M
         <entryLink import="true" name="Artefacts of Power" hidden="false" id="1c74-a816-2867-6c21" type="selectionEntryGroup" targetId="571d-f460-9591-c3cc"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="130"/>
+        <cost name="pts" typeId="points" value="210"/>
       </costs>
     </entryLink>
     <entryLink import="true" name="Mollog" hidden="false" id="4dd1-a405-1cb6-dd9b" type="selectionEntry" targetId="0b91-2c2c-3a1d-1326">
@@ -1768,7 +1768,7 @@ While a friendly **^^Gloomspite Gitz^^** unit is **under the light of the Bad M
         <entryLink import="true" name="Artefacts of Power" hidden="false" id="c2a0-f22b-c2a6-91b9" type="selectionEntryGroup" targetId="571d-f460-9591-c3cc"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="130"/>
+        <cost name="pts" typeId="points" value="210"/>
       </costs>
     </entryLink>
   </entryLinks>
diff --git a/Hedonites of Slaanesh - Library.cat b/Hedonites of Slaanesh - Library.cat
index 92dc601..f41654f 100644
--- a/Hedonites of Slaanesh - Library.cat	
+++ b/Hedonites of Slaanesh - Library.cat	
@@ -2,9 +2,6 @@
 <catalogue library="true" id="34e0-2290-e185-efd2" name="Hedonites of Slaanesh - Library" gameSystemId="e51d-b1a3-75fc-dc3g" gameSystemRevision="2" revision="1" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <sharedSelectionEntries>
     <selectionEntry type="unit" import="true" name="Bladebringer, Herald on Exalted Chariot" hidden="false" id="95eb-6e32-fd0f-7b39" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="a7a-8b29-1b89-c0e6" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="da4a-90c3-77a4-3339" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -438,9 +435,6 @@ Add 1 to the Attacks characteristic of this unit’s **Impaling Talons** for ea
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Keeper of Secrets" hidden="false" id="4011-5d78-a180-3c22" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="73d3-2855-a433-106" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="6510-cbf3-bdbf-23fd" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -553,9 +547,6 @@ Then, add 1 to the Damage characteristic of this unit’s **Elegant Greatblade*
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Contorted Epitome" hidden="false" id="7ff4-32c2-f67e-5476" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="f690-8453-993b-6c9c" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="5b4-eade-b3d5-347a" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -720,9 +711,6 @@ Then, add 1 to the Damage characteristic of this unit’s **Elegant Greatblade*
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Shardspeaker of Slaanesh" hidden="false" id="27ef-714f-2f7-3770" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="e573-b2b5-8ad2-ec57" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="20f1-a7-5c74-ce70" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -1210,7 +1198,6 @@ Subtract 1 from hit rolls for shooting attacks that target this unit while it h
         <categoryLink name="INFANTRY" hidden="false" id="da43-b24d-81f7-e373" targetId="75d6-6995-dfcc-3898" primary="true"/>
         <categoryLink name="CHAMPION" hidden="false" id="ccc0-e4bf-9cf0-f560" targetId="f679-3bcb-d664-9ac3" primary="false"/>
         <categoryLink name="CHAOS" hidden="false" id="7c1c-23e0-4c52-3dc5" targetId="319b-38ee-d10d-e800" primary="false"/>
-        <categoryLink name="WARD (6+)" hidden="false" id="1597-b09e-a8d8-fc48" targetId="70a4-383f-421f-52cd" primary="false"/>
         <categoryLink name="HEDONITES OF SLAANESH" hidden="false" id="1f21-fc5-74bb-d504" targetId="67df-cdfb-d83f-3197" primary="false"/>
         <categoryLink name="SYBARITE" hidden="false" id="f4d9-4ba7-16e1-264f" targetId="9a4b-cd0b-84e1-16c5" primary="false"/>
       </categoryLinks>
@@ -1403,9 +1390,6 @@ Subtract 1 from hit rolls for shooting attacks that target this unit while it h
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Infernal Enrapturess, Herald of Slaanesh" hidden="false" id="37ec-d134-cffd-d637" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="dad9-1377-2804-7f52" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="d31b-5090-f8e-b30a" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -1484,9 +1468,6 @@ Subtract 1 from hit rolls for shooting attacks that target this unit while it h
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Lord of Hubris" hidden="false" id="ef1b-a791-66b4-735f" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="cd8a-cf07-73dd-fad4" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="8d1a-5c5e-4dae-fa2d" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -1805,9 +1786,6 @@ Subtract 1 from hit rolls for shooting attacks that target this unit while it h
       </selectionEntries>
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Lord of Pain" hidden="false" id="4890-8c79-a2bd-b1ad" publicationId="95fc-e96f-a916-bba1">
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="7917-62a9-225b-99a4" includeChildSelections="true"/>
-      </constraints>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="cf01-8af3-1eef-c5e0" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
@@ -1875,7 +1853,7 @@ Subtract 1 from hit rolls for shooting attacks that target this unit while it h
         <profile name="Fiends" typeId="ff03-376e-972f-8ab2" typeName="Unit" hidden="false" id="9ebb-b7af-d056-bac9">
           <characteristics>
             <characteristic name="Move" typeId="fed0-d1b3-1bb8-c501">10&quot;</characteristic>
-            <characteristic name="Health" typeId="96be-54ae-ce7b-10b7">5</characteristic>
+            <characteristic name="Health" typeId="96be-54ae-ce7b-10b7">4</characteristic>
             <characteristic name="Save" typeId="1981-ef09-96f6-7aa9">5+</characteristic>
             <characteristic name="Control" typeId="6c6f-8510-9ce1-fc6e">1</characteristic>
           </characteristics>
diff --git a/Hedonites of Slaanesh.cat b/Hedonites of Slaanesh.cat
index 21e0cea..5ff68ea 100644
--- a/Hedonites of Slaanesh.cat	
+++ b/Hedonites of Slaanesh.cat	
@@ -8,7 +8,7 @@
       <profiles>
         <profile name="An Excess of Depravity" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="5e45-93e3-812-ec14" publicationId="95fc-e96f-a916-bba1">
           <characteristics>
-            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Any Combat Phase</characteristic>
+            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Start of Battle Round</characteristic>
             <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb">Pick up to 3 friendly **^^Hedonites of Slaanesh units to be the targets.</characteristic>
             <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">The targets have the **^^Euphoric^^** keyword for the rest of the battle round.
 In addition, for each friendly unit you pick, give your opponent 1 temptation dice. Your opponent can use 1 temptation dice to replace 1 wound roll, 1 save roll, 1 ward roll or 1 run roll for a unit in their army with a 6, or they can use 2 temptation dice to replace 2 of the dice in a charge roll for a unit in their army with two 6s.
@@ -57,10 +57,11 @@ At the end of the battle round, any temptation dice that have not been used ar
               <profiles>
                 <profile name="Pendant of Slaanesh" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="8f5f-aeb-b615-1cfa">
                   <characteristics>
-                    <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle, Any Combat Phase</characteristic>
+                    <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">End of Any Turn</characteristic>
                     <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb"/>
                     <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">If any damage points were allocated to this unit this turn, **Heal (3)** this unit.</characteristic>
                     <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f"/>
+                    <characteristic name="Used By" typeId="1b32-c9d6-3106-166b"/>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Kharadron Overlords - Library.cat b/Kharadron Overlords - Library.cat
index deecc44..9790492 100644
--- a/Kharadron Overlords - Library.cat	
+++ b/Kharadron Overlords - Library.cat	
@@ -1249,6 +1249,15 @@
             <characteristic name="Control" typeId="6c6f-8510-9ce1-fc6e">1</characteristic>
           </characteristics>
         </profile>
+        <profile name="Emergency Field Repairs" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="a280-d5da-243e-b4fc">
+          <characteristics>
+            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">End of Any Turn</characteristic>
+            <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb">Pick a friendly **^^Skyvessel^^** within this unit’s combat range to be the target.</characteristic>
+            <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">Make a field repairs roll of D6 for each model in this unit. For each 4-5, **Heal (1)** the target. For each 6, **Heal (2)** the target.</characteristic>
+            <characteristic name="Keywords" typeId="12e8-3214-7d8f-1d0f"/>
+            <characteristic name="Used By" typeId="1b32-c9d6-3106-166b"/>
+          </characteristics>
+        </profile>
       </profiles>
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Endrinrigger" hidden="false" id="1c1a-b369-b36d-cbe4" defaultAmount="1,1,1" collective="false">
diff --git a/Lumineth Realm-lords - Library.cat b/Lumineth Realm-lords - Library.cat
index 413165b..46b5f93 100644
--- a/Lumineth Realm-lords - Library.cat	
+++ b/Lumineth Realm-lords - Library.cat	
@@ -1787,9 +1787,6 @@ If Ellathor takes the lead, until the start of your next turn, add the current
           </characteristics>
         </profile>
       </profiles>
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="roster" shared="true" id="4862-da37-9b62-a632" includeChildSelections="true"/>
-      </constraints>
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Hurakan Spirit of the Wind" hidden="false" id="49af-decd-a213-1d08">
           <selectionEntries>
diff --git a/Ogor Mawtribes - The Roving Maw.cat b/Ogor Mawtribes - The Roving Maw.cat
index 570744a..eea6bd3 100644
--- a/Ogor Mawtribes - The Roving Maw.cat	
+++ b/Ogor Mawtribes - The Roving Maw.cat	
@@ -288,6 +288,38 @@
       </costs>
     </entryLink>
     <entryLink import="true" name="Battle Traits: The Roving Maw" hidden="false" id="55d5-303c-34ab-969d" type="selectionEntry" targetId="5917-becd-a7c9-7d43"/>
+    <entryLink import="true" name="Gorger Mawpack" hidden="false" id="9cdc-56f1-dedf-afe7" type="selectionEntry" targetId="8d6b-1912-d60a-5163">
+      <entryLinks>
+        <entryLink import="true" name="Reinforced" hidden="false" id="3cd7-d21c-087b-7bd9" type="selectionEntry" targetId="1b37-82b8-c062-eb82"/>
+      </entryLinks>
+      <modifiers>
+        <modifier type="multiply" value="2" field="points">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="self" childId="1b37-82b8-c062-eb82" shared="true"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="true" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="854e-5de7-7cb0-9eac" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="ddb7-1a3d-36fd-d182" shared="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="376a-6b97-8699-dd59" shared="true"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+      </modifiers>
+      <costs>
+        <cost name="pts" typeId="points" value="260"/>
+      </costs>
+    </entryLink>
   </entryLinks>
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Ogor Mawtribes - Library" id="2343-bad6-c703-f5b3" targetId="9a90-83e7-7a45-6aed"/>
diff --git a/Ossiarch Bonereapers.cat b/Ossiarch Bonereapers.cat
index c7440ec..fb2c87f 100644
--- a/Ossiarch Bonereapers.cat	
+++ b/Ossiarch Bonereapers.cat	
@@ -491,6 +491,7 @@
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="dbe5-2c39-2d83-5bde" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="c3eb-a11c-f7fa-2cfb" shared="true"/>
                     <condition type="lessThan" value="1" field="selections" scope="force" childId="b55b-62e8-e8fe-88c7" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="a808-e9cc-f583-1bb8" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
diff --git a/Regiments of Renown.cat b/Regiments of Renown.cat
index cd91045..960980c 100644
--- a/Regiments of Renown.cat	
+++ b/Regiments of Renown.cat	
@@ -2313,7 +2313,7 @@ Subtract 3 from the control scores of friendly **^^Krittok&apos;s Clawpack^^** u
       <profiles>
         <profile name="Behold My Genius!" typeId="59b6-d47a-a68a-5dcc" typeName="Ability (Activated)" hidden="false" id="b23e-2d23-0cf1-1e67">
           <characteristics>
-            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Turn (Army), Your Shooting Phase</characteristic>
+            <characteristic name="Timing" typeId="652c-3d84-4e7-14f4">Once Per Battle (Army), Your Shooting Phase</characteristic>
             <characteristic name="Declare" typeId="bad3-f9c5-ba46-18cb">Pick all friendly **^^Volt-Klaw&apos;s Enginecoven^^** units to be the targets.</characteristic>
             <characteristic name="Effect" typeId="b6f1-ba36-6cd-3b03">Until the start of your next turn:
 • Add 1 to hit rolls for the targets&apos; shooting attacks.
diff --git a/Skaven - Library.cat b/Skaven - Library.cat
index 00bd541..6fa3d2d 100644
--- a/Skaven - Library.cat	
+++ b/Skaven - Library.cat	
@@ -645,8 +645,8 @@
         <categoryLink name="CHAOS" hidden="false" id="8f16-695-97b5-c9ed" targetId="319b-38ee-d10d-e800" primary="false"/>
         <categoryLink name="WARD (5+)" hidden="false" id="ce9a-6482-4aa7-9c3c" targetId="52cc-95fd-6cd3-8f72" primary="false"/>
         <categoryLink name="WAR MACHINE" hidden="false" id="25ba-47ef-64b4-1a24" targetId="f7bc-b618-4b5d-2bae" primary="false"/>
-        <categoryLink name="WIZARD (1)" hidden="false" id="dba0-29d4-5dca-3dfc" targetId="6f28-c3f6-4b1b-8aff" primary="false"/>
         <categoryLink name="MASTERCLAN" hidden="false" id="f0d7-c966-4184-b7ce" targetId="7974-c5a2-e00a-f98f" primary="false"/>
+        <categoryLink name="WIZARD (2)" hidden="false" id="e4e3-6faa-106d-6f5c" targetId="8179-697a-9f4c-91d4" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="b136-74ef-32d3-16c8" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
@@ -1555,7 +1555,7 @@ Your Shooting Phase</characteristic>
               <profiles>
                 <profile name="Claws, Blades and Fangs" typeId="9074-76b6-9e2f-81e3" typeName="Melee Weapon" hidden="false" id="a899-9a5d-8447-3ac7">
                   <characteristics>
-                    <characteristic name="Atk" typeId="60e-35aa-31ed-e488">4</characteristic>
+                    <characteristic name="Atk" typeId="60e-35aa-31ed-e488">5</characteristic>
                     <characteristic name="Hit" typeId="26dc-168-b2fd-cb93">4+</characteristic>
                     <characteristic name="Wnd" typeId="61c1-22cc-40af-2847">3+</characteristic>
                     <characteristic name="Rnd" typeId="eccc-10fa-6958-fb73">1</characteristic>
@@ -1668,6 +1668,18 @@ Your Shooting Phase</characteristic>
             <constraint type="min" value="2" field="selections" scope="parent" shared="true" id="830f-16f1-ed09-82dd"/>
             <constraint type="max" value="2" field="selections" scope="parent" shared="true" id="d0ef-30f1-c9df-3f2a"/>
           </constraints>
+          <modifiers>
+            <modifier type="increment" value="2" field="830f-16f1-ed09-82dd">
+              <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="2" field="d0ef-30f1-c9df-3f2a">
+              <repeats>
+                <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="1b37-82b8-c062-eb82" shared="true" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
         </selectionEntry>
       </selectionEntries>
     </selectionEntry>
@@ -1734,6 +1746,18 @@ Your Shooting Phase</characteristic>
             <constraint type="min" value="3" field="selections" scope="parent" shared="true" id="3295-a50-b074-19ce"/>
             <constraint type="max" value="3" field="selections" scope="parent" shared="true" id="3525-5971-867b-8335"/>
           </constraints>
+          <modifiers>
+            <modifier type="increment" value="3" field="3295-a50-b074-19ce">
+              <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="3" field="3525-5971-867b-8335">
+              <repeats>
+                <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="1b37-82b8-c062-eb82" shared="true" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
         </selectionEntry>
       </selectionEntries>
       <infoLinks>
@@ -2424,7 +2448,7 @@ Then, pick up to 3 enemy units that this unit passed across during that move to
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="880d-fe38-59ea-40e"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Standard Bearer" hidden="false" id="599-dbfe-7b44-9c77" type="selectionEntry" targetId="7f34-77c9-597-62c3" defaultAmount="1">
+                <entryLink import="true" name="Standard Bearer" hidden="false" id="599-dbfe-7b44-9c77" type="selectionEntry" targetId="7f34-77c9-597-62c3" defaultAmount="0,0,1,0">
                   <modifiers>
                     <modifier type="increment" value="1" field="664-7978-a80e-4945">
                       <repeats>
@@ -2437,7 +2461,7 @@ Then, pick up to 3 enemy units that this unit passed across during that move to
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="209b-8c5d-ed7f-1b9f"/>
                   </constraints>
                 </entryLink>
-                <entryLink import="true" name="Musician" hidden="false" id="2c27-b320-9fc5-636a" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount="1">
+                <entryLink import="true" name="Musician" hidden="false" id="2c27-b320-9fc5-636a" type="selectionEntry" targetId="2475-183b-3802-4431" defaultAmount="0,1,0,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="fed2-4975-ae44-473" shared="true" id="740d-3499-2143-19ea" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="fb50-f949-17ee-863c"/>
@@ -2450,7 +2474,7 @@ Then, pick up to 3 enemy units that this unit passed across during that move to
                     </modifier>
                   </modifiers>
                 </entryLink>
-                <entryLink import="true" name="Champion" hidden="false" id="c01d-817a-be5f-c13a" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1">
+                <entryLink import="true" name="Champion" hidden="false" id="c01d-817a-be5f-c13a" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0,0,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="fed2-4975-ae44-473" shared="true" id="4746-70de-4cb8-7131" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="79d3-35ea-7c92-780a"/>
@@ -3041,7 +3065,7 @@ However, for each unmodified hit roll of 1 for an attack made with this unit’
         </profile>
       </profiles>
       <selectionEntries>
-        <selectionEntry type="model" import="true" name="Night Runner" hidden="false" id="9b59-98ab-c05d-31c1" defaultAmount="1, 9">
+        <selectionEntry type="model" import="true" name="Night Runner" hidden="false" id="9b59-98ab-c05d-31c1" defaultAmount="1,9">
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Slings and Poisoned Stars" hidden="false" id="9797-a128-a0ee-c201">
               <constraints>
@@ -3091,7 +3115,7 @@ However, for each unmodified hit roll of 1 for an attack made with this unit’
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2db7-5ec7-1439-b4"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Champion" hidden="false" id="482e-1e66-8bad-b03c" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1">
+                <entryLink import="true" name="Champion" hidden="false" id="482e-1e66-8bad-b03c" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="687e-ab15-48d9-4103" shared="true" id="6ee0-c70f-52f3-3bdf" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="4f4a-49cb-ab0d-f367"/>
diff --git a/Skaven.cat b/Skaven.cat
index 0317527..1b9b79b 100644
--- a/Skaven.cat
+++ b/Skaven.cat
@@ -1073,6 +1073,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1211,6 +1212,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1281,6 +1283,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1529,6 +1532,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1599,6 +1603,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1747,6 +1752,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1814,6 +1820,7 @@ Start of Battle Round</characteristic>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
                         <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2204,6 +2211,7 @@ Start of Battle Round</characteristic>
                     <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="ecc8-7506-0ac3-ca80" shared="true"/>
+                    <condition type="lessThan" value="1" field="selections" scope="force" childId="a894-c0e3-2a4-79d0" shared="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -2292,6 +2300,37 @@ Start of Battle Round</characteristic>
       <costs>
         <cost name="pts" typeId="points" value="170"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="-1" field="selections" scope="force" shared="true" id="a51b-4937-5f73-9038"/>
+      </constraints>
+      <modifierGroups>
+        <modifierGroup type="and">
+          <modifiers>
+            <modifier type="set" value="0" field="a51b-4937-5f73-9038">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="atLeast" value="2" field="selections" scope="force" childId="f7bc-b618-4b5d-2bae" shared="true"/>
+                  </conditions>
+                  <conditionGroups>
+                    <conditionGroup type="and">
+                      <conditions>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="74d6-aac6-649e-4b16" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="d81b-11e8-df5e-ec45" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="6d73-85ea-7f91-5baf" shared="true"/>
+                        <condition type="lessThan" value="1" field="selections" scope="force" childId="5a48-e3a1-625c-dae1" shared="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+          <conditions>
+            <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="376a-6b97-8699-dd59" shared="true"/>
+          </conditions>
+        </modifierGroup>
+      </modifierGroups>
     </entryLink>
     <entryLink import="true" name="Warpvolt Scourgers" hidden="false" id="14ea-300f-e30d-4382" type="selectionEntry" targetId="1199-30df-f5c1-5f1c">
       <entryLinks>
diff --git a/Slaves to Darkness - Library.cat b/Slaves to Darkness - Library.cat
index c719df6..0d6986f 100644
--- a/Slaves to Darkness - Library.cat	
+++ b/Slaves to Darkness - Library.cat	
@@ -2873,30 +2873,20 @@
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Raptoryx" hidden="false" id="4f8b-c985-1aed-2381">
           <constraints>
-            <constraint type="min" value="3" field="selections" scope="parent" shared="true" id="bcfb-a7f7-880b-923c"/>
-            <constraint type="max" value="3" field="selections" scope="parent" shared="true" id="6096-32f9-3085-796b"/>
+            <constraint type="min" value="6" field="selections" scope="parent" shared="true" id="bcfb-a7f7-880b-923c"/>
+            <constraint type="max" value="6" field="selections" scope="parent" shared="true" id="6096-32f9-3085-796b"/>
           </constraints>
           <modifiers>
-            <modifier type="increment" value="3" field="bcfb-a7f7-880b-923c">
+            <modifier type="increment" value="6" field="bcfb-a7f7-880b-923c">
               <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="3" field="6096-32f9-3085-796b">
+            <modifier type="increment" value="6" field="6096-32f9-3085-796b">
               <repeats>
                 <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="1b37-82b8-c062-eb82" shared="true" roundUp="false"/>
               </repeats>
             </modifier>
-            <modifier type="decrement" value="1" field="bcfb-a7f7-880b-923c">
-              <repeats>
-                <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="9c77-5e0b-a20f-d885" shared="true" roundUp="false"/>
-              </repeats>
-            </modifier>
-            <modifier type="decrement" value="1" field="6096-32f9-3085-796b">
-              <repeats>
-                <repeat value="1" repeats="1" field="selections" scope="root-entry" childId="9c77-5e0b-a20f-d885" shared="true" roundUp="false"/>
-              </repeats>
-            </modifier>
           </modifiers>
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Razor-sharp Beak and Talons" hidden="false" id="9218-77c0-9a97-d5a4">
diff --git a/Stormcast Eternals - Library.cat b/Stormcast Eternals - Library.cat
index c727e7d..6575339 100644
--- a/Stormcast Eternals - Library.cat	
+++ b/Stormcast Eternals - Library.cat	
@@ -1401,12 +1401,12 @@ This unit has **^^Ward (4+)^^** against mortal damage inflicted by **^^Manifest
         </selectionEntry>
       </selectionEntries>
     </selectionEntry>
-    <selectionEntry type="unit" import="true" name="Lord-Imperitant" hidden="false" id="c1b5-c776-1613-a463" publicationId="daf8-1c23-a61e-b132">
+    <selectionEntry type="unit" import="true" name="Lord-Imperatant" hidden="false" id="c1b5-c776-1613-a463" publicationId="daf8-1c23-a61e-b132">
       <entryLinks>
         <entryLink import="true" name="General" hidden="false" id="d4dc-79b1-e4f6-be20" type="selectionEntry" targetId="a56b-952e-ad15-7868"/>
       </entryLinks>
       <profiles>
-        <profile name="Lord-Imperitant" typeId="ff03-376e-972f-8ab2" typeName="Unit" hidden="false" id="d330-6204-86ec-c3c3">
+        <profile name="Lord-Imperatant" typeId="ff03-376e-972f-8ab2" typeName="Unit" hidden="false" id="d330-6204-86ec-c3c3">
           <characteristics>
             <characteristic name="Move" typeId="fed0-d1b3-1bb8-c501">5&quot;</characteristic>
             <characteristic name="Health" typeId="96be-54ae-ce7b-10b7">6</characteristic>
@@ -1437,7 +1437,7 @@ This unit has **^^Ward (4+)^^** against mortal damage inflicted by **^^Manifest
         <categoryLink name="WARRIOR CHAMBER" hidden="false" id="5c7b-b418-19dd-881" targetId="94a8-e786-4b45-1c16" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry type="model" import="true" name="Lord-Imperitant" hidden="false" id="8733-c74f-2be1-a683">
+        <selectionEntry type="model" import="true" name="Lord-Imperatant" hidden="false" id="8733-c74f-2be1-a683">
           <selectionEntries>
             <selectionEntry type="upgrade" import="true" name="Blessed Warhammer" hidden="false" id="ec8b-7fc7-7798-c173">
               <profiles>
@@ -2380,7 +2380,7 @@ While this unit has 10 or more damage points, add 2 to the Attacks characterist
                     <characteristic name="Hit" typeId="26dc-168-b2fd-cb93">3+</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">1</characteristic>
+                    <characteristic name="Dmg" typeId="e948-9c71-12a6-6be4">2</characteristic>
                     <characteristic name="Ability" typeId="eda3-7332-5db1-4159">-</characteristic>
                   </characteristics>
                 </profile>
@@ -3449,7 +3449,7 @@ While this unit has 10 or more damage points, add 2 to the Attacks characterist
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8fae-cff1-ea31-b23" includeChildSelections="false"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Champion" hidden="false" id="2f4e-9e3d-93d6-8d84" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1">
+                <entryLink import="true" name="Champion" hidden="false" id="2f4e-9e3d-93d6-8d84" type="selectionEntry" targetId="9c21-1746-9873-a5b5" defaultAmount="1,0">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="e845-969a-b1fd-4b49" shared="true" id="5d3a-243b-6e9-962a" includeChildSelections="true"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="84d-48b2-655d-dd48"/>
@@ -3627,12 +3627,17 @@ 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="parent" childId="c461-2ebb-5bbc-81a2" shared="true"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c461-2ebb-5bbc-81a2" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
             <modifier type="set" value="1" field="e169-9dec-47ff-6a33">
               <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="parent" childId="c461-2ebb-5bbc-81a2" shared="true"/>
+                <condition type="instanceOf" value="1" field="selections" scope="root-entry" childId="c461-2ebb-5bbc-81a2" shared="true" includeChildSelections="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" value="1" field="defaultAmount">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="root-entry" childId="c461-2ebb-5bbc-81a2" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
diff --git a/Stormcast Eternals.cat b/Stormcast Eternals.cat
index 5c623d9..284287f 100644
--- a/Stormcast Eternals.cat	
+++ b/Stormcast Eternals.cat	
@@ -2771,6 +2771,9 @@
       <costs>
         <cost name="pts" typeId="points" value="170"/>
       </costs>
+      <categoryLinks>
+        <categoryLink name="Undersize Unit" hidden="false" id="1307-a6a0-9b3a-7232" targetId="c461-2ebb-5bbc-81a2" primary="false"/>
+      </categoryLinks>
     </entryLink>
     <entryLink import="true" name="Vanguard-Palladors with Shock Handaxes" hidden="false" id="06dc-0524-9216-13fd" type="selectionEntry" targetId="2d01-fd48-55af-dc1c">
       <modifiers>