diff --git a/binaries/data/mods/public/art/actors/units/celts/boudicca.xml b/binaries/data/mods/public/art/actors/units/celts/boudicca.xml
index 33523ed893..d8dddb1b23 100644
--- a/binaries/data/mods/public/art/actors/units/celts/boudicca.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/boudicca.xml
@@ -27,7 +27,7 @@
       <props>
         <prop actor="props/units/weapons/jav_gold.xml" attachpoint="loaded-r_hand"/>
         <prop attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_gold.xml" attachpoint="projectile"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml b/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
index 67c6f7ec37..9588c7fa60 100644
--- a/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml
@@ -6,11 +6,11 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="female/f_chariot_idle_01.dae" name="Idle" speed="200"/>
-        <animation file="female/f_chariot_idle_01.dae" name="Walk" speed="10"/>
-        <animation file="female/f_chariot_run_01.dae" name="Run" speed="15"/>
-        <animation file="female/f_death_01.dae" name="Death" speed="200"/>
-        <animation file="female/f_jav_atk_01.dae" name="melee" speed="200"/>
+        <animation file="female/f_chariot_idle_01.dae" name="Idle" speed="10"/>
+        <animation file="female/f_chariot_idle_01.dae" name="Walk" speed="20"/>
+        <animation file="female/f_chariot_run_01.dae" name="Run" speed="10"/>
+        <animation file="female/f_death_01.dae" name="Death" speed="100"/>
+        <animation file="female/f_jav_atk_01.dae" name="melee" speed="100"/>
       </animations>
       <mesh>skeletal/f_tunic.dae</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/meshes/skeletal/deer_mesh.dae b/binaries/data/mods/public/art/meshes/skeletal/deer_mesh.dae
index aaed358d86..037ae159a9 100644
--- a/binaries/data/mods/public/art/meshes/skeletal/deer_mesh.dae
+++ b/binaries/data/mods/public/art/meshes/skeletal/deer_mesh.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8716120c67d63044ca88f40a26d372a7b248e1d9d5ce9ddfee7cddddbe4de608
-size 99734
+oid sha256:648080478005c4b4b6f4b8f82456818915e7486cad70753d0945755b9693aa62
+size 52452
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough.dds
index 034ad90997..c252a5323c 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough.dds
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c85cfe5ac38f9b035866a5b8a90db05a43bc90c047193e9dc8b7b7f0c023d44e
+oid sha256:714d390d3261d35cb34216e3ecf1db3fc479ec9158d9b28aa6140883e59ef985
 size 349680
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough_2.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough_2.dds
new file mode 100644
index 0000000000..d3b988e6f3
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_dirt_rough_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:925b9e997fc9578231bcba236ad5c5fb6349ecb030c34a9739dca015fa059fe7
+size 349680
diff --git a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_sand_smooth.dds b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_sand_smooth.dds
index e9295e206c..9a309e40d2 100644
--- a/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_sand_smooth.dds
+++ b/binaries/data/mods/public/art/textures/terrain/types/biome-desert/desert_sand_smooth.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d16cd655fa92fd4e2f2fccec1c05bb8c818cfec29cad9d12990a6012cfb03561
+oid sha256:a9971111886d692e389e2a2ca636ddbd1fee43e462063cfc0823d7001ec94f03
 size 349680
diff --git a/binaries/data/mods/public/entities/template_unit_hero.xml b/binaries/data/mods/public/entities/template_unit_hero.xml
index bfcc4e3f7e..a38d47770a 100644
--- a/binaries/data/mods/public/entities/template_unit_hero.xml
+++ b/binaries/data/mods/public/entities/template_unit_hero.xml
@@ -7,9 +7,7 @@
 			<Generic>Hero</Generic>
 
 			<Classes>Hero, Military, Organic</Classes>
-		
 		</Id>
-		
 		<Creation>
 			<Time>60</Time>
 			<Resource>
@@ -17,7 +15,6 @@
 				<Metal>250</Metal>
  			</Resource>
 		</Creation>
-		
 		<Population>
 			<Rem>1</Rem>
 		</Population>
