diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
index fd7a3eb7d9..5de527bb43 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
@@ -9,7 +9,7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
index f964c7c906..d8867a131e 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
@@ -9,7 +9,7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
index 3968d07882..59256b8421 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
@@ -9,7 +9,7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
index cf2cb73e9f..6be269986b 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
@@ -8,9 +8,9 @@
       <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="28"/>
-        <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_walk.psa" name="Walk" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="90"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="85"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
index 174b36ba65..07d9f4883c 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
@@ -9,7 +9,7 @@
         <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="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
index 89a13ca99e..a3caa6a628 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
@@ -8,9 +8,9 @@
       <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="28"/>
-        <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_walk.psa" name="Walk" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="105"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="95"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
index 2c40f472cf..21ce9000d4 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
@@ -9,7 +9,7 @@
         <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="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
index 89a9ce57e5..a247596d9a 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
@@ -8,9 +8,9 @@
       <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="28"/>
-        <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_walk.psa" name="Walk" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="100"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="80"/>
         <animation name=""/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
index bf614d1e74..11ec727209 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
@@ -9,7 +9,7 @@
         <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="8"/>
-        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
index 091ad6da58..9065c012e6 100644
--- a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
@@ -1,78 +1,81 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-		<!-- Class Specific -->
-	    <animation file="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
-        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
-		<!-- Citzen Soldier Specific -->
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-      </animations>
-      <mesh>skeletal/f_dress.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
-      </props>
-      <texture>skeletal/celt_fem.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Idle">
-      <props>
-        <prop attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-        <prop attachpoint="l_hand"/>
-      </props>
-    </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="infantry/support/idle/fem_01.psa" name="Idle" speed="200"/>
+        <animation file="infantry/support/move/walk/fem_01.psa" name="Walk" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage_fem.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+      </animations>
+      <mesh>skeletal/f_dress.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/dudette_head.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/celt_fem.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Idle">
+      <props>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
index 144561c391..f1498fe53f 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
@@ -6,7 +6,6 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
@@ -17,15 +16,15 @@
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-      </animations>	
+      </animations>
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
         <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
@@ -37,41 +36,41 @@
   </group>
 
   <group>
-    <variant name="skin 01">
+    <variant frequency="1" name="skin 01">
       <texture>skeletal/celt_ijv_a_01.dds</texture>
     </variant>
-    <variant name="skin 02">
+    <variant frequency="1" name="skin 02">
       <texture>skeletal/celt_ijv_a_02.dds</texture>
     </variant>
-    <variant name="skin 03">
+    <variant frequency="1" name="skin 03">
       <texture>skeletal/celt_ijv_a_03.dds</texture>
     </variant>
-    <variant name="skin 04">
+    <variant frequency="1" name="skin 04">
       <texture>skeletal/celt_ijv_a_04.dds</texture>
     </variant>
-    <variant name="skin 05">
+    <variant frequency="1" name="skin 05">
       <texture>skeletal/celt_ijv_a_05.dds</texture>
     </variant>
-    <variant name="skin 06">
+    <variant frequency="1" name="skin 06">
       <texture>skeletal/celt_ijv_a_06.dds</texture>
     </variant>
-    <variant name="skin 07">
+    <variant frequency="1" name="skin 07">
       <texture>skeletal/celt_ijv_a_07.dds</texture>
     </variant>
-    <variant name="skin 08">
+    <variant frequency="1" name="skin 08">
       <texture>skeletal/celt_ijv_a_08.dds</texture>
     </variant>
-    <variant name="skin 09">
+    <variant frequency="1" name="skin 09">
       <texture>skeletal/celt_ijv_a_09.dds</texture>
     </variant>
-    <variant name="skin 10">
+    <variant frequency="1" name="skin 10">
       <texture>skeletal/celt_ijv_a_10.dds</texture>
     </variant>
-    <variant name="skin 11">
+    <variant frequency="1" name="skin 11">
       <texture>skeletal/celt_ijv_a_11.dds</texture>
     </variant>
   </group>
-  
+
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -110,6 +109,13 @@
         <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="Build">
       <props>
         <prop actor="" attachpoint="shield"/>
@@ -119,7 +125,6 @@
     </variant>
   </group>
 
-
   <material>player_trans.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
index f575f08bad..1060a951f9 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
@@ -16,15 +16,15 @@
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-      </animations>	
+      </animations>
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
@@ -35,8 +35,7 @@
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
   </group>
