diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index b765636029..903dddeca9 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -2,62 +2,48 @@
 
 <Entity	Parent="template_unit">
 	<Traits>
-	
 		<Id>
 			<Generic>Cavalry</Generic>
-
 			<Classes>Cavalry, Military, Mounted, Organic, CitizenSoldier, Worker</Classes>
 		</Id>
-
 		<Armour>
 			<Hack>3.0</Hack>
 			<Pierce>10.0</Pierce>
 			<Crush>12.0</Crush>
 		</Armour>
-
 		<Footprint>
 			<Radius>1.2</Radius>
 			<Height>7.5</Height>
 		</Footprint>
-		
 		<Health>
 			<RegenRate>0.1</RegenRate>
 		</Health>
-		
 		<Stamina>
 			<Max>800.0</Max>
 		</Stamina>
-
 		<Loot>
 			<Xp>200</Xp>
-			<Food>1</Food>
-			<wood>1</wood>
+			<Food>10</Food>
+			<Wood>4</Wood>
 			<Stone>1</Stone>
 			<Metal>1</Metal>
 		</Loot>		
-
 		<Population>
 			<Rem>2</Rem>
 		</Population>
-
 		<Promotion>
 			<Req>900</Req>
 		</Promotion>
-		
 		<Anchor>
 			<ConformX>3.141592</ConformX>
 			<ConformZ>0</ConformZ>
 		</Anchor>
-
 		<Vision>
 			<Los>15</Los>
 		</Vision>
-
 	</Traits>
-
 	<Actions>
-
- 		<Gather>
+		<Gather>
 			<Resource>
 				<Food>
 					<Meat>50</Meat>
@@ -67,31 +53,19 @@
  			<Range>2.0</Range>
 			<Speed>1000</Speed>
  		</Gather>
-		
-		<Loot>
-			<Resources />
-			<Xp />
-		</Loot>		
-
 		<Move>
 			<Speed>4.65</Speed>
 			<TurningRadius>5.0</TurningRadius>
-			
 			<Run>
 				<Speed>27.9</Speed>
 				<Range>600.0</Range>
 				<RangeMin>5.0</RangeMin>
 			</Run>
-			
 		</Move>
-		
 	</Actions>
-	
 	<SoundGroups>
 		<Melee>audio/attack/weapon/sword.xml</Melee>
 		<Death>audio/actor/fauna/death/death_horse.xml</Death>
 	</SoundGroups>	
-	
 	<Script File="scripts/entity_functions.js" />
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
index a8d949af26..b28528f904 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee.xml
@@ -1,57 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry"
->
+<Entity	Parent="template_unit_cavalry">
 	<Traits>
-	
 		<Id>
-
 			<Generic>Melee Cavalry</Generic>
-
 			<Classes>Melee</Classes>
-		
 		</Id>
-		
 		<Auras>
 			<Trample>
 				<Radius>4</Radius>
 				<Speed>1000</Speed>
 				<Duration>3</Duration>
-				
 				<Crush>11.0</Crush>
 				<Hack>0.0</Hack>
 				<Pierce>0.0</Pierce>
-				
 				<r>1.0</r>
 				<g>0.1</g>
 				<b>0.2</b>
 				<a>0.5</a>
 			</Trample>
 		</Auras>
-		
 	</Traits>
-	
 	<Actions>
 		<Attack>
 			<Melee>
 				<Hack>5.0</Hack>
 				<Pierce>5.0</Pierce>
 				<Crush>0.0</Crush>
-				
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Melee>
-		
 			<Charge>
 				<Hack>15.0</Hack>
 				<Pierce>10.0</Pierce>
 				<Crush>15.0</Crush>
-				
 				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Charge>	
 		</Attack>
 	</Actions>
-
 </Entity>
\ No newline at end of file
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 99762c692d..83771f1934 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
@@ -2,37 +2,27 @@
 
 <Entity	Parent="template_unit_cavalry_melee">
 	<Traits>
-	
 		<Id>
 			<Generic>Cavalry Spearman</Generic>
-
 			<Icon_Cell>15</Icon_Cell>
-
 			<Classes>Spear</Classes>
-
 			<Rollover>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</Rollover>
-		
 		</Id>
-		
 		<Creation>
 			<Resource>
  				<Food>110</Food>
 				<Wood>50</Wood>
  			</Resource>
 		</Creation>
-		
 		<Armour>
 			<Hack>3.0</Hack>
 			<Pierce>10.0</Pierce>
 			<Crush>12.0</Crush>
 		</Armour>
-
 		<Health>
 			<Max>160</Max>
 		</Health>
-
 	</Traits>
