diff --git a/Tau - Codex (2015).cat b/Tau - Codex (2015).cat
index 99eb44a7..617ffdba 100644
--- a/Tau - Codex (2015).cat	
+++ b/Tau - Codex (2015).cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="24a0-49b6-ecef-1c5a" revision="32" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="23" battleScribeVersion="1.15" name="Tau Empire: Codex (2015)" books="Codex: Tau Empire (2015), Kau&apos;yon (2015), Mont&apos;ka (2015), Imperial Armour 4: Second Edition (2012), Death From the Skies (2016)" authorName="Eric Falsken" authorContact="eric@everylittlething.net" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="24a0-49b6-ecef-1c5a" revision="33" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="23" battleScribeVersion="1.15" name="Tau Empire: Codex (2015)" books="Codex: Tau Empire (2015), Kau&apos;yon (2015), Mont&apos;ka (2015), Imperial Armour 4: Second Edition (2012), Death From the Skies (2016)" authorName="Eric Falsken" authorContact="eric@everylittlething.net" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entries>
     <entry id="624c35d9-cb7e-26b8-1d3a-77a4bc324d57" name="Ambush Spearhead" points="75.0" categoryId="38cf4ccf-0665-45cb-a773-fea06ee1467a" type="upgrade" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Spearhead_Expansion.pdf" page="11">
       <entries/>
@@ -6567,15 +6567,15 @@ Killing Blade: Rending until the end of the current phase.</description>
       <profiles/>
       <links/>
     </entry>
-    <entry id="ce67-bb3a-9d9d-3e75" name="KX139 Ta&apos;unar Supremacy Armour" points="600.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forgeworld Datasheet">
+    <entry id="ce67-bb3a-9d9d-3e75" name="KX139 Ta&apos;unar Supremacy Armour" points="600.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="Forgeworld PDF">
       <entries>
-        <entry id="efb3-dc3e-7b63-0aad" name="Vigilance Defence System" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="FW pdf">
+        <entry id="efb3-dc3e-7b63-0aad" name="Vigilance Defence System" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
           <entries/>
           <entryGroups/>
           <modifiers/>
           <rules/>
           <profiles>
-            <profile id="faba-8068-4a5a-a53e" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" name="Vigilance Defence System" hidden="false" book="FW pdf">
+            <profile id="faba-8068-4a5a-a53e" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" name="Vigilance Defence System" hidden="false" book="Forgeworld PDF">
               <characteristics>
                 <characteristic characteristicId="21befb24-fc85-4f52-a745-64b2e48f8228" name="Description" value="The vigilance defence system comprises two smart missile systems and two twin-linked burst cannon which may be fired normally. In addition, these weapons can be used to make Overwatch attacks at BS2 contrary to the usual rules for Gargantuan Creatures."/>
               </characteristics>
@@ -6591,7 +6591,7 @@ Killing Blade: Rending until the end of the current phase.</description>
             </link>
           </links>
         </entry>
-        <entry id="1b39-6ef1-c33d-5acd" name="Barrier Shield Generator" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="FW pdf">
+        <entry id="1b39-6ef1-c33d-5acd" name="Barrier Shield Generator" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
           <entries/>
           <entryGroups/>
           <modifiers/>
@@ -6610,13 +6610,13 @@ Killing Blade: Rending until the end of the current phase.</description>
       <entryGroups>
         <entryGroup id="968d-e75b-80c5-c8ee" name="Arm Weapon Systems - 2 required" defaultEntryId="4920-fa5b-2646-1510" minSelections="2" maxSelections="2" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries>
-            <entry id="4920-fa5b-2646-1510" name="Tri-axis Ion Cannon" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="2" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="FW pdf">
+            <entry id="4920-fa5b-2646-1510" name="Tri-axis Ion Cannon" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="2" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
               <entries/>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles>
-                <profile id="7eeb-1cd9-72e9-bd68" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Tri-axis Ion Cannon (Standard)" hidden="false" book="FW pdf">
+                <profile id="7eeb-1cd9-72e9-bd68" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Tri-axis Ion Cannon (Standard)" hidden="false" book="Forgeworld PDF">
                   <characteristics>
                     <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="60&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="7"/>
@@ -6625,7 +6625,7 @@ Killing Blade: Rending until the end of the current phase.</description>
                   </characteristics>
                   <modifiers/>
                 </profile>
-                <profile id="1f10-7994-0f93-4a92" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Tri-axis Ion Cannon (Coherent beam)" hidden="false" book="FW pdf">
+                <profile id="1f10-7994-0f93-4a92" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Tri-axis Ion Cannon (Coherent beam)" hidden="false" book="Forgeworld PDF">
                   <characteristics>
                     <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="60&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="9"/>
@@ -6637,13 +6637,13 @@ Killing Blade: Rending until the end of the current phase.</description>
               </profiles>
               <links/>
             </entry>
-            <entry id="ac34-a69e-20f4-a1ca" name="Fusion Eradicator" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="2" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="FW pdf">
+            <entry id="ac34-a69e-20f4-a1ca" name="Fusion Eradicator" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="2" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
               <entries/>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles>
-                <profile id="71b6-0994-8e0c-9b3c" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Fusion Eradicator" hidden="false" book="FW pdf">
+                <profile id="71b6-0994-8e0c-9b3c" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Fusion Eradicator" hidden="false" book="Forgeworld PDF">
                   <characteristics>
                     <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="8"/>