-  
-  
+
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -68,6 +67,13 @@
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="gather_stone">
       <props>
         <prop actor="" attachpoint="shield"/>
@@ -84,7 +90,6 @@
     </variant>
   </group>
 
-
   <material>player_trans.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
index dfc44172fa..e14c169f37 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
@@ -16,15 +16,15 @@
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-      </animations>	
+      </animations>
       <mesh>skeletal/m_tights.pmd</mesh>
       <props>
         <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
@@ -37,15 +37,14 @@
   </group>
 
   <group>
-    <variant name="1">
+    <variant name="Tattoos-1">
       <texture>skeletal/celt_ijv_e_01.dds</texture>
     </variant>
-    <variant name="2">
+    <variant name="Tattoos-2">
       <texture>skeletal/celt_ijv_e_02.dds</texture>
     </variant>
   </group>
-  
-  
+
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -84,6 +83,13 @@
         <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="Build">
       <props>
         <prop actor="" attachpoint="shield"/>
@@ -93,7 +99,6 @@
     </variant>
   </group>
 
-
   <material>player_trans.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
index dc681ef4e2..d54ad2f26b 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
@@ -6,30 +6,25 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -41,47 +36,47 @@
   </group>
 
   <group>
-    <variant>
-      <texture>skeletal/celt_isw_a_02.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_03.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_04.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_05.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_06.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_07.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_08.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_09.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_10.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_11.dds</texture>
-    </variant>
-    <variant>
+    <variant frequency="1" name="Clothes-1">
       <texture>skeletal/celt_isw_a_01.dds</texture>
     </variant>
+    <variant frequency="1" name="Clothes-2">
+      <texture>skeletal/celt_isw_a_02.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-3">
+      <texture>skeletal/celt_isw_a_03.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-4">
+      <texture>skeletal/celt_isw_a_04.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-5">
+      <texture>skeletal/celt_isw_a_05.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-6">
+      <texture>skeletal/celt_isw_a_06.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-7">
+      <texture>skeletal/celt_isw_a_07.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-8">
+      <texture>skeletal/celt_isw_a_08.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-9">
+      <texture>skeletal/celt_isw_a_09.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-10">
+      <texture>skeletal/celt_isw_a_10.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothes-11">
+      <texture>skeletal/celt_isw_a_11.dds</texture>
+    </variant>
   </group>
-  
+
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
       <props>
         <prop actor="" attachpoint="l_hand"/>
-	    <prop actor="props/units/shields/celt_scutum_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/celt_scutum_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
     </variant>
@@ -97,7 +92,7 @@
         <prop actor="" attachpoint="shield"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-	  </props>
+      </props>
     </variant>
     <variant name="gather_fruit">
       <props>
@@ -105,7 +100,7 @@
         <prop actor="" attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
         <prop actor="" attachpoint="r_hand"/>
-	  </props>
+      </props>
     </variant>
     <variant name="gather_stone">
       <props>
@@ -114,6 +109,13 @@
         <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="Build">
       <props>
         <prop actor="" attachpoint="shield"/>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
index c84e04d76e..cd0bd41746 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
@@ -6,30 +6,25 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -41,16 +36,16 @@
   </group>
 
   <group>
-    <variant>
+    <variant frequency="1" name="Clothes-1">
       <texture>skeletal/celt_isw_b_01.dds</texture>
     </variant>
-    <variant>
+    <variant frequency="1" name="Clothes-2">
       <texture>skeletal/celt_isw_b_02.dds</texture>
     </variant>
-    <variant>
+    <variant frequency="1" name="Clothes-3">
       <texture>skeletal/celt_isw_b_03.dds</texture>
     </variant>
-    <variant>
+    <variant frequency="1" name="Clothes-4">
       <texture>skeletal/celt_isw_b_04.dds</texture>
     </variant>
   </group>
@@ -93,6 +88,13 @@
         <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="Build">
       <props>
         <prop actor="" attachpoint="shield"/>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
index 901c0ef201..37103c10ee 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
@@ -6,30 +6,25 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
         <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -42,14 +37,14 @@
   </group>
 
   <group>
-    <variant frequency="10" name="1">
+    <variant frequency="1" name="Body Armour-1">
       <texture>skeletal/celt_isw_e_01.dds</texture>
     </variant>
