diff --git a/Imperium - Astra Militarum - Library.cat b/Imperium - Astra Militarum - Library.cat
index 164a7ab..d163554 100644
--- a/Imperium - Astra Militarum - Library.cat	
+++ b/Imperium - Astra Militarum - Library.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="true" id="5a44-f048-114b-e3ff" name="Imperium - Astra Militarum - Library" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="60" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="true" id="5a44-f048-114b-e3ff" name="Imperium - Astra Militarum - Library" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="61" battleScribeVersion="2.03" type="catalogue">
   <sharedSelectionEntries>
     <selectionEntry type="model" import="true" name="Aegis Defence Line" hidden="false" id="cb99-456-f100-40ed">
       <categoryLinks>
@@ -1483,37 +1483,6 @@
                     <constraint type="min" value="9" field="selections" scope="parent" shared="true" id="6709-1561-a93f-43e8"/>
                     <constraint type="max" value="9" field="selections" scope="parent" shared="true" id="6709-1561-a93f-4888"/>
                   </constraints>
-                  <selectionEntries>
-                    <selectionEntry type="model" import="true" name="Jungle Fighter w/ Flamer" hidden="false" id="4a20-b40d-a161-c623">
-                      <infoLinks>
-                        <infoLink name="Catachan Jungle Fighter" hidden="false" type="profile" id="6bad-d404-6761-6a94" targetId="2af2-467-91d2-c0f6"/>
-                      </infoLinks>
-                      <entryLinks>
-                        <entryLink import="true" name="Close Combat Weapon" hidden="false" type="selectionEntry" id="3bfe-3433-ec5-7ccb" targetId="f61b-a631-1446-4453">
-                          <constraints>
-                            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="393b-3715-d84f-4da0"/>
-                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1148-feac-5ce8-b246"/>
-                          </constraints>
-                        </entryLink>
-                        <entryLink import="true" name="Flamer" hidden="false" type="selectionEntry" id="8be6-590b-4def-61e6" targetId="ddae-e6-79d8-3f66">
-                          <constraints>
-                            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4528-5974-7ab4-c554"/>
-                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="66a1-35aa-8e6d-8ea0"/>
-                          </constraints>
-                        </entryLink>
-                      </entryLinks>
-                      <constraints>
-                        <constraint type="max" value="0" field="selections" scope="parent" shared="true" id="b229-eef4-dea5-9a37"/>
-                      </constraints>
-                      <modifiers>
-                        <modifier type="increment" value="1" field="b229-eef4-dea5-9a37">
-                          <repeats>
-                            <repeat value="5" repeats="1" field="selections" scope="fe5a-764e-37ed-7cef" childId="model" shared="true" roundUp="false" id="61e-e6ee-6aa8-1fdf" includeChildSelections="true"/>
-                          </repeats>
-                        </modifier>
-                      </modifiers>
-                    </selectionEntry>
-                  </selectionEntries>
                 </entryLink>
                 <entryLink import="true" name="Jungle Fighter Sergeant" hidden="false" type="selectionEntry" id="71fe-fde2-e5a3-96e3" targetId="70ca-9043-5513-590e">
                   <constraints>
@@ -1530,37 +1499,6 @@
                     <constraint type="min" value="18" field="selections" scope="parent" shared="true" id="6709-1561-a93f-4777"/>
                     <constraint type="max" value="18" field="selections" scope="parent" shared="true" id="6709-1561-a93f-4666"/>
                   </constraints>
-                  <selectionEntries>
-                    <selectionEntry type="model" import="true" name="Jungle Fighter w/ Flamer" hidden="false" id="b201-755b-e727-a7cf">
-                      <infoLinks>
-                        <infoLink name="Catachan Jungle Fighter" hidden="false" type="profile" id="496d-639d-53de-7b8f" targetId="2af2-467-91d2-c0f6"/>
-                      </infoLinks>
-                      <entryLinks>
-                        <entryLink import="true" name="Close Combat Weapon" hidden="false" type="selectionEntry" id="8255-4aa9-b44-6597" targetId="f61b-a631-1446-4453">
-                          <constraints>
-                            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="393b-3715-d84f-4da0"/>
-                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1148-feac-5ce8-b246"/>
-                          </constraints>
-                        </entryLink>
-                        <entryLink import="true" name="Flamer" hidden="false" type="selectionEntry" id="8ad7-fa6-914c-cbe7" targetId="ddae-e6-79d8-3f66">
-                          <constraints>
-                            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4528-5974-7ab4-c554"/>
-                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="66a1-35aa-8e6d-8ea0"/>
-                          </constraints>
-                        </entryLink>
-                      </entryLinks>
-                      <constraints>
-                        <constraint type="max" value="0" field="selections" scope="parent" shared="true" id="b229-eef4-dea5-9a37"/>
-                      </constraints>
-                      <modifiers>
-                        <modifier type="increment" value="1" field="b229-eef4-dea5-9a37">
-                          <repeats>
-                            <repeat value="5" repeats="1" field="selections" scope="fe5a-764e-37ed-7cef" childId="model" shared="true" roundUp="false" id="61e-e6ee-6aa8-1fdf" includeChildSelections="true"/>
-                          </repeats>
-                        </modifier>
-                      </modifiers>
-                    </selectionEntry>
-                  </selectionEntries>
                 </entryLink>
               </entryLinks>
               <modifiers>
