Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -65,7 +65,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/data/civs/kush.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/kush.json
+++ binaries/data/mods/public/simulation/data/civs/kush.json
@@ -81,6 +81,7 @@
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/kush/infantry_archer_b",
+		"skirmish/units/special_starting_unit": "units/kush/support_healer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
+++ binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json
@@ -2,7 +2,12 @@
 	"genericName": "Wooden Construction",
 	"autoResearch": true,
 	"description": "Celtic structures were mostly made of wood with rubble foundations.",
-	"requirements": { "any": [{ "civ": "brit" }, { "civ": "gaul" }] },
+	"requirements": {
+		"any": [
+			{ "civ": "brit" },
+			{ "civ": "gaul" }
+		]
+	},
 	"icon": "wooden_buildings.png",
 	"tooltip": "Briton and Gaulish Structures −20% build time, −20% health, and −20% capture points.",
 	"modifications": [
Index: binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json
+++ binaries/data/mods/public/simulation/data/technologies/soldier_ranged_experience.json
@@ -1,5 +1,6 @@
 {
 	"autoResearch": true,
+	"icon": "arrow.png",
 	"tooltip": "Ranged Soldiers +25% promotion experience.",
 	"modifications": [
 		{ "value": "Promotion/RequiredXp", "multiply": 1.25 }
Index: binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
+++ binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
@@ -1,5 +1,6 @@
 {
 	"autoResearch": true,
+	"icon": "armor_elephant.png",
 	"tooltip": "African Elephants −10% resource costs, training time, health, attack damage, and loot.",
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 },
Index: binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
+++ binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
@@ -1,5 +1,6 @@
 {
 	"autoResearch": true,
+	"icon": "armor_elephant.png",
 	"tooltip": "Indian Elephants +10% resource costs, training time, health, attack damage, and loot.",
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
Index: binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
+++ binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
@@ -1,5 +1,6 @@
 {
 	"autoResearch": true,
+	"icon": "coins.png",
 	"tooltip": "Non-Champion Mercenaries cost −25 food, +25 metal.",
 	"modifications": [
 		{ "value": "Cost/Resources/food", "add": -25 },
Index: binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen/fortress.xml
@@ -7,7 +7,6 @@
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
@@ -10,6 +10,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Dunon</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/fortress.xml
@@ -7,6 +7,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ḥamet</SpecificName>
+    <Tooltip>Territory root. Train Champion Elephants and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="26.0" depth="28.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Population>
     <Bonus>12</Bonus>
Index: binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
@@ -12,6 +12,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Castro</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Loot>
     <stone>240</stone>
Index: binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/ishtar_gate.xml
@@ -22,9 +22,8 @@
     <Max>2000</Max>
   </Health>
   <Identity>
-    <Civ>pers</Civ>
     <GenericName>Ishtar Gate of Babylon</GenericName>
-    <VisibleClasses datatype="tokens">IshtarGate</VisibleClasses>
+    <Tooltip>Territory root.</Tooltip>
     <Icon>structures/pers_gate.png</Icon>
   </Identity>
   <Loot>
@@ -56,6 +55,6 @@
   </Vision>
   <VisualActor>
     <Actor>special/pers_ishtar_gate.xml</Actor>
-    <FoundationActor>structures/fndn_9x3_wall.xml</FoundationActor>
+    <FoundationActor>structures/fndn_9x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
@@ -7,6 +7,7 @@
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Htm</SpecificName>
+    <Tooltip>Territory root. Train Champions and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
@@ -7,6 +7,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Phrourion</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Durg</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
@@ -3,7 +3,6 @@
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
-    <Tooltip>Research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/ishtar_gate.xml
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Auras datatype="tokens">
-    structures/loyalty_regen
-  </Auras>
-  <Capturable disable=""/>
-  <Cost>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <stone>250</stone>
-      <metal>500</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="40.0" depth="17.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>10</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Ishtar Gate of Babylon</GenericName>
-    <VisibleClasses datatype="tokens">IshtarGate</VisibleClasses>
-    <Icon>structures/pers_gate.png</Icon>
-  </Identity>
-  <Loot>
-    <stone>50</stone>
-    <metal>100</metal>
-  </Loot>
-  <Obstruction>
-    <Static disable=""/>
-    <Obstructions>
-      <Right width="11" depth="13" x="12.5" z="0"/>
-      <Left width="11" depth="13" x="-12.5" z="0"/>
-      <Door width="14" depth="13" x="0" z="0"/>
-    </Obstructions>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_broch.xml</select>
-      <constructed>interface/complete/building/complete_broch.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>38</Radius>
-    <Weight>40000</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <Actor>special/pers_ishtar_gate.xml</Actor>
-    <FoundationActor>structures/fndn_9x3_wall.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Champions. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
@@ -3,6 +3,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Castellum</SpecificName>
+    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_long.xml
@@ -101,5 +101,6 @@
   </Upgrade>
   <VisualActor>
     <Actor>structures/romans/siege_wall_long.xml</Actor>
+    <FoundationActor>structures/fndn_9x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_medium.xml
@@ -78,5 +78,6 @@
   </TurretHolder>
   <VisualActor>
     <Actor>structures/romans/siege_wall_medium.xml</Actor>
+    <FoundationActor>structures/fndn_6x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome/siege_wall_short.xml
@@ -54,6 +54,6 @@
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/romans/siege_wall_short.xml</Actor>
-    <FoundationActor>structures/fndn_1x1.xml</FoundationActor>
+    <FoundationActor>structures/fndn_3x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Champions. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart/fortress.xml
@@ -7,7 +7,6 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -67,7 +67,7 @@
   <Identity>
     <GenericName>Fortress</GenericName>
     <SelectionGroupName>template_structure_military_fortress</SelectionGroupName>
-    <Tooltip>Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">Defensive City Fortress</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
@@ -33,6 +33,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
@@ -27,6 +27,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
@@ -17,4 +17,9 @@
     <GenericName>Hero Cavalry Maceman</GenericName>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
   </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
@@ -25,4 +25,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
@@ -33,4 +33,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>