-    <variant frequency="10" name="2">
+    <variant frequency="1" name="Body Armour-2">
       <texture>skeletal/celt_isw_e_02.dds</texture>
     </variant>
   </group>
-  
+
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -71,7 +66,7 @@
         <prop actor="" attachpoint="shield"/>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-	  </props>
+      </props>
     </variant>
     <variant name="gather_fruit">
       <props>
@@ -79,7 +74,7 @@
         <prop actor="" attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
         <prop actor="" attachpoint="r_hand"/>
-	  </props>
+      </props>
     </variant>
     <variant name="gather_stone">
       <props>
@@ -88,6 +83,13 @@
         <prop actor="" attachpoint="r_hand"/>
       </props>
     </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
     <variant name="Build">
       <props>
         <prop actor="" attachpoint="shield"/>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
index 5dce436a94..b67cd14020 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_a.xml
@@ -22,7 +22,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
index 9dd0d084f4..8ef5a69a56 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_archer_b.xml
@@ -22,7 +22,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
index 71aa230d9e..338414aae7 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
@@ -21,73 +21,72 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-      </animations>	
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/thrac_a.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/hele_pelta_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/hele_ijv_rboot.xml" attachpoint="r_leg"/>
-        <prop actor="props/units/hele_ijv_lboot.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
-      </props>
-      <texture>skeletal/hele_ijv_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
+      </animations>
+      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/thrac_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_pelta_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/hele_ijv_rboot.xml" attachpoint="r_leg"/>
+        <prop actor="props/units/hele_ijv_lboot.xml" attachpoint="l_leg"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+      </props>
+      <texture>skeletal/hele_ijv_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
         <prop actor="" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
-    <variant name="gather_wood">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_grain">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-    <variant name="gather_fruit">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-      </props>
-    </variant>
-    <variant name="gather_stone">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="" attachpoint="r_hand"/>
-      </props>
-    </variant>
-    <variant name="Build">
-      <props>
-        <prop actor="" attachpoint="shield"/>
-        <prop actor="" attachpoint="l_hand"/>
-        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
index 1e2fffca13..cc8ae19147 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
@@ -21,7 +21,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>
@@ -29,7 +28,7 @@
       <props>
         <prop actor="props/units/heads/thrac_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-		<prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
       </props>
       <texture>skeletal/hele_ijv_b.dds</texture>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
index a6565d705c..b6f4803b11 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -21,7 +21,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>
diff --git a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_a.xml b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_a.xml
index fa821a7500..34f555cc30 100644
--- a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_a.xml
+++ b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_a.xml
@@ -27,7 +27,7 @@
 	<Actions>
  		<Attack>
 			<Melee>
- 				<Hack>14.0</Hack>
+ 				<Hack>17.0</Hack>
  				<Pierce>0.0</Pierce>
  				<Crush>0.0</Crush>
 			</Melee>
diff --git a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_b.xml b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_b.xml
index 007d36891e..27ce42041a 100644
--- a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_b.xml
+++ b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_b.xml
@@ -19,9 +19,29 @@
 			<Entity>rome_infantry_swordsman_a</Entity>
 			
 		</Promotion>
+
+		<Armour>
+			<Hack>6.0</Hack>
+			<Pierce>5.0</Pierce>
+			<Crush>10.0</Crush>
+		</Armour>	
+
+		<Health>
+			<Max>95</Max>
+		</Health>
 		
 	</Traits>
 
+	<Actions>
+ 		<Attack>
+			<Melee>
+ 				<Hack>15.0</Hack>
+ 				<Pierce>0.0</Pierce>
+ 				<Crush>0.0</Crush>
+			</Melee>
+ 		</Attack>
+	</Actions>
+
 	<Actor>units/romans/infantry_swordsman_b.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_e.xml b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_e.xml
index f159211f8c..ce2ee65ce7 100644
--- a/binaries/data/mods/official/entities/units/rome_infantry_swordsman_e.xml
+++ b/binaries/data/mods/official/entities/units/rome_infantry_swordsman_e.xml
@@ -21,7 +21,7 @@
 	<Actions>
  		<Attack>
 			<Melee>
- 				<Hack>16.0</Hack>
+ 				<Hack>19.0</Hack>
  				<Pierce>0.0</Pierce>
  				<Crush>0.0</Crush>
 			</Melee>