diff --git a/binaries/data/mods/official/art/actors/temp/mace_su1_hypaspist.xml b/binaries/data/mods/official/art/actors/temp/mace_su1_hypaspist.xml
index 5274095bb0..5d41df735b 100644
--- a/binaries/data/mods/official/art/actors/temp/mace_su1_hypaspist.xml
+++ b/binaries/data/mods/official/art/actors/temp/mace_su1_hypaspist.xml
@@ -22,7 +22,7 @@
         <prop actor="props/units/shields/mace_round_hypaspist.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/mace_su1.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/hero_hannibal_mount.xml b/binaries/data/mods/official/art/actors/units/carthaginians/hero_hannibal_mount.xml
index faa99ce336..e92f17b1f9 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/hero_hannibal_mount.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/hero_hannibal_mount.xml
@@ -6,16 +6,16 @@
   <group>
     <variant frequency="100" name="Mesh">
       <animations>
-        <animation file="cavalry/uber/elephant_idle_01.dae" name="idle" speed="100"/>
-        <animation file="cavalry/uber/elephant_idle_02.dae" name="idle" speed="100"/>
-        <animation file="cavalry/uber/elephant_walk_01.dae" name="walk" speed="20"/>
-        <animation file="cavalry/uber/elephant_run_01.dae" name="run " speed="20"/>
-        <animation file="cavalry/uber/elephant_attack_01.dae" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_attack_02.dae" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_attack_03.dae" name="melee" speed="100"/>
-        <animation file="cavalry/uber/elephant_death_01.psa" name="death" speed="400"/>
+        <animation file="quadraped/elephant_idle_01.dae" name="idle" speed="100"/>
+        <animation file="quadraped/elephant_idle_02.dae" name="idle" speed="100"/>
+        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
+        <animation file="quadraped/elephant_run_01.dae" name="run" speed="40"/>
+        <animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
       </animations>
-      <mesh>skeletal/elephant_asian.pmd</mesh>
+      <mesh>skeletal/elephant_asian.dae</mesh>
       <props>
         <prop actor="units/carthaginians/hero_hannibal_mahout.xml" attachpoint="rider1"/>
         <prop actor="props/units/turret_hannibal.xml" attachpoint="turret"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
index 4d58f36ced..fcb8a31ba7 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
@@ -7,8 +7,8 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
         <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="225"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/philip_horse.xml b/binaries/data/mods/official/art/actors/units/hellenes/philip_horse.xml
index b4e4d6ff3b..7e8eb7caaf 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/philip_horse.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/philip_horse.xml
@@ -9,8 +9,8 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
         <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="100"/>
         <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="12"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/philip_r.xml b/binaries/data/mods/official/art/actors/units/hellenes/philip_r.xml
