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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_advanced.json	(revision 23895)
@@ -1,30 +1,27 @@
 {
 	"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 },
 		{ "value": "Armour/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.7 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.1 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Health", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elite.json	(revision 23895)
@@ -1,30 +1,27 @@
 {
 	"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 },
 		{ "value": "Armour/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.8 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
 		{ "value": "Cost/BuildTime", "multiply": 1.2 },
 		{ "value": "Health/Max", "multiply": 1.1 },
 		{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
 		{ "value": "Heal/Health", "add": 5, "affects": "Healer" },
 		{ "value": "Loot/food", "multiply": 1.2 },
 		{ "value": "Loot/wood", "multiply": 1.2 },
 		{ "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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 23895)
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>80</food>
       <wood>60</wood>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
   <Loot>
     <xp>150</xp>
     <food>8</food>
     <wood>6</wood>
     <metal>8</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x128/arrow.png</MainTexture>
         <MainTextureMask>128x128/arrow_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml	(revision 23895)
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">2</Hack>
     <Pierce op="add">3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>12</Hack>
         <Pierce>0</Pierce>
         <Crush>4</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml	(revision 23895)
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0</Hack>
         <Pierce>26.0</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>62.5</Speed>
         <Spread>1.0</Spread>
         <Gravity>39.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Champion Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <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.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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml	(revision 23895)
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">1</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
         <Crush>10.5</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
     </Melee>
   </Attack>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
     <GenericName>Champion Maceman</GenericName>
     <Formations datatype="tokens">
       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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml	(revision 23895)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">8</Hack>
     <Pierce op="add">8</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>6.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>7</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       special/formations/syntagma
       special/formations/testudo
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/pike_attack.xml</attack_melee>
     </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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml	(revision 23895)
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">3</Hack>
     <Pierce op="add">3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>6.0</Hack>
         <Pierce>5.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>4.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>900</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       special/formations/testudo
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml	(revision 23895)
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
     <Hack op="add">3</Hack>
     <Pierce op="add">3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>11.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Swordsman</GenericName>
     <Formations datatype="tokens">
       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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 23895)
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>10</Hack>
     <Pierce>20</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>256x256/star.png</MainTexture>
         <MainTextureMask>256x256/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 23895)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>300</food>
       <wood>200</wood>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Hero Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/death/death_horse.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 23895)
@@ -1,59 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Attack replace="">
     <Melee>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0</Pierce>
         <Crush>50.0</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
     <Population>3</Population>
     <BuildTime>60</BuildTime>
     <Resources>
       <food>500</food>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml	(revision 23895)
@@ -1,48 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>4</Hack>
     <Pierce>8</Pierce>
     <Crush>4</Crush>
   </Armour>
   <Attack disable=""/>
   <Cost>
     <Resources>
       <food>200</food>
       <wood>150</wood>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Heal>
     <Range>20</Range>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
     <Health>6</Health>
     <Interval>2000</Interval>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
       </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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml	(revision 23895)
@@ -1,30 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack op="add">3</Hack>
     <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>24</Hack>
         <Pierce>0</Pierce>
         <Crush>8</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml	(revision 23895)
@@ -1,37 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack op="add">9</Hack>
     <Pierce op="add">9</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>4.0</Hack>
         <Pierce>20.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>7</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml	(revision 23895)
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
     <Hack op="add">4</Hack>
     <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>22.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood op="add">-50</wood>
       <metal op="add">50</metal>
     </Resources>
   </Cost>
   <Identity>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml	(revision 23895)
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
     <Hack>4</Hack>
     <Pierce>5</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>6</Hack>
         <Crush>2</Crush>
       </Damage>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>40</wood>
       <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
     <GenericName>Axeman</GenericName>
   </Identity>
   <Loot>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml	(revision 23895)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>1</Hack>
         <Pierce>3</Pierce>
       </Damage>
       <MaxRange>7</MaxRange>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Pikeman</VisibleClasses>
     <GenericName>Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       special/formations/syntagma
     </Formations>
   </Identity>
   <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml	(revision 23895)
@@ -1,44 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>3.0</Hack>
         <Pierce>2.5</Pierce>
       </Damage>
       <MaxRange>4.5</MaxRange>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
     <GenericName>Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
   </Identity>
   <Loot>
     <wood>5</wood>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.95</WalkSpeed>
-  </UnitMotion>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
 </Entity>
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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml	(revision 23895)
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>5.5</Hack>
         <Pierce>0</Pierce>
       </Damage>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>40</wood>
       <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
     <GenericName>Swordsman</GenericName>
   </Identity>
   <Loot>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml	(revision 23895)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
   </Armour>
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.7</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>75.0</Speed>
         <Gravity>39.81</Gravity>
         <Spread>3.0</Spread>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>50</food>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Archer</GenericName>
   </Identity>
   <Loot>
     <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml	(revision 23895)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
   </Armour>
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0</Hack>
         <Pierce>16.0</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>24.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Projectile>
         <Speed>62.5</Speed>
         <Gravity>39.81</Gravity>
         <Spread>4.0</Spread>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Infantry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
   </Identity>
   <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml	(revision 23895)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
   </Armour>
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0</Hack>
         <Pierce>9.2</Pierce>
         <Crush>0.9</Crush>
       </Damage>
       <MaxRange>48.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Projectile>
         <Speed>62.5</Speed>
         <Spread>3.5</Spread>
         <Gravity>29.81</Gravity>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <stone>30</stone>
       <wood>20</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Slinger</VisibleClasses>
     <GenericName>Slinger</GenericName>
   </Identity>
   <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	(revision 23894)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml	(revision 23895)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Armour>
     <Hack op="add">-1</Hack>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>3.0</Hack>
         <Crush>2.5</Crush>
       </Damage>
     </Melee>
   </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}_pyramid_small
       structures/{civ}_pyramid_large
       structures/{civ}_temple_amun
       structures/{civ}_blemmye_camp
       structures/{civ}_nuba_village
     </Entities>
   </Builder>
   <Cost>
     <Resources>
       <food op="add">-25</food>
       <metal op="add">25</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
     <GenericName>Nuba Clubman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
     <Icon>units/kush_infantry_clubman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <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>
 </Entity>