diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_f_eagle_player.png b/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_f_eagle_player.png
new file mode 100644
index 0000000000..7caf72981d
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_f_eagle_player.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4d11ab4a958fcf81b9e671936e52d5c4f8d530732203ebc5c18b05ac0b023fa
+size 40143
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_g_eagle_player_silver.png b/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_g_eagle_player_silver.png
new file mode 100644
index 0000000000..d985b2158e
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_g_eagle_player_silver.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7931ef690fd52f7c1176b86e3ee903c79c1b8b0afb60026d348bb67c879d74f
+size 41663
diff --git a/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/sandbox-thebritons.png b/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/sandbox-thebritons.png
new file mode 100644
index 0000000000..4aab448d86
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/ui/session/icons/mappreview/sandbox-thebritons.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8028ed6ce6135b8a327205c0c6d3ecb698b0fc610703ca04a204e6ad838ab65d
+size 323557
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_ptolemies.png b/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_ptolemies.png
index 69b236be54..ad735e4eb4 100644
--- a/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_ptolemies.png
+++ b/binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_ptolemies.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4072553b60dd8350e187ad21b445689062b2aff7d91eb976b130bc2681f0125
-size 35338
+oid sha256:11b4c50464a30bfb9c085eac43b48f9fcb7fd2fa8bffe249a89609d150823d9d
+size 38261
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.pmp b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.pmp
index 9af82059d1..9d5c0bb666 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b45cef8992793116f02c87d8cf9fa9d7c59314bb927e8453750c7ae0d7ab9767
-size 369607
+oid sha256:11ddc381812b592e975c731675a3f51e14e585039ec1323cc14ffcb710d29f8a
+size 656896
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
index f8198aa255..38dc03d7bd 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c522561c6dbbfa9006375cbe435033ae7be568c1c99a565027901f62b4adc2f
-size 861349
+oid sha256:2d714974cb6310cc79d19bcf2b54b988e80b1c6470c480d1ea26a8ce3898fe22
+size 683219
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
index da5b463351..27ec4d4c06 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f69df3a90f8ddbf14fd29e5ba62ef23a24fb520288aa11c85154148b2c64db2b
-size 682334
+oid sha256:77bc080ed2d77bb383907f318d9197ba51106ee85c5a1628ee68b53a9b370c32
+size 683395
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.pmp b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.pmp
new file mode 100644
index 0000000000..816a8d335e
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de5b2fc0fd87132a1d984cce2b83b9e2eb11fb027efe0490a501fdb5064e378f
+size 657068
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
new file mode 100644
index 0000000000..5038b2a229
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9851169efada8c782deeac29460596b0e9d83cbd2028299960fd8f76204665de
+size 313149
diff --git a/binaries/data/mods/public/simulation/templates/special/player.xml b/binaries/data/mods/public/simulation/templates/special/player.xml
index 90b3898127..843254db30 100644
--- a/binaries/data/mods/public/simulation/templates/special/player.xml
+++ b/binaries/data/mods/public/simulation/templates/special/player.xml
@@ -15,6 +15,8 @@
 	  <Theater>1</Theater>
 	  <Council>1</Council>
 	  <Library>1</Library>
+	  <Field>0</Field>
+	  <Lighthouse>1</Lighthouse>
     </Limits>
   </EntityLimits>
   <Player/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