-
 	<Actions>
  		<Attack>
 			<Melee>
@@ -47,18 +37,11 @@
 			</Charge>		
 			</Melee>
  		</Attack>
-
 		<Move>
-
 			<Speed>9.0</Speed>
-
 			<Run>
-
 				<Speed>20</Speed>
-
 			</Run>
 		</Move>
 	</Actions>
- 
-
 </Entity>
\ No newline at end of file
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 f4592b06fb..98f9211321 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
@@ -2,18 +2,12 @@
 
 <Entity	Parent="template_unit_cavalry_melee">
 	<Traits>
-	
 		<Id>
 			<Generic>Cavalry Swordsman</Generic>
-
 			<Icon_Cell>18</Icon_Cell>
-
 			<Classes>Sword</Classes>
-
 			<Rollover>Fighting from horseback with a sword is a tricky thing to do. This required usage of a sword that was longer than the typical infantry sword. One needed a good reach to attack from the height of a horse. If you were without spear (the ideal weapon of choice) it was probably because you needed your hands free to do other tasks such as riding hard and fast. It wasn't uncommon for the men to dismount and attack from foot if they were armed with only a sword.</Rollover>
-		
 		</Id>
-		
 		<Creation>
 			<Resource>
  				<Food>100</Food>
@@ -25,12 +19,10 @@
 			<Pierce>10.0</Pierce>
 			<Crush>12.0</Crush>
 		</Armour>
-
 		<Health>
 			<Max>160</Max>
 		</Health>
 	</Traits>
-
 	<Actions>
  		<Attack>
 			<Melee>
@@ -42,17 +34,11 @@
 				<Range>3.6</Range>
 			</Charge>		
  		</Attack>
-
 		<Move>
-
 			<Speed>9.0</Speed>
-
 			<Run>
-
 				<Speed>19</Speed>
-
 			</Run>
 		</Move>
 	</Actions>
-
-</Entity>
+</Entity>
\ No newline at end of file
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 fa6a1a1a4e..d647390c3f 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
@@ -2,19 +2,13 @@
 
 <Entity	Parent="template_unit_cavalry_ranged">
 	<Traits>
-	
 		<Id>
 			<Generic>Cavalry Javelinist</Generic>
-
 			<Icon_Cell>6</Icon_Cell>
-
 			<Classes>Javelin</Classes>
-
 			<Rollover>The javelins thrown from a horse's back were probably 3 at most. The idea was to quickly advance with 3 in hand, then throw them all. After you had done that it was time to switch to your secondary weapon which was usually a spear or a sword. However, in the game - these units will only have ranged attack.</Rollover>
-
 		</Id>
-		
-		<Creation>
+		<Creation>			
 			<Resource>
  				<Food>100</Food>
 				<Wood>70</Wood>
@@ -29,8 +23,7 @@
  			<Max>150</Max>
 		</Health>
 	</Traits>
-
-<Actions>
+	<Actions>
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
@@ -39,18 +32,11 @@
 				<Range>40.0</Range>
 			</Ranged>
  		</Attack>
-
 		<Move>
-
 			<Speed>10.0</Speed>
-
 			<Run>
-
 				<Speed>22.0</Speed>
-
 			</Run>
 		</Move>
 	</Actions>
-
-	
 </Entity>
\ No newline at end of file
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 4bf4b915e3..cc3d240874 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
@@ -2,19 +2,12 @@
 
 <Entity	Parent="template_unit_infantry_melee">
 	<Traits>
-	
 		<Id>
-		
 			<Generic>Infantry Spearman</Generic>
-
 			<Icon_Cell>3</Icon_Cell>
-
 			<Classes>Spear, InfantrySpearman</Classes>
-
 			<Rollover>Probably one of the most primitive units in the game. Fighting with a sharp object at the end of the pole didn't require a lot of technology to develop. It also allowed the human to distance themselves from their attacker. As time passed the spears got longer and longer. Started with a fighting style similar to using a quarterstaff, then to using them in numbers as a 'pin cushion' vs. humans (sarissa in a phalanx). Later it was developed to combat cavalry. During the medieval period it evolved to the pike. These units tended to be armoured as heavily as possible.</Rollover>
-		
 		</Id>
-		
 		<Creation>
 			<Resource>
  				<Food>60</Food>
@@ -26,21 +19,16 @@
 			<Pierce>3.0</Pierce>
 			<Crush>10.0</Crush>
 		</Armour>
-
 		<Health>
 			<Max>90</Max>
 		</Health>
-
 		<Stamina>
 			<Max>300.0</Max>
 		</Stamina>
