Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -1,7 +1,7 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_advanced.png",
-	"tooltip": "Units promoted to the advanced class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster movement speeds and extra heal speed and range for healers.",
+	"tooltip": "Units promoted to the advanced class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster Infantry movement speeds and extra heal speed and range for healers.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 },
 		{ "value": "Armour/Hack", "add": 1 },
@@ -10,7 +10,6 @@
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
-		{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -1,7 +1,7 @@
 {
 	"autoResearch": true,
 	"icon": "upgrade_elite.png",
-	"tooltip": "Units promoted to the elite class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster movement speeds and extra heal speed and range for healers.",
+	"tooltip": "Units promoted to the elite class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster Infantry movement speeds and extra heal speed and range for healers.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 },
 		{ "value": "Armour/Hack", "add": 1 },
@@ -10,7 +10,6 @@
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
-		{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
 		{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
 		{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -95,7 +95,7 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed op="mul">1.95</WalkSpeed>
+    <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -47,7 +47,7 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed op="mul">2.25</WalkSpeed>
+    <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
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
@@ -39,7 +39,7 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed op="mul">1.85</WalkSpeed>
+    <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -42,7 +42,4 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.05</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -33,7 +33,4 @@
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -27,7 +27,4 @@
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1</WalkSpeed>
-  </UnitMotion>
 </Entity>