@@ -8645,7 +8583,6 @@
             <characteristic name="D" typeId="3254-9fe6-d824-513e">1</characteristic>
             <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">-</characteristic>
           </characteristics>
-          <comment>Castellan</comment>
           <modifiers>
             <modifier type="set" value="3+" field="95d1-95f-45b4-11d6">
               <conditionGroups>
@@ -8660,9 +8597,14 @@
               </conditionGroups>
             </modifier>
             <modifier type="set" value="2" field="2337-daa1-6682-b110">
-              <conditions>
-                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="ea31-5ff2-ab4-ef7e" shared="true"/>
-              </conditions>
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="ea31-5ff2-ab4-ef7e" shared="true"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="df22-5dc1-57dc-e347" shared="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
             <modifier type="set" value="3" field="2337-daa1-6682-b110">
               <conditionGroups>
@@ -18738,7 +18680,24 @@ Each time a model in a SQUADRON unit from your army makes a ranged attack that t
     </selectionEntryGroup>
     <selectionEntryGroup name="Jungle Fighter Selections" hidden="false" id="804c-29d9-bbb3-7c20" defaultSelectionEntryId="789c-d110-7225-5fd0">
       <entryLinks>
-        <entryLink import="true" name="Jungle Fighter" hidden="false" type="selectionEntry" id="789c-d110-7225-5fd0" targetId="a06a-c542-9a54-2c1d"/>
+        <entryLink import="true" name="Jungle Fighter" hidden="false" type="selectionEntry" id="789c-d110-7225-5fd0" targetId="a06a-c542-9a54-2c1d">
+          <constraints>
+            <constraint type="max" value="9" field="selections" scope="parent" shared="true" id="a35e-6b09-d6ec-d8e8" includeChildSelections="false"/>
+            <constraint type="min" value="6" field="selections" scope="parent" shared="true" id="5128-4041-2bd9-4382" includeChildSelections="false"/>
+          </constraints>
+          <modifiers>
+            <modifier type="set" value="18" field="a35e-6b09-d6ec-d8e8">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="unit" childId="74cd-ac31-5fce-4bb0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+            <modifier type="set" value="12" field="5128-4041-2bd9-4382">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="unit" childId="74cd-ac31-5fce-4bb0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <selectionEntries>
         <selectionEntry type="model" import="true" name="Jungle Fighter w/ Vox-caster" hidden="false" id="1340-2451-18dc-ab59">
@@ -18766,7 +18725,36 @@ Each time a model in a SQUADRON unit from your army makes a ranged attack that t
           <modifiers>
             <modifier type="increment" value="1" field="d223-a590-d443-9ec1">
               <conditions>
-                <condition type="equalTo" value="1" field="selections" scope="ancestor" childId="74cd-ac31-5fce-4bb0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+                <condition type="equalTo" value="1" field="selections" scope="unit" childId="74cd-ac31-5fce-4bb0" shared="true" includeChildSelections="true" includeChildForces="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </selectionEntry>
+        <selectionEntry type="model" import="true" name="Jungle Fighter w/ Flamer" hidden="false" id="4a20-b40d-a161-c623">
+          <infoLinks>
+            <infoLink name="Catachan Jungle Fighter" id="6bad-d404-6761-6a94" hidden="false" type="profile" targetId="2af2-467-91d2-c0f6"/>
+          </infoLinks>
+          <entryLinks>
+            <entryLink import="true" name="Close Combat Weapon" hidden="false" id="3bfe-3433-ec5-7ccb" type="selectionEntry" targetId="f61b-a631-1446-4453">
+              <constraints>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="40a2-8290-fe24-b4ac"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="57b0-751f-cc3d-081c"/>
+              </constraints>
+            </entryLink>
+            <entryLink import="true" name="Flamer" hidden="false" id="8be6-590b-4def-61e6" type="selectionEntry" targetId="ddae-e6-79d8-3f66">
+              <constraints>
+                <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="4866-9992-8ff0-25c0"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="86cf-4bbd-1f2f-122b"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+          <constraints>
+            <constraint type="max" value="2" field="selections" scope="parent" shared="true" id="0bf0-8d46-329c-d015"/>
+          </constraints>
+          <modifiers>
+            <modifier type="set" value="4" field="0bf0-8d46-329c-d015">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="unit" childId="74cd-ac31-5fce-4bb0" shared="true" includeChildSelections="true" includeChildForces="true"/>
               </conditions>
             </modifier>
           </modifiers>