-
 		<Vision>
 			<Los>12</Los>
 		</Vision>
-	
 	</Traits>
-	
 	<Actions>
  		<Attack>
 			<Melee>
@@ -52,17 +40,11 @@
 				<Pierce>10.0</Pierce>
 			</Charge>		
  		</Attack>
-
 		<Move>
-
 			<Speed>6.0</Speed>
-
 			<Run>
-
 				<Speed>14.0</Speed>
-
 			</Run>
 		</Move>
 	</Actions>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
index 95cff718c1..311395a5b0 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged.xml
@@ -2,40 +2,29 @@
 
 <Entity	Parent="template_unit_infantry">
 	<Traits>
-	
 		<Id>
 			<Icon_Cell>43</Icon_Cell>
-
 			<Generic>Ranged Infantry</Generic>
-
 			<Classes>Ranged</Classes>
-		
 		</Id>
-	
 		<Vision>
 			<Los>12.0</Los>
 		</Vision>
-		
 	</Traits>
-	
 	<Actions>
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
  				<Pierce>1.0</Pierce>
  				<Crush>0.0</Crush>
-
 				<MinRange>1.0</MinRange>
 				<Range>1.0</Range>
 				<Speed>1500</Speed>
 				<ProjectileSpeed>28.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>
-
 	</Actions>
-
 	<SoundGroups>
 		<Melee>audio/attack/weapon/arrowfly.xml</Melee>
 	</SoundGroups>
-	
 </Entity>
\ No newline at end of file
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 c2f16d834c..976a49f339 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
@@ -2,64 +2,54 @@
 
 <Entity	Parent="template_unit_infantry_ranged">
 	<Traits>
-	
 		<Id>
 			<Generic>Infantry Javelinist</Generic>
-
 			<Icon_Cell>21</Icon_Cell>
-
 			<Classes>Javelin</Classes>
-
 			<Rollover>These were the skirmishers. These lightly armoured units would advance quickly, throw a hail of javelins and then retreat back to their ranks. Grab another spear and repeat. They would do well against any unit that wasn't wearing proper armour, but more poorly if they fought hand to hand vs a well armoured unit. They didn't always have to thow their spears either. They used these light small spears in hand to hand similar to a quarterstaff. Also note that the development of the pilum was a key transition. This pilum was a weapon with a long steel shaft that would sink into a shield, nearly impossible to remove. This rendered the shield useless. They also weighted and balanced them to make them accurately hit with a punch.</Rollover>
-
 		</Id>
-		
 		<Creation>
+			<Time>20</Time>
 			<Resource>
  				<Food>50</Food>
 				<Wood>50</Wood>
  			</Resource>
 		</Creation>
-
 		<Health>
 			<Max>80</Max>
 		</Health>
-
 		<Armour>
 			<Hack>1.0</Hack>
 			<Pierce>5.0</Pierce>
 			<Crush>2.0</Crush>
 		</Armour>
-
+		<Loot>
+			<Food>1</Food>
+			<Wood>12.5</Wood>
+			<Stone>1</Stone>
+			<Metal>1</Metal>
+		</Loot>		
 		<Stamina>
 			<Max>500.0</Max>
 		</Stamina>		
 	</Traits>
-
 	<Actions>
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
  				<Pierce>45.0</Pierce>
  				<Crush>0.0</Crush>
-
 				<MinRange>16.0</MinRange>
 				<Range>30</Range>
 				<Speed>1500</Speed>
 				<ProjectileSpeed>30.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>
-
 		<Move>
-
 			<Speed>8.0</Speed>
-
 			<Run>
-
 				<Speed>17.0</Speed>
-
 			</Run>
 		</Move>
 	</Actions>
-	
 </Entity>
\ No newline at end of file
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 2a97d60b23..4a1d927710 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
@@ -2,23 +2,17 @@
 
 <Entity	Parent="template_unit_support">
 	<Traits>
-	
 		<Id>
 			<Generic>Female Citizen</Generic>
-
 			<Icon_Cell>32</Icon_Cell>
-
 			<Classes>Worker, Foot</Classes>
-
 			<Rollover>Women in the ancient world took on a variety of roles - from leadership (Celts) to servant (Greeks). Women are hard workers, the economic backbone of any civilisation. In history, it was typical when all the males (capable of fighting) were killed for the females, children, and elderly to be sold as slaves.</Rollover>
-		
 		</Id>
 		<Creation>
 			<Resource>
  				<Food>50</Food>
  			</Resource>
 		</Creation>
-
 		<Auras>
 			<Infidelity>
 				<Radius>10</Radius>
