Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
@@ -1,7 +1,7 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_advanced.png",
-	"tooltip": "Advanced and Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
+	"tooltip": "Advanced and Elite units +20% training time, +1 armor, +10% health, +0.7 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
 	"modifications": [
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Pierce", "add": 1 },
@@ -21,10 +21,7 @@
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
-		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
-		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
-		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
-		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" }
+		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 }
 	],
 	"affects": ["Advanced Unit", "Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json
@@ -1,7 +1,7 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_elite.png",
-	"tooltip": "Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
+	"tooltip": "Elite units +20% training time, +1 armor, +10% health, +0.8 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
 	"modifications": [
 		{ "value": "Armour/Hack", "add": 1 },
 		{ "value": "Armour/Pierce", "add": 1 },
@@ -21,10 +21,7 @@
 		{ "value": "Loot/stone", "multiply": 1.2 },
 		{ "value": "Loot/metal", "multiply": 1.2 },
 		{ "value": "Loot/xp", "multiply": 1.2 },
-		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
-		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
-		{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
-		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" }
+		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 }
 	],
 	"affects": ["Elite Unit"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -53,6 +53,6 @@
     </SoundGroups>
   </Sound>
   <Vision>
-    <Range>84</Range>
+    <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -24,7 +24,4 @@
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Axeman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -39,6 +39,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">1.6</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -26,7 +26,4 @@
       special/formations/testudo
     </Formations>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -42,6 +42,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -39,7 +39,4 @@
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.3</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -27,7 +27,4 @@
       special/formations/testudo
     </Formations>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -75,6 +75,6 @@
     <Category>Hero</Category>
   </TrainingRestrictions>
   <Vision>
-    <Range>88</Range>
+    <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -41,7 +41,4 @@
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
-  <Vision>
-    <Range>100</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -53,7 +53,4 @@
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
@@ -42,7 +42,4 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Vision>
-    <Range>30</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -21,10 +21,4 @@
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Hero Axeman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.05</WalkSpeed>
-  </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -31,7 +31,4 @@
       special/formations/testudo
     </Formations>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.95</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -27,10 +27,4 @@
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.05</WalkSpeed>
-  </UnitMotion>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -27,7 +27,4 @@
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.05</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -37,12 +37,12 @@
   <Loot>
     <wood>5</wood>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.8</WalkSpeed>
-  </UnitMotion>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/pike_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -33,9 +33,6 @@
   <Loot>
     <wood>5</wood>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.95</WalkSpeed>
-  </UnitMotion>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -28,7 +28,4 @@
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.05</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -37,6 +37,6 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -35,13 +35,13 @@
   <Loot>
     <wood>5</wood>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.4</WalkSpeed>
-  </UnitMotion>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -36,12 +36,12 @@
   <Loot>
     <stone>5</stone>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/sling_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -38,9 +38,6 @@
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>
   </Promotion>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/kushites/infantry_clubman_b.xml</Actor>
   </VisualActor>