diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 2c18565bc7..4397502627 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>0.0</Hack>
-    <Pierce>10.0</Pierce>
-    <Crush>10.0</Crush>
+    <Hack>1</Hack>
+    <Pierce>3</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <Attack>
     <Slaughter>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index 5266af8bf9..a9c8b3e16c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>1</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index d3abae7211..c63d828e2e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>1</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index 2da39519af..83f5e7b475 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Armour>
     <Hack>1</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Pierce>3</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index 87b8797c39..0d24bd0341 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Armour>
     <Hack>1</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Pierce>3</Pierce>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
index 7ef4bb464c..370fbe845a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
-    <Hack>8</Hack>
-    <Pierce>10</Pierce>
-    <Crush>8</Crush>
+    <Hack>5</Hack>
+    <Pierce>8</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Cost>
     <Population>3</Population>
@@ -47,9 +47,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>8.0</WalkSpeed>
+    <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>16.0</Speed>
+      <Speed>14.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index 0f151e4776..6c4e6e9ecb 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -61,4 +61,7 @@
     <Tooltip>Hero War Elephant.
 Good sieging capability. "Stench" Aura vs. Horses. Can run amok. Countered by Swordsmen and Skirmishers.</Tooltip>
   </Identity>
+  <TrainingRestrictions>
+    <Category>Hero</Category>
+  </TrainingRestrictions>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 6c5d1ae005..33424bd216 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>2</Hack>
+    <Pierce>1</Pierce>
+    <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index b7dca657ba..3479f3ec34 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>4</Hack>
+    <Hack>3</Hack>
     <Pierce>1</Pierce>
-    <Crush>3</Crush>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index 0433bc8d48..ef9bb19026 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>1</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index 99c53d3fbf..d5d765f00e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>1</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 63d9a07cb9..ebb4f5e7dc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>1</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>1</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_b.xml
index a9473b4b6a..a95cac192c 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_b.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
-  <Armour>
-    <Hack>3.0</Hack>
-  </Armour>
   <Cost>
     <Resources>
       <food>0</food>
-	  <metal>120</metal>
+	  <metal>100</metal>
     </Resources>
   </Cost>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_b.xml
index ddb0286e1d..e73f73bd44 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_b.xml
@@ -3,7 +3,7 @@
   <Cost>
     <Resources>
       <food>0</food>
-	  <metal>120</metal>
+	  <metal>100</metal>
     </Resources>
   </Cost>
   <Identity>