diff --git a/binaries/data/mods/official/entities/gaia/fauna_bear.xml b/binaries/data/mods/official/entities/gaia/fauna_bear.xml
index 350c2a8d19..e8c15c45d1 100644
--- a/binaries/data/mods/official/entities/gaia/fauna_bear.xml
+++ b/binaries/data/mods/official/entities/gaia/fauna_bear.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity 
-	Parent="template_unit_fauna_hunt_aggressive"
->
+<Entity Parent="template_unit_fauna_hunt_aggressive">
 
 	<Traits>
 
diff --git a/binaries/data/mods/official/entities/gaia/fauna_deer.xml b/binaries/data/mods/official/entities/gaia/fauna_deer.xml
index c797000e5e..6a97a24058 100644
--- a/binaries/data/mods/official/entities/gaia/fauna_deer.xml
+++ b/binaries/data/mods/official/entities/gaia/fauna_deer.xml
@@ -13,11 +13,11 @@
 	
 	<Actions>	
 			<Move>
-			<Speed>2.0</Speed>
+			<Speed>5.0</Speed>
 			<TurningRadius>5.0</TurningRadius>
 			
 			<Run>
-				<Speed>10.0</Speed>
+				<Speed>12.0</Speed>
 				<Range>600.0</Range>
 				<RangeMin>5.0</RangeMin>
 			</Run>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
index 8ac3ea960b..aed0c89601 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
@@ -47,9 +47,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.55</Speed>
+			<Speed>13.0</Speed>
 			<Run>
-				<Speed>27.5</Speed>
+				<Speed>25.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
index 9b0a1abe8b..b6f2df081a 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
@@ -43,9 +43,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.54</Speed>
+			<Speed>13.0</Speed>
 			<Run>
-				<Speed>27.4</Speed>
+				<Speed>25.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
index 59c0223d71..653aa3fbd1 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
@@ -40,9 +40,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.65</Speed>
+			<Speed>14.0</Speed>
 			<Run>
-				<Speed>27.9</Speed>
+				<Speed>25.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
index 208ab0f34d..5a4ea91bb5 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
@@ -40,9 +40,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.64</Speed>
+			<Speed>14.0</Speed>
 			<Run>
-				<Speed>27.7</Speed>
+				<Speed>25.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_hero.xml b/binaries/data/mods/official/entities/template_unit_hero.xml
index 3d727b82f8..2ed81f9090 100644
--- a/binaries/data/mods/official/entities/template_unit_hero.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero.xml
@@ -68,9 +68,9 @@
 			</Charge>
 		</Attack>
 		<Move>
-			<Speed>3.6</Speed>
+			<Speed>8.5</Speed>
 			<Run>
-				<Speed>8.2</Speed>
+				<Speed>16.5</Speed>
 			</Run>
 		</Move>		
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_hero_ranged.xml b/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
index 6b709388b4..e5beafa375 100644
--- a/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
@@ -62,9 +62,9 @@
 			</Ranged>			
 		</Attack>
 		<Move>
-			<Speed>3.6</Speed>
+			<Speed>10.0</Speed>
 			<Run>
-				<Speed>8.1</Speed>
+				<Speed>20.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
index 455c474f95..bf8d75337e 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
@@ -54,9 +54,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>3.5</Speed>
+			<Speed>8.0</Speed>
 			<Run>
-				<Speed>8.0</Speed>
+				<Speed>16.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
index 9576175924..2c4e1153ab 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
@@ -52,9 +52,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>3.7</Speed>
+			<Speed>8.5</Speed>
 			<Run>
-				<Speed>8.2</Speed>
+				<Speed>16.5</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
index 6ade957513..b8d5e5d305 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_archer.xml
@@ -51,9 +51,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.0</Speed>
+			<Speed>9.0</Speed>
 			<Run>
-				<Speed>8.4</Speed>
+				<Speed>18.0</Speed>
 			</Run>
 		</Move>
 
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
index 1ed585d041..c375b17e51 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
@@ -51,9 +51,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>4.0</Speed>
+			<Speed>9.0</Speed>
 			<Run>
-				<Speed>8.2</Speed>
+				<Speed>20.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
index bedfb4472c..b14fb0c517 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
@@ -54,9 +54,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>3.7</Speed>
+			<Speed>10.0</Speed>
 			<Run>
-				<Speed>7.8</Speed>
+				<Speed>20.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
index ef4663fe35..d41a201cca 100644
--- a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
@@ -72,9 +72,9 @@
 			</Charge>		
  		</Attack>
 		<Move>
-			<Speed>4.8</Speed>
+			<Speed>13.0</Speed>
 			<Run>
-				<Speed>28.0</Speed>
+				<Speed>25.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_infantry.xml b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
index 2baa01c1bb..d4cbe1cd22 100644
--- a/binaries/data/mods/official/entities/template_unit_super_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
@@ -56,9 +56,9 @@
 			</Charge>		
  		</Attack>
 		<Move>
-			<Speed>3.5</Speed>
+			<Speed>8.5</Speed>
 			<Run>