new file mode 100644
index 0000000000..73e6182d14
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <Cost>
+    <BuildTime>100</BuildTime>
+    <PopulationBonus>2</PopulationBonus>
+    <Resources>
+      <food>0</food>
+      <wood>200</wood>
+      <stone>100</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Circle radius="9.0"/>
+    <Height>6.0</Height>
+  </Footprint>
+  <GarrisonHolder disable=""/>
+  <Identity>
+    <Civ>Brit</Civ>
+    <GenericName>Rotary Mill</GenericName>
+    <SpecificName>Melonas</SpecificName>
+    <Tooltip>Increase nearby farming output +25%. (Currently, a special technology can be researched to serve this function)</Tooltip>
+    <History>The Celts developed the first rotary flour mill.</History>
+    <Icon>structures/sb1.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="16.0" depth="16.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.8</BatchTimeModifier>
+    <Technologies datatype="tokens">
+      celts/special_gather_crop_rotation
+    </Technologies>
+  </ProductionQueue>
+  <RallyPoint disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_ffactri.xml</select>
+      <constructed>interface/complete/building/complete_ffactri.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>8.0</HeightOffset>
+  </StatusBars>
+  <TerritoryInfluence>
+    <Radius>32</Radius>
+  </TerritoryInfluence>
+  <VisualActor>
+    <Actor>structures/celts/special.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
new file mode 100644
index 0000000000..b5baf17b81
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Auras>
+    <Heal>
+      <Radius>30</Radius>
+      <Speed>1000</Speed>
+    </Heal>
+  </Auras>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>100</wood>
+      <stone>100</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="18.0" depth="18.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <Max>1500</Max>
+    <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>celt</Civ>
+    <GenericName>Tavern</GenericName>
+    <SpecificName>Taberna</SpecificName>
+    <History>Taverns are where Celtic warriors go for a tall glass of mead after a hard-won battle. Some might even find rest in one of the back rooms for rent in this seedy establishment.</History>
+    <Tooltip>Add +10 to Population Cap. Recruit Naked Fanatics.</Tooltip>
+    <Icon>structures/celtic_embassy.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="17.0" depth="17.0"/>
+  </Obstruction>
+  <RallyPoint/>
+  <TerritoryDecay disable=""/>
+  <TerritoryInfluence>
+    <Radius>32</Radius>
+    <Weight>65536</Weight>
+  </TerritoryInfluence>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/gaul_champion_fanatic
+    </Entities>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_broch.xml</select>
+      <constructed>interface/complete/building/complete_broch.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>structures/celts/tavern.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
index 29c023e8f1..87ec43e812 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
@@ -6,10 +6,6 @@
       <stone>200</stone>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
@@ -17,6 +13,7 @@
     <Civ>ptol</Civ>
     <SpecificName>?</SpecificName>
     <History>?</History>
+    <Tooltip>Train Egyptian and Middle-Eastern citizen-soldiers. Research training improvements. Garrison: 10.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
@@ -34,7 +31,6 @@
     </Technologies>
   </ProductionQueue>
   <VisualActor>
-    <Actor>structures/macedonians/barracks.xml</Actor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+    <Actor>structures/persians/barracks.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_corral.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_corral.xml
index 435fad195c..804246f8f6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_corral.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_corral.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_corral">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="17.0" depth="17.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
+    <Max>400</Max>
     <SpawnEntityOnDeath>rubble/rubble_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
index 1e4c9da1c8..883646a0c3 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_farmstead.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="20.0" depth="15.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
+    <Max>400</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
index 629dda35bb..94bd1208ae 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
@@ -6,12 +6,24 @@
       <wood>0</wood>
     </Resources>
   </Cost>
+  <Footprint>
+    <Square width="12.0" depth="12.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <Max>500</Max>
+    <SpawnEntityOnDeath>rubble/rubble_stone_2x2</SpawnEntityOnDeath>
+  </Health>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>?</SpecificName>
     <History>Since they are made of mud brick, Egyptian houses are free of cost, but are very weak.</History>
   </Identity>
+  <Obstruction>
+    <Static width="10.0" depth="10.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/iberians/house.xml</Actor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
index c7b6f240ca..6fe9c860f1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml
@@ -16,7 +16,8 @@
     <Civ>ptol</Civ>
     <GenericName>Lighthouse</GenericName>
     <SpecificName>Pharos</SpecificName>
-    <Tooltip>Build along the shore to reveal the shorelines over the entire map.</Tooltip>
+    <Classes datatype="tokens">Lighthouse</Classes>
+    <Tooltip>Build along the shore to reveal the shorelines over the entire map (Not implemented). Very large vision range: 180 meters.</Tooltip>
     <History>The Ptolemaic dynasty in Egypt built the magnificent Lighthouse of Alexandria near the harbor mouth of that Nile Delta city. This structure could be seen for many kilometers out to sea and was one of the Seven Wonders of the World.</History>
     <Icon>structures/library_scroll.png</Icon>
   </Identity>
@@ -39,11 +40,15 @@
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
+  <TerritoryDecay disable=""/>
   <TerritoryInfluence>
-    <Radius>50</Radius>
+    <Radius>0</Radius>
   </TerritoryInfluence>
+  <Vision>
+    <Range>180</Range>
+  </Vision>
   <VisualActor>
     <Actor>structures/macedonians/library.xml</Actor>
-    <FoundationActor>structures/fndn_4x6.xml</FoundationActor>
+    <FoundationActor>structures/fndn_4x4_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_military_settlement.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_military_settlement.xml
index 2d4f84674d..157d4f86b1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_military_settlement.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_military_settlement.xml
@@ -2,6 +2,10 @@
 <Entity parent="template_structure_military_barracks">
   <BuildRestrictions>
     <Territory>own neutral</Territory>
