diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml b/binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
index 4d641b9f65..0beb05477d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
@@ -28,7 +28,7 @@
     <SpawnEntityOnDeath>rubble/rubble_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Civ>celt</Civ>
+    <Civ>brit</Civ>
     <GenericName>Special Building</GenericName>
     <SpecificName>Kennel</SpecificName>
     <Tooltip>Train Celtic war dogs.</Tooltip>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
index 96628b7b74..ec42385f1c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship.xml
@@ -44,7 +44,6 @@
     </Capacities>
   </ResourceGatherer>
   <Selectable>
-    <EditorOnly disable=""/>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_a.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_a.xml
index 975034f3d3..c827b7e2df 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_a.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_infantry_slinger_b">
+  <Armour>
+    <Hack>3.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Spread>0.9</Spread>
+      <MaxRange>44</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
-	<Rank>Advanced</Rank>
+    <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
     <Entity>units/brit_infantry_slinger_e</Entity>
@@ -9,26 +23,12 @@
   <ResourceGatherer>
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Armour>
-    <Hack>3.0</Hack>
-    <Pierce>4.0</Pierce>
-    <Crush>4.0</Crush>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.48</WalkSpeed>
     <Run>
       <Speed>22.44</Speed>
     </Run>
   </UnitMotion>
-  <Attack>
-    <Ranged>
-      <Spread>0.9</Spread>
-      <MaxRange>44</MaxRange>
-    </Ranged>
-  </Attack>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
index 080ce8a0d7..79aab40abd 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
   <Builder>
     <Entities datatype="tokens">
       structures/brit_kennel
-	</Entities>
+    </Entities>
   </Builder>
   <Identity>
     <Civ>brit</Civ>
-	<SelectionGroupName>units/brit_infantry_slinger_b</SelectionGroupName>
+    <SelectionGroupName>units/brit_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Iaosae</SpecificName>
     <History>Sling bullets are found in enormous numbers in Celtic sites, made of lead, though clay bullets would also have been used. Slings figure prominently in Celtic myth, and were not associated with any sense of shame. To the contrary, the great skill needed to use a sling well was highly rewarded and favored, so they found much more use in Celtic society for a ranged weapon than bows, outside of specific tribes. The god Lugos, in Irish myth Lug, is associated closely with many weapons, among them his sling. Slings were the primary weapon of Celtic hunters as well.</History>
@@ -16,9 +19,6 @@
   <Promotion>
     <Entity>units/brit_infantry_slinger_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>2.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.92</WalkSpeed>
     <Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_e.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_e.xml
index d23f4dfb62..0daf57ecbe 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_e.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_infantry_slinger_a">
-  <Identity>
-	<Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.6</WalkSpeed>
-    <Run>
-      <Speed>19.8</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Spread>0.8</Spread>
       <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>6.6</WalkSpeed>
+    <Run>
+      <Speed>19.8</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_a.xml
index b1e01b51c7..f3241afc50 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_a.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_slinger_b">
-  <Identity>
-	<Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/celt_infantry_slinger_e</Entity>
-  </Promotion>
-  <ResourceGatherer>
-    <BaseSpeed>0.75</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>4.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.48</WalkSpeed>
-    <Run>
-      <Speed>22.44</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Spread>0.9</Spread>
       <MaxRange>44</MaxRange>
     </Ranged>
   </Attack>
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Promotion>
+    <Entity>units/celt_infantry_slinger_e</Entity>
+  </Promotion>
+  <ResourceGatherer>
+    <BaseSpeed>0.75</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>7.48</WalkSpeed>
+    <Run>
+      <Speed>22.44</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_b.xml
index 8f7f798e4d..df6c2f3574 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_b.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
+  <Builder>
+    <Entities datatype="tokens">
+      -structures/{civ}_fortress
+      structures/celt_kennel
+      structures/celt_sb1
+      structures/celt_fortress_b
+      structures/celt_fortress_g
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>celt</Civ>
-	<SelectionGroupName>units/celt_infantry_slinger_b</SelectionGroupName>
+    <SelectionGroupName>units/celt_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Iaosae</SpecificName>
     <History>Sling bullets are found in enormous numbers in Celtic sites, made of lead, though clay bullets would also have been used. Slings figure prominently in Celtic myth, and were not associated with any sense of shame. To the contrary, the great skill needed to use a sling well was highly rewarded and favored, so they found much more use in Celtic society for a ranged weapon than bows, outside of specific tribes. The god Lugos, in Irish myth Lug, is associated closely with many weapons, among them his sling. Slings were the primary weapon of Celtic hunters as well.</History>
@@ -11,9 +23,6 @@
   <Promotion>
     <Entity>units/celt_infantry_slinger_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>2.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.92</WalkSpeed>
     <Run>
@@ -23,13 +32,4 @@
   <VisualActor>
     <Actor>units/celts/infantry_slinger_b.xml</Actor>
   </VisualActor>
-  <Builder>
-    <Entities datatype="tokens">
-      -structures/{civ}_fortress
-      structures/celt_kennel
-      structures/celt_sb1
-      structures/celt_fortress_b
-      structures/celt_fortress_g
-	</Entities>
-  </Builder>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_e.xml
index 4803343e5f..429141497d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_slinger_e.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_infantry_slinger_a">
-  <Identity>
-	<Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.6</WalkSpeed>
-    <Run>
-      <Speed>19.8</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Spread>0.8</Spread>
       <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>6.6</WalkSpeed>
+    <Run>
+      <Speed>19.8</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_a.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_a.xml
index 2bf094dd5c..c19a3a87e7 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_a.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_infantry_slinger_b">
-  <Identity>
-	<Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/gaul_infantry_slinger_e</Entity>
-  </Promotion>
-  <ResourceGatherer>
-    <BaseSpeed>0.75</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>100</Max>
-  </Health>
   <Armour>
     <Hack>3.0</Hack>
     <Pierce>4.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>7.48</WalkSpeed>