diff --git a/binaries/data/mods/public/entities/template_unit_hero_cavalry.xml b/binaries/data/mods/public/entities/template_unit_hero_cavalry.xml
index a9dc87609b..d7a4189a84 100644
--- a/binaries/data/mods/public/entities/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/entities/template_unit_hero_cavalry.xml
@@ -11,6 +11,7 @@
 		</Id>
 		
 		<Creation>
+			<Time>80</Time>
 			<Resource>
  				<Food>150</Food>
 				<Metal>300</Metal>
diff --git a/binaries/data/mods/public/entities/template_unit_hero_infantry.xml b/binaries/data/mods/public/entities/template_unit_hero_infantry.xml
index 6938e3442d..4aed4b7faf 100644
--- a/binaries/data/mods/public/entities/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/entities/template_unit_hero_infantry.xml
@@ -11,6 +11,7 @@
 		</Id>
 		
 		<Creation>
+			<Time>60</Time>
 			<Resource>
  				<Food>100</Food>
 				<Metal>250</Metal>
diff --git a/binaries/data/mods/public/entities/template_unit_hero_ranged.xml b/binaries/data/mods/public/entities/template_unit_hero_ranged.xml
index ed6e7af716..a506f95749 100644
--- a/binaries/data/mods/public/entities/template_unit_hero_ranged.xml
+++ b/binaries/data/mods/public/entities/template_unit_hero_ranged.xml
@@ -7,10 +7,9 @@
 			<Generic>Hero</Generic>
 
 			<Classes>Hero, Military, Organic</Classes>
-		
 		</Id>
-		
 		<Creation>
+			<Time>60</Time>
 			<Resource>
  				<Food>100</Food>
 				<Wood>500</Wood>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml b/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
index 53846dc5c2..33867ff010 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_boudicca.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity	Parent="template_unit_hero">
+<Entity	Parent="template_unit_hero_ranged">
 	<Traits>
 		<Id>
 			<Specific>Boudicca</Specific>
@@ -29,8 +29,8 @@
 				<Speed>500</Speed>
 				<Duration>3</Duration>
 				
-				<Crush>50.0</Crush>
-				<Hack>50.0</Hack>
+				<Crush>60.0</Crush>
+				<Hack>60.0</Hack>
 				<Pierce>0.0</Pierce>
 			
 				<r>1.0</r>
@@ -57,7 +57,7 @@
  				<Hack>0.0</Hack>
  				<Pierce>50.0</Pierce>
  				<Crush>0.0</Crush>
-				<MinRange>12.0</MinRange>
+				<MinRange>0.0</MinRange>
 				<Range>30</Range>
 				<Speed>2000</Speed>
 				<ProjectileSpeed>30.0</ProjectileSpeed>
diff --git a/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml b/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
index 8b20f00976..dd1b70151c 100644
--- a/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
+++ b/binaries/data/mods/public/entities/units/celt_hero_cynvelin.xml
@@ -47,6 +47,15 @@
 				<b>0.2</b>
 				<a>0.05</a>
 			</Trample>
+			<Heal>
+				<Radius>25</Radius>
+				<Rate>5</Rate>
+				<Speed>1000</Speed>
+				<r>1.0</r>
+				<g>1.0</g>
+				<b>0.0</b>
+				<a>0.6</a>
+			</Heal>
 		</Auras>		
 		<Vision>
 			<Los>17.0</Los>
diff --git a/binaries/data/mods/public/entities/units/celt_ship_trireme.xml b/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
index 060e866c96..32a629d7a6 100644
--- a/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
+++ b/binaries/data/mods/public/entities/units/celt_ship_trireme.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_ship_trireme"
->
+<Entity	Parent="template_unit_mechanical_ship_trireme">
 	<Traits>
-	
 		<Id>
-		
 			<Specific>Venetic Ponti</Specific>
-			
 			<Civ>Celts</Civ>
-			
 			<History>The ships of Gaul were described by Julias Caesar as:  flat bottoms to ride the shallows, exceptionally high bows and sterns, hulls were made entirely of oak, the foot wide cross-timbers were fastened with iron bolts as thick as a man’s thumb, sails of raw hides or thin leather, adapted for sailing treacherous and stormy waters of the north atlantic.  Caesar could not injure them by ramming because they were so solidly built, and their height made it difficult to reach them with missiles or board them with grappling irons.</History>