@@ -41,20 +35,15 @@
 			<Pierce>1.0</Pierce>
 			<Crush>2.0</Crush>
 		</Armour>
-
 		<Health>
 			<Max>70</Max>
 			<RegenRate>0.4</RegenRate>
 		</Health>	
-	
-	<Vision>
+		<Vision>
 			<Los>11</Los>
 		</Vision>
-	
 	</Traits>
-
 	<Actions>
-	
 		<Create>
 			<List>
 				<StructCiv>
@@ -68,7 +57,6 @@
 				</StructCiv>
 			</List>
 		</Create>	
-
 		<Gather>
 			<Resource>
 				<Food>
@@ -84,17 +72,14 @@
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
 		</Gather>
-
 		<Repair>
 			<Rate>0.5</Rate>
 			<Speed>1000</Speed>
 		</Repair>
-		
 		<Build>
 			<Rate>1.0</Rate>
 			<Speed>1000</Speed>
 		</Build>
-
 		<Move>
 			<Speed>5.0</Speed>
 			<TurningRadius>0.8</TurningRadius>
@@ -104,9 +89,7 @@
 				<RangeMin>0.0</RangeMin>
 			</Run>
 		</Move>
-	
 	</Actions>	
-	
 	<SoundGroups>
 		<Melee>audio/attack/weapon/sword.xml</Melee>
 		<Death>audio/actor/human/death/death.xml</Death>
@@ -117,8 +100,6 @@
 		<Gather_Stone>audio/resource/mining/pickaxe.xml</Gather_Stone>
 		<Gather_Metal>audio/resource/mining/mining.xml</Gather_Metal>
 	</SoundGroups>	
-	
 	<Script File="scripts/entity_functions.js" />
 	<Event On="StartConstruction" Function="entityStartConstruction" />
-	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_a.xml b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_a.xml
index e8210fc21b..9b4cf58945 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_a.xml
@@ -1,23 +1,45 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_javelinist_b"
->
-
+<Entity	Parent="celt_cavalry_javelinist_b">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>7</Icon_Cell>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_cavalry_javelinist_e</Entity>
-			
 		</Promotion>
-		
+		<Loot>
+			<Food>10</Food>
+			<Wood>4</Wood>
+			<Metal>2</Metal>
+		</Loot>			
+		<Stamina>
+			<Max>825.0</Max>
+		</Stamina>	
+		<Vision>
+			<Los>14.0</Los>
+		</Vision>
+		<Armour>
+			<Hack>2.2</Hack>
+			<Pierce>4.2</Pierce>
+			<Crush>8.2</Crush>
+		</Armour>
 	</Traits>
+	<Actions>
+		<Attack>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>32.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<Range>40.0</Range>
+			</Ranged>
+ 		</Attack>
+ 		<Move>
+			<Speed>11.2</Speed>
+			<Run>
+				<Speed>22.9</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_javelinist_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_b.xml b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_b.xml
index 5931041e7c..7ec19e3c9d 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_b.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_ranged_javelinist"
->
+<Entity	Parent="template_unit_cavalry_ranged_javelinist">
 	<Traits>
-	
 		<Id>
-
-			<Specific>March Milwr</Specific>
-
+			<Specific>Baguada</Specific>
 			<Civ>Celts</Civ>
-
 			<History>The Celts were extremely proficient horsemen and created excellent tack for their mounts. This included an early form of saddle with horns at each corner, giving them a huge edge in terms or control over their counterparts. Since the cavalry was made up of rich nobles armor and fine weapons were in great supply, making them formidable opponents.</History>
-
 		</Id>
-		
+		<Creation>			
+			<Time>15</Time>
+		</Creation>
 		<Promotion>
-				
 			<Entity>celt_cavalry_javelinist_a</Entity>
-			
 		</Promotion>
-		
 	</Traits>
-
+	<Actions>
+ 		<Move>
+			<Speed>11.0</Speed>
+			<Run>
+				<Speed>22.8</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_javelinist_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_e.xml b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_e.xml
index 41da01d973..e86bb029cc 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_javelinist_e.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_javelinist_a"
->
-
+<Entity	Parent="celt_cavalry_javelinist_a">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>8</Icon_Cell>
-		
 		</Id>
-		
+		<Loot>
+			<Food>10.5</Food>
+			<Wood>4.5</Wood>
+			<Metal>3</Metal>
+		</Loot>			
+		<Stamina>
+			<Max>850.0</Max>
+		</Stamina>	
+		<Vision>
+			<Los>15.0</Los>
+		</Vision>
+		<Armour>
+			<Hack>2.4</Hack>
+			<Pierce>4.4</Pierce>
+			<Crush>8.4</Crush>
+		</Armour>
 	</Traits>
