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/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>
@@ -14,12 +20,9 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_clubman_b
-      units/{civ}_infantry_merc_javelinist_b
+      units/{civ}_infantry_javelinist_merc_b
       units/{civ}_cavalry_javelinist_b
     </Entities>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/barracks.xml</Actor>
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_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
@@ -5,8 +5,8 @@
   </Armour>
   <Attack>
     <Melee>
-      <Hack>3.0</Hack>
-      <Crush>5.0</Crush>
+      <Hack>2.0</Hack>
+      <Crush>2.5</Crush>
     </Melee>
   </Attack>
   <Builder>
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>