@@ -6662,13 +6662,13 @@ Killing Blade: Rending until the end of the current phase.</description>
         </entryGroup>
         <entryGroup id="660a-3e1d-f9f1-2ac4" name="Main Weapon System - 1 required" defaultEntryId="0a54-7ddd-43d0-5ee0" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries>
-            <entry id="0a54-7ddd-43d0-5ee0" name="Pulse Ordnance Multi-driver" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="FW pdf">
+            <entry id="0a54-7ddd-43d0-5ee0" name="Pulse Ordnance Multi-driver" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
               <entries/>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles>
-                <profile id="222b-6b1d-1b0a-01b0" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Pulse Ordnance Multi-driver (Concentrated bombardment)" hidden="false" book="FW pdf">
+                <profile id="222b-6b1d-1b0a-01b0" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Pulse Ordnance Multi-driver (Concentrated bombardment)" hidden="false" book="Forgeworld PDF">
                   <characteristics>
                     <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="72&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D"/>
@@ -6677,7 +6677,7 @@ Killing Blade: Rending until the end of the current phase.</description>
                   </characteristics>
                   <modifiers/>
                 </profile>
-                <profile id="ecda-0a48-83ea-326c" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Pulse Ordnance Multi-driver (Pattern bombardment)" hidden="false" book="FW pdf">
+                <profile id="ecda-0a48-83ea-326c" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Pulse Ordnance Multi-driver (Pattern bombardment)" hidden="false" book="Forgeworld PDF">
                   <characteristics>
                     <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="12&quot;-120&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="8"/>
@@ -6695,9 +6695,9 @@ Killing Blade: Rending until the end of the current phase.</description>
               <modifiers/>
               <rules/>
               <profiles>
-                <profile id="79b5-6673-0455-a5a1" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Nexus Meteor Missile System" hidden="false">
+                <profile id="79b5-6673-0455-a5a1" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Nexus Meteor Missile System" hidden="false" book="Forgeworld PDF">
                   <characteristics>
-                    <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="14&quot;-110&quot;"/>
+                    <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24&quot;-120&quot;"/>
                     <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="10/7/5"/>
                     <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="1/4/5"/>
                     <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Ordnance 1, Apocalyptic Mega-blast, Blind"/>
@@ -6707,6 +6707,61 @@ Killing Blade: Rending until the end of the current phase.</description>
               </profiles>
               <links/>
             </entry>
+            <entry id="dada-812e-88ce-3e5c" name="Heavy Rail Cannon Array" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+              <entries>
+                <entry id="76d6-a252-c70a-a12b" name="Heavy Rail Cannon" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules>
+                    <rule id="9179-3273-d436-51f5" name="Mass-Induction Targeting" hidden="false">
+                      <description>When firing against Super-heavy or Gargantuan targets, roll twice on the Destroyer Weapon Attack table, and pick the higher result.</description>
+                      <modifiers/>
+                    </rule>
+                  </rules>
+                  <profiles>
+                    <profile id="334d-241c-70dd-ea52" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Heavy Rail Cannon" hidden="false">
+                      <characteristics>
+                        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="120&quot;"/>
+                        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D"/>
+                        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="1"/>
+                        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Ordnance 1, Blast (&quot;3&quot;), Mass-Induction Targeting"/>
+                      </characteristics>
+                      <modifiers/>
+                    </profile>
+                  </profiles>
+                  <links/>
+                </entry>
+                <entry id="0e93-e45f-1b57-3bfd" name="Cluster Shells" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles>
+                    <profile id="de9f-f9a0-d6be-bfc6" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Cluster Shells" hidden="false">
+                      <characteristics>
+                        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="36&quot;"/>
+                        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="6"/>
+                        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="4"/>
+                        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Apocalyptic Barrage (4), Pinning"/>
+                      </characteristics>
+                      <modifiers/>
+                    </profile>
+                  </profiles>
+                  <links/>
+                </entry>
+              </entries>
+              <entryGroups/>
+              <modifiers/>
+              <rules>
+                <rule id="7e1d-e99e-d055-4e9f" name="Heavy Rail Cannon Array" hidden="false" book="Forgeworld PDF">
+                  <description>The Heavy Rail Cannon Array comprises two weapons which may be fired normally.</description>
+                  <modifiers/>
+                </rule>
+              </rules>
+              <profiles/>
+              <links/>
+            </entry>
           </entries>
           <entryGroups/>
           <modifiers/>
@@ -6716,7 +6771,7 @@ Killing Blade: Rending until the end of the current phase.</description>
       <modifiers/>
       <rules/>
       <profiles>
-        <profile id="c806-2fa2-9f7d-467c" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd" name="KX139 Ta&apos;unar Supremacy Armour" hidden="false" book="FW pdf">
+        <profile id="c806-2fa2-9f7d-467c" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd" name="KX139 Ta&apos;unar Supremacy Armour" hidden="false" book="Forgeworld PDF">
           <characteristics>
             <characteristic characteristicId="c2b4b061-a0fd-499d-8a3d-6ee52587cbd5" name="Unit Type" value="Gargantuan Creature"/>
             <characteristic characteristicId="5ee4ff0b-b244-4670-9d05-91d10f80c32e" name="WS" value="3"/>