+	<Actions>
+		<Attack>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>34.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<Range>40.0</Range>
+			</Ranged>
+ 		</Attack>
+ 		<Move>
+			<Speed>11.3</Speed>
+			<Run>
+				<Speed>23.1</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_javelinist_e.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
index 22bde9c1eb..17296113a4 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
@@ -1,23 +1,53 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_spearman_b"
->
-
+<Entity	Parent="celt_cavalry_spearman_b">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>16</Icon_Cell>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_cavalry_spearman_e</Entity>
-			
 		</Promotion>
-		
+		<Armour>
+			<Hack>3.2</Hack>
+			<Pierce>10.2</Pierce>
+			<Crush>12.2</Crush>
+		</Armour>
+		<Stamina>
+			<Max>825.0</Max>
+		</Stamina>
+		<Loot>
+			<Food>14</Food>
+			<Wood>4.5</Wood>
+			<Metal>2</Metal>
+		</Loot>		
+		<Health>
+			<Max>163</Max>
+		</Health>
+		<Vision>
+			<Los>16</Los>
+		</Vision>
 	</Traits>
+		<Actions>
+		<Move>
+			<Speed>6.05</Speed>
+			<Run>
+				<Speed>28.9</Speed>
+			</Run>
+		</Move>
+		<Attack>
+			<Melee>
+ 				<Hack>16.0</Hack>
+ 				<Pierce>6.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<Range>3.6</Range>
+			<Charge>
+				<Hack>46.0</Hack>
+				<Pierce>16.0</Pierce>
+				<Range>3.6</Range>
+			</Charge>		
+			</Melee>
+ 		</Attack>
+	</Actions>
 	<Actor>units/celts/cavalry_spearman_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
index 0ba7081d54..66fade1a36 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_melee_spearman"
->
+<Entity	Parent="template_unit_cavalry_melee_spearman">
 	<Traits>
-	
 		<Id>
-
-			<Specific>Castog</Specific>
-
+			<Specific>Coun</Specific>
 			<Civ>Celts</Civ>
-
 			<History>The Celts used large dogs such as mastiffs or wolfhounds in combat, especially against enemy cavalry. The Romans were very impressed with the strength and ferocity of these dogs. Many were brought back to Rome for the gladiator arena or to serve as guard dogs.</History>
-		
 		</Id>
-		
+		<Creation>		
+			<Time>15</Time>
+		</Creation>
 		<Promotion>
-				
 			<Entity>celt_cavalry_spearman_a</Entity>
-			
 		</Promotion>
-		
 	</Traits>
-
+	<Actions>
+		<Move>
+			<Speed>5.65</Speed>
+			<Run>
+				<Speed>28.7</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_spearman_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
index 74790d0ce5..c7d5f57d5e 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
@@ -1,17 +1,50 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_spearman_a"
->
-
+<Entity	Parent="celt_cavalry_spearman_a">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>17</Icon_Cell>
-		
 		</Id>
-		
+		<Armour>
+			<Hack>3.4</Hack>
+			<Pierce>10.4</Pierce>
+			<Crush>12.4</Crush>
+		</Armour>
+		<Stamina>
+			<Max>850.0</Max>
+		</Stamina>
+		<Loot>
+			<Food>14.5</Food>
+			<Wood>5</Wood>
+			<Metal>3</Metal>
+		</Loot>		
+		<Health>
+			<Max>165</Max>
+		</Health>
+		<Vision>
+			<Los>17</Los>
+		</Vision>
 	</Traits>
+		<Actions>
+		<Move>
+			<Speed>6.15</Speed>
+			<Run>
+				<Speed>29.1</Speed>
+			</Run>
+		</Move>
+		<Attack>
+			<Melee>
+ 				<Hack>17.0</Hack>
+ 				<Pierce>7.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<Range>3.6</Range>
+			<Charge>
+				<Hack>47.0</Hack>
+				<Pierce>17.0</Pierce>
+				<Range>3.6</Range>
+			</Charge>		
+			</Melee>
+ 		</Attack>
+	</Actions>
 	<Actor>units/celts/cavalry_spearman_e.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_a.xml b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_a.xml
index f4357d243a..d15c9cec79 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_a.xml
@@ -1,23 +1,48 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_swordsman_b"
->
-
+<Entity	Parent="celt_cavalry_swordsman_b">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>19</Icon_Cell>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_cavalry_swordsman_e</Entity>
-			
 		</Promotion>
