diff --git a/binaries/data/mods/official/art/actors/units/hellenes/xenophon.xml b/binaries/data/mods/official/art/actors/units/hellenes/xenophon.xml
index de628d07de..919c173515 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/xenophon.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/xenophon.xml
@@ -22,7 +22,7 @@
         <prop actor="props/units/shields/hele_round_xenophon.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/hele_xenophon_tunic.dds</texture>
+      <texture>skeletal/hele_xenophon.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/units/persians/cavalry_javelinist_e_r.xml b/binaries/data/mods/official/art/actors/units/persians/cavalry_javelinist_e_r.xml
index 5253be618f..e9be141fc0 100644
--- a/binaries/data/mods/official/art/actors/units/persians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/cavalry_javelinist_e_r.xml
@@ -6,24 +6,35 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="0"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <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="infantry/general/dude/dudeattack.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack1.psa" name="Attack" speed="100"/>
+        <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_javelin_atk_a.psa" load="0" name="Melee" speed="75"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/pers_sign_cavalry_javelinist_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_head_pers.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/pers_pelta_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/cape_a.xml" attachpoint="back"/>
       </props>
-      <texture>skeletal/plac_pers_e.dds</texture>
+      <texture>skeletal/pers_cjv_e_1.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml b/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
index 2df7f595e3..874879f10a 100644
--- a/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/female_citizen.xml
@@ -30,10 +30,14 @@
   </group>
 
   <group>
-    <variant frequency="2" name="Dress-01">
+    <variant frequency="1" name="Dress-01">
       <mesh>skeletal/f_dress.pmd</mesh>
       <texture>skeletal/pers_fem_1.dds</texture>
     </variant>
+    <variant frequency="1" name="Dress-02">
+      <mesh>skeletal/f_dress.pmd</mesh>
+      <texture>skeletal/pers_fem_2.dds</texture>
+    </variant>
   </group>
 
   <group>
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_cjv_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_cjv_e_1.dds
new file mode 100644
index 0000000000..1d8e5b0400
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_cjv_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bf54c755de2d1345874342fa3209dd634ae574b6de091bcb46568d2fbbfd873
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_fem_2.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_fem_2.dds
new file mode 100644
index 0000000000..08d01d119c
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_fem_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89d8e71f5e1493a528c8acd8645869453760df9bfc4bf3b0f358f7ebadd856ff
+size 22000
diff --git a/binaries/data/mods/official/entities/structures/celt_barracks.xml b/binaries/data/mods/official/entities/structures/celt_barracks.xml
index fb867e6c2e..223d41b332 100644
--- a/binaries/data/mods/official/entities/structures/celt_barracks.xml
+++ b/binaries/data/mods/official/entities/structures/celt_barracks.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_structure_military_fortress"
+<Entity	Parent="template_structure_military_barracks"
 >
 	<Traits>
 	
diff --git a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
index 40ffb9cd70..813f1dc8ee 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
@@ -33,8 +33,8 @@
 		</Creation>
 
  		<Footprint>
- 			<Width>24.0</Width>
- 			<Depth>24.0</Depth>
+ 			<Width>20.5</Width>
+ 			<Depth>20.5</Depth>
  			<Height>8.0</Height>
  		</Footprint>
 
diff --git a/binaries/data/mods/official/entities/template_structure_civic_house.xml b/binaries/data/mods/official/entities/template_structure_civic_house.xml
index 1aba22f944..f7af3b60a4 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_house.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_house.xml
@@ -28,9 +28,9 @@
 		</Creation>
 
  		<Footprint>
- 			<Width>9.0</Width>
- 			<Depth>9.0</Depth>
- 			<Height>8.0</Height>
+ 			<Width>8.5</Width>
+ 			<Depth>8.5</Depth>
+ 			<Height>5.0</Height>
  		</Footprint>
 
 		<Health>