+    <Distance>
+      <FromClass>MilitarySettlement</FromClass>
+      <MinDistance>80</MinDistance>
+    </Distance>
   </BuildRestrictions>
   <Cost>
     <Resources>
@@ -20,8 +24,9 @@
     <Civ>ptol</Civ>
     <GenericName>Military Settlement</GenericName>
 	<SpecificName>Klēroukhia</SpecificName>
-    <Classes datatype="tokens">Town</Classes>
+    <Classes datatype="tokens">Town MilitarySettlement</Classes>
     <History>The Ptolemies invited Greeks and Galatians (Gauls) alike to settle in Egypt within military settlements called cleruchies (klēroukhia). Under this arrangement, the settlers were given a plot of land, or a kleros, and in return were required to serve in the pharaoh's army when called to duty. This created a upper-middle class of military settlers who owed their livelihoods and fortunes to the pharaoh and helped grow the available manpower for the Egyptian army. A side effect of this system was that it drained the Greek homeland of military-aged men, a contributing factor to Greece's inevitable conquest by Rome.</History>
+    <Tooltip>Train Galatian and Hellenic settler-soldiers. Research training improvements. Garrison: 10. Can be built in Neutral territory. Min. distance from other Military Settlements: 80 meters.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_storehouse.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_storehouse.xml
index 92f37c06ac..ca8c5fe0df 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_storehouse.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_storehouse.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
+  <Cost>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>400</Max>
+  </Health>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>?</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index 8c29c386ff..17983aa9bb 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -35,6 +35,9 @@
       <metal>500</metal>
     </Resources>
   </Cost>
+  <EntityLimitsChanger>
+    <Field>2</Field>
+  </EntityLimitsChanger>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
index bc59715de7..24c7a33a3a 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -9,6 +9,9 @@
       <wood>100</wood>
     </Resources>
   </Cost>
+  <EntityLimitsChanger>
+    <Field>8</Field>
+  </EntityLimitsChanger>
   <Footprint>
     <Square width="14.0" depth="14.0"/>
     <Height>8.0</Height>
@@ -19,7 +22,7 @@
   </Health>
   <Identity>
     <GenericName>Farmstead</GenericName>
-    <Tooltip>Dropsite for the food resource. Research food gathering improvements.</Tooltip>
+    <Tooltip>Dropsite for the food resource. Research food gathering improvements. Unlocks 10 farm fields per Farmstead built.</Tooltip>
     <Classes datatype="tokens">Village -ConquestCritical DropsiteFood Farmstead</Classes>
     <Icon>structures/farmstead.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
index c9cdee1836..6c42ec84a2 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
@@ -23,7 +23,8 @@
   <Identity>
     <GenericName>Field</GenericName>
 	<Classes datatype="tokens">Field</Classes>
-    <Tooltip>Harvest vegetables for food. Max gatherers: 5.</Tooltip>
+    <Tooltip>Harvest vegetables for food. Max gatherers: 5. 
+Requires: Farmstead.</Tooltip>
     <History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societies - when farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
     <Icon>structures/field.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
index dc90d73bb4..3bc7fad673 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
@@ -23,7 +23,7 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.5</GarrisonArrowMultiplier>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Catapult</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
@@ -51,7 +51,8 @@
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Heavy Warship. Garrison with siege catapults to increase fire power.</Tooltip>
+    <Tooltip>Classes: Heavy Warship.
+Garrison with siege catapults to increase fire power.</Tooltip>
     <Classes datatype="tokens">Warship</Classes>
 	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
index e01c88b918..8dec8c4ec3 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml
@@ -3,6 +3,7 @@
   <Builder>
     <Entities datatype="tokens">
       structures/brit_kennel
+      structures/brit_rotarymill
       structures/{civ}_wonder
 	</Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
index 5c976ea13a..c41c767140 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_slinger_b.xml
@@ -3,6 +3,7 @@
   <Builder>
     <Entities datatype="tokens">
       structures/brit_kennel
+      structures/brit_rotarymill
       structures/{civ}_wonder
     </Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
index 1c9827cc6a..74e1919d83 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_infantry_spearman_b.xml
@@ -6,6 +6,7 @@
   <Builder>
     <Entities datatype="tokens">
       structures/brit_kennel
+      structures/brit_rotarymill
       structures/{civ}_wonder
 	</Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