-		
+		<Armour>
+			<Hack>3.2</Hack>
+			<Pierce>10.2</Pierce>
+			<Crush>12.2</Crush>
+		</Armour>
+		<Health>
+			<Max>163</Max>
+		</Health>
+		<Stamina>
+			<Max>825.0</Max>
+		</Stamina>
+		<Loot>
+			<Food>14</Food>
+			<Wood>4.5</Wood>
+			<Metal>2</Metal>
+		</Loot>		
+		<Vision>
+			<Los>16</Los>
+		</Vision>
 	</Traits>
+	<Actions>
+ 		<Attack>
+			<Melee>
+ 				<Hack>19.0</Hack>
+			</Melee>
+			<Charge>
+				<Hack>53.0</Hack>
+			</Charge>		
+ 		</Attack>
+		<Move>
+			<Speed>10.2</Speed>
+			<Run>
+				<Speed>19.9</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_swordsman_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_b.xml b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_b.xml
index 262f8acdc3..7f0c4e0049 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_b.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_melee_swordsman"
->
+<Entity	Parent="template_unit_cavalry_melee_swordsman">
 	<Traits>
-	
 		<Id>
-
-			<Specific>Marchog</Specific>
-
+			<Specific>Epos</Specific>
 			<Civ>Celts</Civ>
-
 			<History>Like a sword, a horse was a sign of nobility and as a result the Celtic cavalry was often better equipped than the infantry. Armor and helmets were common, while weapons consisted of a large bladed spear and a long slashing sword for close combat. Shields could be round, hexagonal, or oval, but the most common was a regular oval body shield with the top and bottom shorn off. Unlike other horseman, the Celts were not afraid to leap off their mount to fight on foot then climb into the saddle again when possible.</History>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_cavalry_swordsman_a</Entity>
-			
 		</Promotion>
-		
+		<Creation>
+			<Time>15</Time>
+		</Creation>
 	</Traits>
-
+	<Actions>
+ 		<Move>
+			<Speed>10.0</Speed>
+			<Run>
+				<Speed>19.8</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_swordsman_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_e.xml b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_e.xml
index 27bfd8bbeb..6c546c2423 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_swordsman_e.xml
@@ -1,17 +1,45 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_cavalry_swordsman_a"
->
-
+<Entity	Parent="celt_cavalry_swordsman_a">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>20</Icon_Cell>
-		
 		</Id>
-		
+			<Armour>
+			<Hack>3.4</Hack>
+			<Pierce>10.4</Pierce>
+			<Crush>12.4</Crush>
+		</Armour>
+		<Health>
+			<Max>165</Max>
+		</Health>
+		<Stamina>
+			<Max>850.0</Max>
+		</Stamina>
+		<Loot>
+			<Food>14.5</Food>
+			<Wood>5</Wood>
+			<Metal>2</Metal>
+		</Loot>		
+		<Vision>
+			<Los>17</Los>
+		</Vision>
 	</Traits>
+	<Actions>
+ 		<Attack>
+			<Melee>
+ 				<Hack>21.0</Hack>
+			</Melee>
+			<Charge>
+				<Hack>55.0</Hack>
+			</Charge>		
+ 		</Attack>
+		<Move>
+			<Speed>10.3</Speed>
+			<Run>
+				<Speed>20.1</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/cavalry_swordsman_e.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_hero_boudicca.xml b/binaries/data/mods/official/entities/units/celt_hero_boudicca.xml
index 01269fcb79..c859a17f46 100644
--- a/binaries/data/mods/official/entities/units/celt_hero_boudicca.xml
+++ b/binaries/data/mods/official/entities/units/celt_hero_boudicca.xml
@@ -1,32 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_hero"
->
+<Entity	Parent="template_unit_hero">
 	<Traits>
-	
 		<Id>
-		
 			<Specific>Boudicca</Specific>
-
 			<Civ>Celts</Civ>
-
 			<History>Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colours over which a thick cloak was fastened by a brooch.</History>
-		
 		</Id>
-
 		<Population>
 			<Rem>4</Rem>
 		</Population>
-		
 	 	<Footprint>
  			<Width>4.0</Width>
  			<Depth>8.0</Depth>
  			<Height>5.0</Height>
  		</Footprint>
-		
 	</Traits>
-
 	<Actor>units/celts/boudicca_chariot.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_a.xml b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_a.xml
index 08880ee533..be55d5d426 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_a.xml
@@ -1,23 +1,52 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_infantry_javelinist_b"
->
-
+<Entity	Parent="celt_infantry_javelinist_b">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>22</Icon_Cell>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_infantry_javelinist_e</Entity>
-			
 		</Promotion>