diff --git a/binaries/data/mods/official/entities/template_structure_economic_market.xml b/binaries/data/mods/official/entities/template_structure_economic_market.xml
index 0705dd10dc..282ad5f9ed 100644
--- a/binaries/data/mods/official/entities/template_structure_economic_market.xml
+++ b/binaries/data/mods/official/entities/template_structure_economic_market.xml
@@ -27,8 +27,8 @@
 		</Creation>
 			
  		<Footprint>
- 			<Width>18.0</Width>
- 			<Depth>18.0</Depth>
+ 			<Width>17.0</Width>
+ 			<Depth>17.0</Depth>
  			<Height>8.0</Height>
  		</Footprint>
 
diff --git a/binaries/data/mods/official/entities/template_structure_military_barracks.xml b/binaries/data/mods/official/entities/template_structure_military_barracks.xml
index 6d3720c18b..92e3e49192 100644
--- a/binaries/data/mods/official/entities/template_structure_military_barracks.xml
+++ b/binaries/data/mods/official/entities/template_structure_military_barracks.xml
@@ -29,9 +29,9 @@
 		</Creation>
 		
  		<Footprint>
- 			<Width>18.0</Width>
- 			<Depth>18.0</Depth>
- 			<Height>8.0</Height>
+ 			<Width>17.0</Width>
+ 			<Depth>17.0</Depth>
+ 			<Height>5.0</Height>
  		</Footprint>
 
 		<Health>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml b/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
index 550caba999..39c2b6cc69 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_ship.xml
@@ -17,10 +17,11 @@
 			<Type>Water</Type>
 		</Anchor>
 
-		<Footprint>
-			<Radius>5.0</Radius>
-			<Height>5.0</Height>
-		</Footprint>
+ 		<Footprint>
+			<Width>6.0</Width>
+ 			<Depth>30.0</Depth>
+ 			<Height>8.0</Height>
+ 		</Footprint>
 
 		<Health>
 			<BarHeight>12.0</BarHeight>
diff --git a/binaries/data/mods/official/entities/units/hele_ship_bireme.xml b/binaries/data/mods/official/entities/units/hele_ship_bireme.xml
index 1135a63a0c..567b9eb77a 100644
--- a/binaries/data/mods/official/entities/units/hele_ship_bireme.xml
+++ b/binaries/data/mods/official/entities/units/hele_ship_bireme.xml
@@ -14,7 +14,11 @@
 			<History>Pentekontors were employed from 800 BC, mostly as a light support unit in the Greek navy. After 600 BC, they were only seen in battle in very limited numbers. They were still in use by small states which could not afford a sufficient number of triremes for their navy.</History>
 			
 		</Id>
-
+ 		<Footprint>
+ 			<Width>6.0</Width>
+ 			<Depth>30.0</Depth>
+ 			<Height>8.0</Height>
+ 		</Footprint>
 	</Traits>
 	
 	<Actions>
diff --git a/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_a.xml b/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_a.xml
index fce2aa5c91..334aea0e69 100644
--- a/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_a.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="pers_cavalry_javelinist_b"
->
+<Entity	Parent="pers_cavalry_javelinist_b">
 
 	<Traits>
 	
@@ -13,5 +11,5 @@
 		</Promotion>
 	
 	</Traits>
-
+	<Actor>units/persians/cavalry_javelinist_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_b.xml b/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_b.xml
index 16b6047dfb..eb2493eb79 100644
--- a/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/entities/units/pers_cavalry_javelinist_b.xml
@@ -21,5 +21,5 @@
 		
 	</Traits>
 
-	<Actor>units/persians/cavalry_javelinist_a.xml</Actor>
+	<Actor>units/persians/cavalry_javelinist_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/latium_generated.xml b/binaries/data/mods/official/maps/scenarios/latium_generated.xml
index da2263325f..fd2f1c3150 100644
--- a/binaries/data/mods/official/maps/scenarios/latium_generated.xml
+++ b/binaries/data/mods/official/maps/scenarios/latium_generated.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45ae0e7d8c14d20a7d5e4ccda7b010c6a2bba281b4daf640ae6a2fc92ea9768b
-size 340192
+oid sha256:aafad9baa1b893a7587ad425ec2dc2a4cb820a00d8761cd6c5168f2921fac4a1
+size 353162