Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Soldier", "Elephant"],
+	"affects": ["Champion"],
 	"modifications": [
 		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
@@ -12,6 +12,6 @@
 		{ "value": "Attack/Capture/Value", "add": 2 }
 	],
 	"auraName": "Warrior Queen",
-	"auraDescription": "+20% attack and +2 capture for soldiers and elephants.",
+	"auraDescription": "+20% attack and +2 capture for champion units and elephants.",
 	"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
 }
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_1.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_1.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_1.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["TempleOfAmun", "AmunGuard"],
+	"affects": ["AmunTemple", "AmunGuard"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 1.2 },
 		{ "value": "Cost/Resources/wood", "multiply": 1.2 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_2.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["TempleOfApedemak", "ApedemakGuard"],
+	"affects": ["ApedemakTemple", "ApedemakGuard"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.8 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.8 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
@@ -0,0 +1,19 @@
+{
+	"type": "range",
+	"radius": 60,
+	"affects": ["Soldier", "Elephant"],
+	"modifications": [
+		{ "value": "Looter/Resource/food", "multiply": 1.5 },
+		{ "value": "Looter/Resource/wood", "multiply": 1.5 },
+		{ "value": "Looter/Resource/stone", "multiply": 1.5 },
+		{ "value": "Looter/Resource/metal", "multiply": 1.5 },
+		{ "value": "Attack/Melee/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Crush", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Ranged/Crush", "multiply": 1.1 }
+	],
+	"auraName": "Saviour of Kush",
+	"auraDescription": "Own units +10% attack.\nNastasen acquired lots of bounty from the defeated invaders. Gain +50% loot from killing enemy units."
+}
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
@@ -0,0 +1,10 @@
+{
+	"type": "global",
+	"affects": ["KushTrireme"],
+	"modifications": [
+		{ "value": "Cost/Resources/wood", "add": -30 },
+		{ "value": "Cost/Resources/metal", "add": -30 }
+	],
+	"auraName": "Gift of Warships",
+	"auraDescription": "Train Ptolemaic Mercenary Triremes at -20% resource cost.\nCrushing the Ptolemaic invasion of Kush, Nastasen seized numerous enemy warships."
+}
Index: binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
+++ binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
@@ -1,5 +1,5 @@
 {
-	"genericName": "High Priest of Amun",
+	"genericName": "Divine Instruction",
 	"description": "Have your priests instructed by the High Priest himself - may Amun bless him.",
 	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 500 },
 	"requirements": {
Index: binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
@@ -3,6 +3,7 @@
   <Auras datatype="tokens">teambonuses/kush_player_team_bonus</Auras>
   <EntityLimits>
     <Limits>
+	  <AmunTemple>1</AmunTemple>
       <PyramidSmall>4</PyramidSmall>
       <PyramidLarge>2</PyramidLarge>
     </Limits>
Index: binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <stone>150</stone>
+    </Resources>
+  </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_temple">
+  <Footprint>
+    <Square width="24.0" depth="36.0"/>
+  </Footprint>
+  <Identity>
+    <Civ>kush</Civ>
+    <GenericName>Temple of Apedemak</GenericName>
+    <SpecificName>Pr-‘Iprmk</SpecificName>
+    <Tooltip>Train priests to heal your troops. Train Meroitic Temple Guards. Garrison units to heal them at a quick rate.</Tooltip>
+    <Classes datatype="tokens">ApedemakTemple</Classes>
+  </Identity>
+  <Obstruction>
+    <Static width="18" depth="30.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <Entities datatype="tokens">
+      units/{civ}_champion_infantry_apedemak
+    </Entities>
+  </ProductionQueue>
+  <VisualActor>
+    <Actor>structures/kushites/temple.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
+  <BuildRestrictions>
+    <Category>AmunTemple</Category>
+  </BuildRestrictions>
   <Auras datatype="tokens">
     structures/kush_temple_amun
   </Auras>
@@ -21,9 +24,11 @@
   </Health>
   <Identity>
     <Civ>kush</Civ>
-    <GenericName>Temple of Amun</GenericName>
+    <GenericName>Grand Temple of Amun</GenericName>
     <SpecificName>Pr-‘Imn</SpecificName>
-    <Classes datatype="tokens">TempleOfAmun</Classes>
+    <Tooltip>Train priests to heal your troops. Train Napatan Temple Guards and research unique technologies. Garrison units to heal them at a quick rate.</Tooltip>
+    <Icon>stuctures/temple_epic.png</Icon>
+    <Classes datatype="tokens">AmunTemple</Classes>
   </Identity>
   <Obstruction>
     <Static width="28" depth="56.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_temple">
-  <Footprint>
-    <Square width="24.0" depth="36.0"/>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>rubble/rubble_stone_4x6</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Temple of Apedemak</GenericName>
-    <SpecificName>Pr-‘Iprmk</SpecificName>
-    <Classes datatype="tokens">TempleOfApedemak</Classes>
-  </Identity>
-  <Obstruction>
-    <Static width="18" depth="30.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_apedemak
-    </Entities>
-    <Technologies datatype="tokens"/>
-  </ProductionQueue>
-  <VisualActor>
-    <Actor>structures/kushites/temple.xml</Actor>
-    <FoundationActor>structures/fndn_4x6.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Armour>
+    <Hack op="add">-1</Hack>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Bonuses>
+        <Bonus1>
+          <Classes>Champion</Classes>
+          <Multiplier>1.3</Multiplier>
+        </Bonus1>
+        <Bonus2>
+          <Classes>Hero</Classes>
+          <Multiplier>1.3</Multiplier>
+        </Bonus2>
+      </Bonuses>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ‘Iprmk</SpecificName>
+    <Tooltip>Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.</Tooltip>
     <VisibleClasses datatype="tokens">Axe</VisibleClasses>
     <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
@@ -9,7 +9,7 @@
     <Civ>kush</Civ>
     <GenericName>Arakamani</GenericName>
     <SpecificName>‘Irk.‘Imn</SpecificName>
-    <Icon>units/mace_hero_philip.png</Icon>
+    <Icon>units/hele_hero_alexander.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_elephantry_arakamani_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
   <Auras datatype="tokens">
-    units/heroes/kush_hero_nastasen
+    units/heroes/kush_hero_nastasen_1
+    units/heroes/kush_hero_nastasen_2
   </Auras>
   <Identity>
     <Civ>kush</Civ>
@@ -8,8 +9,7 @@
     <GenericName>Nastasen</GenericName>
     <SpecificName>Nastasen Ankhkhare</SpecificName>
     <Classes datatype="tokens">Nastasen</Classes>
-    <Icon>units/hele_hero_alexander.png</Icon>
-    <Tooltip>Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.</Tooltip>
+    <Icon>units/mace_hero_philip.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/hero_cavalry_spearman_nastasen_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
@@ -5,10 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -6,7 +6,7 @@
   <Attack>
     <Melee>
       <Hack>3.0</Hack>
-      <Crush>5.0</Crush>
+      <Crush>2.5</Crush>
     </Melee>
   </Attack>
   <Builder>
@@ -14,10 +14,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -5,10 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
@@ -5,10 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
@@ -8,10 +8,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
@@ -5,10 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_temple_apedemak
       structures/kush_blemmye_camp
       structures/kush_nuba_village
-      -structures/{civ}_temple
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -8,8 +8,9 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
-    <GenericName>Great Warship</GenericName>
+    <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ‘3</SpecificName>
+    <Classes datatype="tokens">KushTrireme</Classes>
     <Icon>units/ptol_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      -structures/{civ}_temple
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Shmt</SpecificName>