new file mode 100644
index 0000000000..1e5d5fded6
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman">
+  <Armour>
+    <Hack>1</Hack>
+    <Pierce>2</Pierce>
+  </Armour>
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal>80</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>gaul</Civ>
+    <GenericName>Naked Fanatic</GenericName>
+    <SpecificName>Gaesata</SpecificName>
+    <History>A fanatic Celtic warrior, devoted to war and his Celtic liege lord. These bloodthirsty young men roamed Gaul in search of battle.</History>
+    <Icon>units/celt_fanatic.png</Icon>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed>11.0</WalkSpeed>
+    <Run>
+      <Speed>22.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/celts/fanatic.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml
index 572375ed4e..9589b29a40 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_javelinist_b.xml
@@ -5,6 +5,7 @@
   </Armour>
   <Builder>
     <Entities datatype="tokens">
+      structures/gaul_tavern
       structures/gaul_rotarymill
 	</Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
index 25fa55e4f7..9606449da6 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml
@@ -5,6 +5,7 @@
   </Armour>
   <Builder>
     <Entities datatype="tokens">
+      structures/gaul_tavern
       structures/gaul_rotarymill
     </Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml
index 07fc59f930..b772e42b62 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_spearman_b.xml
@@ -5,6 +5,7 @@
   </Armour>
   <Builder>
     <Entities datatype="tokens">
+      structures/gaul_tavern
       structures/gaul_rotarymill
 	</Entities>
   </Builder>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
index f63958c654..1c2fabedcc 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship_quinquereme">
+  <Cost>
+    <Population>8</Population>
+    <BuildTime>60</BuildTime>
+    <Resources>
+      <wood>300</wood>
+      <metal>300</metal>
+    </Resources>
+  </Cost>
+  <GarrisonHolder>
+    <Max>100</Max>
+  </GarrisonHolder>
+  <Health>
+    <Max>4000</Max>
+  </Health>
   <Identity>
     <Civ>ptol</Civ>
 	<GenericName>Juggernaut Warship</GenericName>
     <SpecificName>Tessarakontḗrēs</SpecificName>
+    <Classes datatype="tokens">Juggernaut</Classes>
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
index 1061cc8afe..1a9cb1e8ba 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
@@ -26,6 +26,12 @@
   <Stamina>
     <Max>700</Max>
   </Stamina>
+  <UnitMotion>
+    <WalkSpeed>9.5</WalkSpeed>
+    <Run>
+      <Speed>19.0</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/macedonians/infantry_archer_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
index 140e0db081..d1811e4241 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -9,23 +9,38 @@
     </Entities>
   </Builder>
   <Cost>
+    <BuildTime>5</BuildTime>
     <Resources>
       <food>0</food>
       <metal>50</metal>
     </Resources>
   </Cost>
+  <Health>
+    <RegenRate>-0.5</RegenRate>
+  </Health>
   <Identity>
     <Civ>ptol</Civ>
+    <Classes datatype="tokens">Mercenary</Classes>
 	<SelectionGroupName>units/ptol_infantry_archer_b</SelectionGroupName>
     <GenericName>Nubian Mercenary Archer</GenericName>
     <SpecificName>?</SpecificName>
     <History>?</History>
+    <Tooltip>Classes: Ranged Mercenary Infantry Archer.
+Counters: 2x vs. Swordsmen, 1.25x vs. Cavalry Spearmen.
+Countered by: Cavalry Swordsmen, Cavalry Skirmishers.
+Constantly loses health.</Tooltip>
     <Icon>units/hele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_archer_a</Entity>
   </Promotion>
+  <UnitMotion>
+    <WalkSpeed>10.0</WalkSpeed>
+    <Run>
+      <Speed>20.0</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/macedonians/infantry_archer_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
index 1757aa2582..8416a2628f 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
@@ -25,9 +25,9 @@
     <Max>690</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>6.7</WalkSpeed>
+    <WalkSpeed>9</WalkSpeed>
     <Run>
-      <Speed>16.75</Speed>
+      <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
index 6a4b687524..94b7fd0afe 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
@@ -9,7 +9,7 @@
     </Entities>
   </Builder>
   <Identity>
-    <Civ>mace</Civ>
+    <Civ>ptol</Civ>
     <SelectionGroupName>units/mace_infantry_slinger_b</SelectionGroupName>
     <GenericName>Judean Slinger</GenericName>
     <SpecificName>?</SpecificName>