-			
+			<Tooltip>Massive ship that can transport soldiers far across the sea.</Tooltip>
 		</Id>
-	
+
 	</Traits>
 
 	<Actor>structures/celts/trireme.xml</Actor>
diff --git a/binaries/data/mods/public/entities/units/celt_support_female_citizen.xml b/binaries/data/mods/public/entities/units/celt_support_female_citizen.xml
index 283d3d4d07..9b1751b2ab 100644
--- a/binaries/data/mods/public/entities/units/celt_support_female_citizen.xml
+++ b/binaries/data/mods/public/entities/units/celt_support_female_citizen.xml
@@ -8,77 +8,28 @@
 			<Civ>Celts</Civ>
 			<History>Celtic women enjoyed many freedoms, especially compared to their Greek and Roman counterparts. Although they did not fight in battle as some believe Gallic women were quite large and very strong compared to most men. They were able to own property and were capable of gaining considerable wealth. Some noblewomen took over power when their husband’s died, such as Boudicca of the Iceni. In addition, family trees were drawn up along female lines, men claiming their ancestry through female ancestors.</History>
 		</Id>
-			<Creation>
-			<Resource>
- 				<Food>55</Food>
- 			</Resource>
-		</Creation>
-		<Auras>
-			<Allure>
-				<Radius>27</Radius>
-				<r>0.9</r>
-				<g>0.8</g>
-				<b>1.1</b>
-				<a>0.6</a>
-			</Allure>
-		</Auras>		
-		<Armour>
-			<Hack>1.4</Hack>
-			<Pierce>1.4</Pierce>
-			<Crush>2.4</Crush>
-		</Armour>
 		<Health>
 			<Max>75</Max>
 			<RegenRate>0.5</RegenRate>
 		</Health>	
-		<Vision>
-			<Los>12</Los>
-		</Vision>
 	</Traits>
 	<Actions>
 		<Create>
 			<List>
 				<StructCiv>
-					<Civil_Centre />
-					<Farmstead />
-					<Field />
-					<House />
-					<Market />
-					<Mill />
-					<Temple />
 					<Sb1 />
 				</StructCiv>
 			</List>
-		</Create>	
-		<Gather>
-			<Resource>
-				<Food>
-					<Fruit>8.4</Fruit>
-					<Grain>8.4</Grain>
-					<Meat>2.9</Meat>
-					<Fish>6.4</Fish>
-				</Food>
-				<Wood>4.4</Wood>
-				<Metal>2.4</Metal>
-				<Stone>2.4</Stone>
-			</Resource>
- 			<Range>2.4</Range>
-			<Speed>3010</Speed>
-		</Gather>
-		<Repair>
-			<Rate>0.9</Rate>
-			<Speed>1010</Speed>
-		</Repair>
-		<Build>
-			<Rate>1.4</Rate>
-			<Speed>1010</Speed>
-		</Build>
-		<Move>
-			<Speed>6.0</Speed>
-			<Run>
-				<Speed>12.45</Speed>
-			</Run>
-		</Move>
+		</Create>
+		<Attack>
+			<Melee>
+				<Hack>10.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>0.0</Crush>
+				<Range>4.0</Range>
+				<Speed>1000</Speed>
+			</Melee>
+		</Attack>		
 	</Actions>	
 	<Actor>units/celts/female_citizen.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis.pmp b/binaries/data/mods/public/maps/scenarios/Oasis.pmp
index e00ab7e96c..7f0906ebd5 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Oasis.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0294f27b773ce8f5016436d6a27a6b9c93401f9b1e107a8653104b3c852a91d9
-size 208502
+oid sha256:2f9fe423e3a7b807e5f39af640ab655c3695a888f9c193baee59039071a1c160
+size 208525
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis.xml b/binaries/data/mods/public/maps/scenarios/Oasis.xml
index f2ed7da934..e4a76926c9 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/Oasis.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44ad1a3d6b6195f069f229b1897d6e977cb4492fd1b9df692b62037c1f2b5c8e
-size 231389
+oid sha256:f17275cef66eb560015453cbb4e005bdac1c24ab42340c6668a1bf5b59f1617f
+size 231391