-		
+		<Health>
+			<Max>83</Max>
+		</Health>
+		<Armour>
+			<Hack>1.2</Hack>
+			<Pierce>5.2</Pierce>
+			<Crush>2.2</Crush>
+		</Armour>
+		<Loot>
+			<Food>1</Food>
+			<Wood>13</Wood>
+			<Stone>1</Stone>
+			<Metal>2</Metal>
+		</Loot>		
+		<Stamina>
+			<Max>525.0</Max>
+		</Stamina>		
+		<Vision>
+			<Los>13.0</Los>
+		</Vision>
 	</Traits>
+	<Actions>
+		<Attack>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>47.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<MinRange>16.0</MinRange>
+				<Range>32</Range>
+				<Speed>1510</Speed>
+				<ProjectileSpeed>32.0</ProjectileSpeed>
+			</Ranged>
+ 		</Attack>
+ 		<Move>
+			<Speed>9.2</Speed>
+			<Run>
+				<Speed>17.9</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_javelinist_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_b.xml b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_b.xml
index 739181c339..76c900f5cd 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_b.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_infantry_ranged_javelinist"
->
+<Entity	Parent="template_unit_infantry_ranged_javelinist">
 	<Traits>
-	
 		<Id>
-
-			<Specific>Gaesata</Specific>
-
+			<Specific>Baguada</Specific>
 			<Civ>Celts</Civ>
-
 			<History>Gesatae were young men who devoted themselves to war, often serving as mercenaries for other tribes. They were the last Celts to fight stark naked to show their courage, often carrying only a shield with several javelins and a regular Celtic spear. More often than not they were covered in geometric designs painted in woad, a blue dye.</History>
-
 		</Id>
-		
+		<Creation>		
+			<Time>15</Time>
+			<Resource>
+ 				<Wood>45</Wood>
+ 			</Resource>
+		</Creation>
 		<Promotion>
-				
 			<Entity>celt_infantry_javelinist_a</Entity>
-			
 		</Promotion>
-		
 	</Traits>
-
+	<Actions>
+ 		<Move>
+			<Speed>9.0</Speed>
+			<Run>
+				<Speed>17.8</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_javelinist_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_e.xml b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_e.xml
index 7433290747..c352a3fa94 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_javelinist_e.xml
@@ -1,17 +1,49 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_infantry_javelinist_a"
->
-
+<Entity	Parent="celt_infantry_javelinist_a">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>23</Icon_Cell>
-		
 		</Id>
-		
+			<Health>
+			<Max>85</Max>
+		</Health>
+		<Armour>
+			<Hack>1.4</Hack>
+			<Pierce>5.4</Pierce>
+			<Crush>2.4</Crush>
+		</Armour>
+		<Loot>
+			<Food>1</Food>
+			<Wood>13.5</Wood>
+			<Stone>1</Stone>
+			<Metal>3</Metal>
+		</Loot>		
+		<Stamina>
+			<Max>550.0</Max>
+		</Stamina>		
+		<Vision>
+			<Los>14.0</Los>
+		</Vision>
 	</Traits>
+	<Actions>
+		<Attack>
+			<Ranged>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>49.0</Pierce>
+ 				<Crush>0.0</Crush>
+				<MinRange>16.0</MinRange>
+				<Range>34</Range>
+				<Speed>1520</Speed>
+				<ProjectileSpeed>34.0</ProjectileSpeed>
+			</Ranged>
+ 		</Attack>
+ 		<Move>
+			<Speed>9.3</Speed>
+			<Run>
+				<Speed>18.0</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_javelinist_e.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_spearman_a.xml b/binaries/data/mods/official/entities/units/celt_infantry_spearman_a.xml
index ad5378ac7d..8184599732 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_spearman_a.xml
@@ -1,25 +1,45 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_infantry_spearman_b"
->
-
+<Entity	Parent="celt_infantry_spearman_b">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>4</Icon_Cell>
-		
 		</Id>
-		
 		<Promotion>
-				
 			<Entity>celt_infantry_spearman_e</Entity>
-			
 		</Promotion>
-		
+		<Armour>
+			<Hack>5.2</Hack>
+			<Pierce>3.2</Pierce>
+			<Crush>10.2</Crush>
+		</Armour>
+		<Health>
+			<Max>93</Max>
+		</Health>
+		<Stamina>
+			<Max>325.0</Max>
+		</Stamina>
+		<Vision>
+			<Los>14</Los>
+		</Vision>
 	</Traits>