-    <Run>
-      <Speed>22.44</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Spread>0.9</Spread>
       <MaxRange>44</MaxRange>
     </Ranged>
   </Attack>
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Promotion>
+    <Entity>units/gaul_infantry_slinger_e</Entity>
+  </Promotion>
+  <ResourceGatherer>
+    <BaseSpeed>0.75</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>7.48</WalkSpeed>
+    <Run>
+      <Speed>22.44</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
index 440f4c67ee..bd13bae6f1 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
+  <Armour>
+    <Hack>2.0</Hack>
+  </Armour>
   <Builder>
     <Entities datatype="tokens">
       structures/gaul_rotarymill
-	</Entities>
+    </Entities>
   </Builder>
   <Identity>
     <Civ>gaul</Civ>
-	<SelectionGroupName>units/gaul_infantry_slinger_b</SelectionGroupName>
+    <SelectionGroupName>units/gaul_infantry_slinger_b</SelectionGroupName>
     <GenericName>Celtic Slinger</GenericName>
     <SpecificName>Iaosae</SpecificName>
     <History>Sling bullets are found in enormous numbers in Celtic sites, made of lead, though clay bullets would also have been used. Slings figure prominently in Celtic myth, and were not associated with any sense of shame. To the contrary, the great skill needed to use a sling well was highly rewarded and favored, so they found much more use in Celtic society for a ranged weapon than bows, outside of specific tribes. The god Lugos, in Irish myth Lug, is associated closely with many weapons, among them his sling. Slings were the primary weapon of Celtic hunters as well.</History>
@@ -16,9 +19,6 @@
   <Promotion>
     <Entity>units/gaul_infantry_slinger_a</Entity>
   </Promotion>
-  <Armour>
-    <Hack>2.0</Hack>
-  </Armour>
   <UnitMotion>
     <WalkSpeed>7.92</WalkSpeed>
     <Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_e.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_e.xml
index 9ccb3cf56a..132e25293d 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_e.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_infantry_slinger_a">
-  <Identity>
-	<Rank>Elite</Rank>
-  </Identity>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
-  <Health>
-    <Max>110</Max>
-  </Health>
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>5.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <UnitMotion>
-    <WalkSpeed>6.6</WalkSpeed>
-    <Run>
-      <Speed>19.8</Speed>
-    </Run>
-  </UnitMotion>
   <Attack>
     <Ranged>
       <Spread>0.8</Spread>
       <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>6.6</WalkSpeed>
+    <Run>
+      <Speed>19.8</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_slinger_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_archer_b.xml
index 0b6dbfccba..d049f8911e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_archer_b.xml
@@ -22,8 +22,8 @@
   <Identity>
     <Civ>maur</Civ>
     <Classes datatype="tokens">Elephant -Cavalry</Classes>
-	<SelectionGroupName>units/maur_cavalry_archer_b</SelectionGroupName>
-	<GenericName>Elephant Archer</GenericName>
+    <SelectionGroupName>units/maur_cavalry_archer_b</SelectionGroupName>
+    <GenericName>Elephant Archer</GenericName>
     <SpecificName>Vachii Gaja</SpecificName>
     <Icon>units/cart_champion_cavalry.png</Icon>
     <History>Elephant Archer.</History>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
index c319c99595..ac4568c620 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -59,13 +59,13 @@
     <Max>400</Max>
   </Health>
   <Identity>
-    <Civ>cart</Civ>
+    <Civ>maur</Civ>
     <Classes datatype="tokens">Elephant -Cavalry</Classes>
-	<GenericName>Indian War Elephant</GenericName>
+    <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Gajendra</SpecificName>
     <Icon>units/maur_champion_elephant.png</Icon>
     <History>Painted Indian war elephant with driver and bow rider. Has some armor on its chest and forehead, and swords on its tusks.</History>
-	<Tooltip>Champion War Elephant.
+    <Tooltip>Champion War Elephant.
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
   </Identity>
   <Selectable>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
index 0e3c9294e0..4d0139a537 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
@@ -2,18 +2,18 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-	  -other/wallset_palisade
+      -other/wallset_palisade
       structures/rome_army_camp
       structures/rome_wallset_siege
     </Entities>
   </Builder>
   <Identity>
     <Civ>rome</Civ>
-	<SelectionGroupName>units/rome_infantry_spearman_b</SelectionGroupName>
-	<GenericName>Veteran Spearman</GenericName>
+    <SelectionGroupName>units/rome_infantry_spearman_b</SelectionGroupName>
+    <GenericName>Veteran Spearman</GenericName>
     <SpecificName>Triarus</SpecificName>
     <Icon>units/rome_infantry_spearman.png</Icon>
-    <History>The Triarii were the third line of heavy infantry in the Republican Roman army. Made up of the veterans from previous campaigns, they often possessed the most fashionable arms and armor. Armed with a spear and gladius, the Triarii usually did not fight unless the battle was going poorly or enemy forces required the use of a spear to fend them off. In many cases the Tirarii were left at the camp instead of marching out with the rest of the army.</History>
+    <History>The Triarii were the third line of heavy infantry in the Republican Roman army. Made up of the veterans from previous campaigns, they often possessed the most fashionable arms and armor. Armed with a spear and gladius, the Triarii usually did not fight unless the battle was going poorly or enemy forces required the use of a spear to fend them off. In many cases the Triarii were left at the camp instead of marching out with the rest of the army.</History>
   </Identity>
   <Promotion>
     <Entity>units/rome_infantry_spearman_a</Entity>