-				<Speed>7.9</Speed>
+				<Speed>16.5</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_ranged.xml b/binaries/data/mods/official/entities/template_unit_super_ranged.xml
index 8ebc340679..e2ede1b8a5 100644
--- a/binaries/data/mods/official/entities/template_unit_super_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_ranged.xml
@@ -46,9 +46,9 @@
 			</Ranged>
 		</Attack>
 		<Move>
-			<Speed>4.2</Speed>
+			<Speed>10.0</Speed>
 			<Run>
-				<Speed>8.7</Speed>
+				<Speed>20.0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
index 0513be22b6..bb079eebb2 100644
--- a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
@@ -94,11 +94,11 @@
 		</Build>
 
 		<Move>
-			<Speed>2.8</Speed>
+			<Speed>6.0</Speed>
 			<TurningRadius>0.8</TurningRadius>
 			
 			<Run>
-				<Speed>7.2</Speed>
+				<Speed>12.0</Speed>
 				<Range>50.0</Range>
 				<RangeMin>0.0</RangeMin>
 			</Run>			
diff --git a/binaries/data/mods/official/entities/template_unit_support_healer.xml b/binaries/data/mods/official/entities/template_unit_support_healer.xml
index e446065296..19a7916aba 100644
--- a/binaries/data/mods/official/entities/template_unit_support_healer.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_healer.xml
@@ -50,7 +50,7 @@
 	
 	<Actions>
 		<Move>
-			<Speed>3.0</Speed>
+			<Speed>7.5</Speed>
 			<TurningRadius>0.8</TurningRadius>
 		</Move>
 	</Actions>	
diff --git a/binaries/data/mods/official/entities/template_unit_support_trader.xml b/binaries/data/mods/official/entities/template_unit_support_trader.xml
index 2d5f0a9938..83641ba02d 100644
--- a/binaries/data/mods/official/entities/template_unit_support_trader.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_trader.xml
@@ -45,7 +45,7 @@
 	
 	<Actions>
 		<Move>
-			<Speed>2.5</Speed>
+			<Speed>12.0</Speed>
 		</Move>
 	</Actions>
 
diff --git a/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls b/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls
index 551a74b99e..386107a8a1 100644
Binary files a/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls and b/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls differ
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
index f5099e2031..3cd9ea1110 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
@@ -17,9 +17,9 @@
 		</Promotion>
 
 		<Armour>
-			<Hack>4.0</Hack>
-			<Pierce>3.0</Pierce>
-			<Crush>2.0</Crush>
+			<Hack>7.0</Hack>
+			<Pierce>5.0</Pierce>
+			<Crush>12.0</Crush>
 		</Armour>
 
 		<Health>
@@ -29,23 +29,23 @@
 	</Traits>
 
 	<Actions>
- 			<Attack>
+ 		<Attack>
 			<Melee>
- 				<Hack>4.0</Hack>
- 				<Pierce>11.0</Pierce>
-				<Crush>0.6</Crush>
+ 				<Hack>15.0</Hack>
+ 				<Pierce>7.0</Pierce>
+				<Crush>1.0</Crush>
 			</Melee>
 			<Charge>
-				<Hack>9.0</Hack>
-				<Pierce>24.0</Pierce>
-				<Crush>1.0</Crush>
+				<Hack>30.0</Hack>
+				<Pierce>14.0</Pierce>
+				<Crush>2.0</Crush>
 			</Charge>		
  		</Attack>
 
 		<Move>
-			<Speed>3.5</Speed>
+			<Speed>6.75</Speed>
 			<Run>
-				<Speed>7.9</Speed>
+				<Speed>14.0</Speed>
 			</Run>
 		</Move>
 	</Actions>	
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
index 6ed58db7ef..5db3ef8ef0 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
@@ -53,9 +53,9 @@
  		</Attack>
 
 		<Move>
-			<Speed>3.4</Speed>
+			<Speed>7.0</Speed>
 			<Run>
-				<Speed>7.8</Speed>
+				<Speed>15.0</Speed>
 			</Run>
 		</Move>
 	</Actions>	
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
index dcf6343d39..20aad72d4e 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
@@ -9,9 +9,9 @@
 		</Id>
 
 		<Armour>
-			<Hack>7.0</Hack>
+			<Hack>8.0</Hack>
 			<Pierce>5.0</Pierce>
-			<Crush>3.0</Crush>
+			<Crush>13.0</Crush>
 		</Armour>
 
 		<Health>
@@ -23,21 +23,21 @@
 	<Actions>
  			<Attack>
 			<Melee>
- 				<Hack>6.0</Hack>
- 				<Pierce>15.0</Pierce>
+ 				<Hack>16.0</Hack>
+ 				<Pierce>8.0</Pierce>
 				<Crush>1.0</Crush>
 			</Melee>
 			<Charge>
-				<Hack>13.0</Hack>
-				<Pierce>32.0</Pierce>
-				<Crush>1.5</Crush>
+				<Hack>32.0</Hack>
+				<Pierce>16.0</Pierce>
+				<Crush>2.0</Crush>
 			</Charge>		
  		</Attack>
 
 		<Move>
-			<Speed>3.6</Speed>
+			<Speed>7.0</Speed>
 			<Run>
-				<Speed>8.0</Speed>
+				<Speed>14.0</Speed>
 			</Run>
 		</Move>
 	</Actions>