index c0ceea47ff..bd3b4e3ead 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/philip_r.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/philip_r.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="100"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="melee" speed="200"/>
-        <animation file="biped/rider_gallop.psa" name="run" speed="12"/>
-      </animations>
-      <mesh>skeletal/m_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_philip.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/xiphos_alexander.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/heads/mace_philip.xml" attachpoint="helmet"/>
-      </props>
-      <texture>skeletal/hele_philip_3.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="100"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="17"/>
+        <animation file="biped/rider_gallop.psa" name="run" speed="8"/>
+        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="melee" speed="200"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_philip.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/xiphos_alexander.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/mace_philip.xml" attachpoint="helmet"/>
+      </props>
+      <texture>skeletal/hele_philip_3.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4.xml b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4.xml
index 153dabd257..9727df251a 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4.xml
@@ -7,8 +7,8 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="13"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation event="0.5" file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation event="0.5" file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="235"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4_r.xml b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4_r.xml
index 00b2f355ac..2a2a508c33 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4_r.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_4_r.xml
@@ -7,8 +7,8 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
-        <animation file="biped/rider_gallop.psa" name="Run" speed="13"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="17"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
         <animation event="" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" load="" name="melee" speed="100"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="225"/>
       </animations>
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_01.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_01.psa
deleted file mode 100644
index e5f7fe9532..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_01.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8852df266fa3a02daefce5105e7ec4a9c0d397fb076b66856ee3a5387440e82f
-size 604389
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_02.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_02.psa
deleted file mode 100644
index 4b45c69eef..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_02.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:167236b3ed145f0cfcea5c11f5691c10769135c86fef14aaa3a1f47930081b95
-size 604389
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_03.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_03.psa
deleted file mode 100644
index 140f750c20..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_attack_03.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e9887161ac6121a7423c333d7cd5bb0003db974c849191e83824266e6170cef
-size 604389
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_death_01.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_death_01.psa
deleted file mode 100644
index 7f9ca2b9ca..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_death_01.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1fb9a77636d1e868020a76c85afbb0b74b7ef58c532a009384622b778b7a71a
-size 475645
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_01.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_01.psa
deleted file mode 100644
index c6d8ddbbee..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_01.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7930dfd57199e41dad8ebd8d63a8f306484798e4bbb7408bad9257a78e5310f6
-size 155381
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_02.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_02.psa
deleted file mode 100644
index b13adafcd4..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_idle_02.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a130ae93eb278927bc097f70dbf55d21bd1d04c81497dbcc87faa2fad651fd6
-size 155381
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_run_01.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_run_01.psa
deleted file mode 100644
index 22d88c7092..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_run_01.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00e083148b137e39b575226c08fe16f8b43090daf9d11e658a0388a83511fd51
-size 475645
diff --git a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_walk_01.psa b/binaries/data/mods/official/art/animation/cavalry/uber/elephant_walk_01.psa
deleted file mode 100644
index edfcf7d549..0000000000
--- a/binaries/data/mods/official/art/animation/cavalry/uber/elephant_walk_01.psa
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7eed6a621dfda02e34b221bdd6d9b4bb6dd796fd09587d731037f7e5729b1f0f
-size 470325
diff --git a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_1.dds b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_1.dds
index dd79502181..c44efb3a0f 100644
--- a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_1.dds
+++ b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b425719e338ee5d5505fb62d6557354929535d7e3042f9234e63ef264d363dad
+oid sha256:d53cc02b45b3e5de83943eec024a7f00e67851d9943eb2be625bdeb0a809f197
 size 349680
diff --git a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_2.dds b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_2.dds
index e17359f235..98ed03689d 100644
--- a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_2.dds
+++ b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_2.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74feaac48ec3b972c7a082e6979f7209976ead667f99d76fef66357728093d92
+oid sha256:10c3a852cf68d7ee61cf442cc69e04f7aa4e290fba376081ac3dbe8316ff9f0e
 size 349680
diff --git a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_3.dds b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_3.dds
index e73c85cb91..5ee4f1bd66 100644
--- a/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_3.dds
+++ b/binaries/data/mods/official/art/textures/terrain/types/biome-desert/desert_cliff_3.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b11a13ae60d428f4e98d3bed5c6a760f3384eb19395ae1ab83d87b146e0f78ee
+oid sha256:78e0ef9a6fb52af511abc0dcb778f76aa86d7b79a6d41171f5973782e99d4880
 size 349680
diff --git a/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls b/binaries/data/mods/official/entities/unit-stats-spreadsheet.xls
index f403864128..a1b138d8e4 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_super_infantry_mace.xml b/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
index 2548963718..fb69772700 100644
--- a/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
+++ b/binaries/data/mods/official/entities/units/hele_super_infantry_mace.xml
@@ -27,6 +27,11 @@
 		<Health>
 			<Max>140</Max>
 		</Health>
+		<Stamina>
+			<Max>0</Max>
+			<BarHeight>0</BarHeight>
+			<Bar_Size>0</Bar_Size>
+		</Stamina>
 	</Traits>
 	<Actions>
 		<Attack>
@@ -37,9 +42,10 @@
 			</Melee>
 		</Attack>
 		<Move>
-			<Speed>4.5</Speed>
+			<Speed>6.5</Speed>
 			<Run>
-				<Speed>8.0</Speed>
+				<Range>0</Range>
+				<Speed>0</Speed>
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/maps/scenarios/Playtest - 1v1 multiplayer.xml b/binaries/data/mods/official/maps/scenarios/Playtest - 1v1 multiplayer.xml
index 8b2f80bbc3..13eb320bf9 100644
--- a/binaries/data/mods/official/maps/scenarios/Playtest - 1v1 multiplayer.xml	
+++ b/binaries/data/mods/official/maps/scenarios/Playtest - 1v1 multiplayer.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43d590dab14d4be31a2598191120560f7ff40eb924588505cb63c096499d7aeb
-size 97302
+oid sha256:f3cf403ee4a6a893eb0f96a5f2b136aec04aaaf87ba26996fdb7f21d5edfbd35
+size 96758