Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
@@ -23,7 +23,7 @@
     <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Gymnasium</GenericName>
     <SpecificName>Gymnásion</SpecificName>
-    <Tooltip>Train champion units.</Tooltip>
+    <Tooltip>Train Champions.</Tooltip>
     <Icon>structures/gymnasion.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
@@ -24,7 +24,7 @@
     <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Council Chamber</GenericName>
     <SpecificName>Prytaneîon</SpecificName>
-    <Tooltip>Train heroes. Research special technologies.</Tooltip>
+    <Tooltip>Train Heroes and research technologies.</Tooltip>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -19,11 +19,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
   </ProductionQueue>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml
@@ -14,10 +14,10 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_elephant
       units/{civ}_hero_hamilcar
       units/{civ}_hero_hannibal
       units/{civ}_hero_maharbal
-      units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
@@ -12,7 +12,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Maqdaš</SpecificName>
-    <Tooltip>Train priestesses to heal your troops. Train Sacred Band pikemen. Garrison units to heal them at a quick rate.</Tooltip>
+    <Tooltip>Train Healers and Champions and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="17.0" depth="30.0"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
@@ -21,7 +21,7 @@
     <Civ>cart</Civ>
     <GenericName>Sacrificial Temple</GenericName>
     <SpecificName>Tophet</SpecificName>
-    <Tooltip>Train physicians and Sacred Band Cavalrymen.</Tooltip>
+    <Tooltip>Train Healers and Champion Cavalry and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
   </Identity>
   <Loot>
     <stone>20</stone>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -9,11 +9,11 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
-      units/{civ}_champion_cavalry
-      units/{civ}_champion_infantry
     </Entities>
   </ProductionQueue>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -19,11 +19,11 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -7,18 +7,17 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Teíchisma</SpecificName>
-    <Tooltip>Train Heroes and Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry_a
+      units/{civ}_champion_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
-      units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -3,16 +3,15 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Durg</SpecificName>
-    <Tooltip>Train Heroes and Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_hero_chanakya
-      units/{civ}_hero_maurya
-      units/{civ}_hero_ashoka
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
       units/{civ}_champion_chariot
+      units/{civ}_hero_chanakya
+      units/{civ}_hero_maurya
+      units/{civ}_hero_ashoka
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml
@@ -12,6 +12,7 @@
     <Classes datatype="tokens">ConquestCritical</Classes>
     <SpecificName>Harmya</SpecificName>
     <Icon>gaia/special_stoa.png</Icon>
+    <Tooltip>Train Female Citizens, Champions, and Heroes.</Tooltip>
   </Identity>
   <Loot>
     <wood>0</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
@@ -30,7 +30,7 @@
     <SpecificName>Apadāna</SpecificName>
     <Classes datatype="tokens">Apadana ConquestCritical Palace</Classes>
     <Icon>structures/palace.png</Icon>
-    <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Persian heroes and their "Immortals" bodyguards.</Tooltip>
+    <Tooltip>"Satrapy Tribute": Gain a trickle of food, wood, stone, and metal resources. Train Champions and Heroes.</Tooltip>
   </Identity>
   <Loot>
     <wood>0</wood>
@@ -43,10 +43,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
       units/{civ}_hero_cyrus
       units/{civ}_hero_darius
       units/{civ}_hero_xerxes
-      units/{civ}_champion_infantry
     </Entities>
     <Technologies datatype="tokens">
       persians/immortals
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml
@@ -29,7 +29,7 @@
     <GenericName>Gate of All Nations</GenericName>
     <SpecificName>Duvarθi Visadahyu</SpecificName>
     <Icon>structures/pers_hall.png</Icon>
-    <Tooltip>Train War Elephants and Kardakes mercenaries.</Tooltip>
+    <Tooltip>Train Champions.</Tooltip>
   </Identity>
   <Loot>
     <wood>0</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -6,11 +6,11 @@
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry
+      units/{civ}_champion_cavalry
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
-      units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
@@ -21,7 +21,7 @@
     <Classes datatype="tokens">ConquestCritical</Classes>
     <GenericName>Spartan Senate</GenericName>
     <SpecificName>Gerontía</SpecificName>
-    <Tooltip>Train heroes.</Tooltip>
+    <Tooltip>Train Heroes.</Tooltip>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
@@ -24,7 +24,7 @@
     <Classes datatype="tokens">ConquestCritical Syssiton</Classes>
     <GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssítion</SpecificName>
-    <Tooltip>Train Spartan heroes and Spartiate champion hoplites.</Tooltip>
+    <Tooltip>Train Champions and Heroes.</Tooltip>
     <Icon>structures/syssition.png</Icon>
   </Identity>
   <Loot>
@@ -38,10 +38,10 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
+      units/{civ}_champion_infantry_spear
       units/{civ}_hero_leonidas
       units/{civ}_hero_brasidas
       units/{civ}_hero_agis
-      units/{civ}_champion_infantry_spear
     </Entities>
     <Technologies datatype="tokens">
       hellenes/spartans_agoge
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -31,7 +31,7 @@
   </Health>
   <Identity>
     <GenericName>Temple</GenericName>
-    <Tooltip>Train healers. Garrison units to heal them at a quick rate (3 HP per second). Research healing and religious improvements.</Tooltip>
+    <Tooltip>Train Healers and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
     <VisibleClasses datatype="tokens">Town Temple</VisibleClasses>
     <Icon>structures/temple.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -74,7 +74,7 @@
     <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Train Heroes and Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>