-	
+	<Actions>
+	<Attack>
+			<Melee>
+ 				<Hack>16.0</Hack>
+ 				<Pierce>6.0</Pierce>
+			</Melee>
+			<Charge>
+				<Hack>33.0</Hack>
+				<Pierce>13.0</Pierce>
+			</Charge>		
+ 		</Attack>
+ 		<Move>
+			<Speed>7.2</Speed>
+			<Run>
+				<Speed>14.9</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_spearman_a.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml b/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
index 7cd10ec496..ff1510fc77 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
@@ -1,28 +1,50 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_infantry_melee_spearman"
->
+<Entity	Parent="template_unit_infantry_melee_spearman">
 	<Traits>
-	
 		<Id>
-		
-			<Specific>Shleiyder</Specific>
-
+			<Specific>Gaesata</Specific>
 			<Civ>Celts</Civ>
-
 			<History>The spear was the main weapon of the Celts, arming the bulk of their forces. The average Celt would only have to take up his long spear and body shield to be ready for battle. While armor was rare the rabid fighting spirit of the Celts more than made up for in vigor what was lost in protection.</History>
-		
 		</Id>
-		
+		<Creation>
+			<Time>15</Time>
+			<Resource>
+ 				<Wood>45</Wood>
+ 			</Resource>
+		</Creation>
 		<Promotion>
-				
 			<Entity>celt_infantry_spearman_a</Entity>
-			
 		</Promotion>
-		
+		<Armour>
+			<Hack>5.0</Hack>
+			<Pierce>3.0</Pierce>
+			<Crush>10.0</Crush>
+		</Armour>
+		<Health>
+			<Max>90</Max>
+		</Health>
+		<Stamina>
+			<Max>300.0</Max>
+		</Stamina>
+		<Vision>
+			<Los>13</Los>
+		</Vision>
 	</Traits>
-
+	<Actions>
+	<Attack>
+			/* Charge power increased by 2 because of celts special speed */
+			<Charge>
+				<Hack>32.0</Hack>
+				<Pierce>12.0</Pierce>
+			</Charge>		
+ 		</Attack>
+ 		<Move>
+			<Speed>7.0</Speed>
+			<Run>
+				<Speed>14.8</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_spearman_b.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_spearman_e.xml b/binaries/data/mods/official/entities/units/celt_infantry_spearman_e.xml
index 609035b17f..77e9095934 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_spearman_e.xml
@@ -1,18 +1,42 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="celt_infantry_spearman_a"
->
+<Entity	Parent="celt_infantry_spearman_a">
 	<Traits>
-	
 		<Id>
-
 			<Icon_Cell>5</Icon_Cell>
-		
 		</Id>
-		
+		<Armour>
+			<Hack>5.4</Hack>
+			<Pierce>3.4</Pierce>
+			<Crush>10.4</Crush>
+		</Armour>
+		<Health>
+			<Max>95</Max>
+		</Health>
+		<Stamina>
+			<Max>350.0</Max>
+		</Stamina>
+		<Vision>
+			<Los>15</Los>
+		</Vision>
 	</Traits>
-
+	<Actions>
+	<Attack>
+			<Melee>
+ 				<Hack>17.0</Hack>
+ 				<Pierce>7.0</Pierce>
+			</Melee>
+			<Charge>
+				<Hack>34.0</Hack>
+				<Pierce>14.0</Pierce>
+			</Charge>		
+ 		</Attack>
+ 		<Move>
+			<Speed>7.3</Speed>
+			<Run>
+				<Speed>15.1</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/celts/infantry_spearman_e.xml</Actor>
-
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_support_female_citizen.xml b/binaries/data/mods/official/entities/units/celt_support_female_citizen.xml
index 9d139cd749..99b829073f 100644
--- a/binaries/data/mods/official/entities/units/celt_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/units/celt_support_female_citizen.xml
@@ -1,30 +1,91 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_support_female_citizen"
->
+<Entity	Parent="template_unit_support_female_citizen">
 	<Traits>
-	
 		<Id>
-		
 			<Internal_Only />
-
-			<Specific>Merch</Specific>
-
+			<Specific>Bodu</Specific>
 			<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>
+			<Infidelity>
+				<Radius>11</Radius>
+				<Time>8</Time>
+				<r>0.8</r>
+				<g>0.8</g>
+				<b>1.0</b>
+				<a>0.5</a>
+			</Infidelity>
+			<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>
-	        <Move>
-	                <Speed>5.0</Speed>
-	        </Move>
-	</Actions>
-
+		<Create>
+			<List>
+				<StructCiv>
+					<Civil_Centre />
+					<Farmstead />
+					<Field />
+					<House />
+					<Market />
+					<Mill />
+					<Temple />
+				</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>
+	</Actions>	
 	<Actor>units/celts/female_citizen.xml</Actor>
-
 </Entity>
\ No newline at end of file