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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml	(revision 23082)
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <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>
     <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_ranged
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/athenians/gymnasion.xml</Actor>
     <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml	(revision 23082)
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Council</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="16.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <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>
     <wood>0</wood>
     <stone>25</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_themistocles
       units/{civ}_hero_pericles
       units/{civ}_hero_iphicrates
     </Entities>
     <Technologies datatype="tokens">
       hellenes/special_long_walls
       hellenes/special_iphicratean_reforms
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/athenians/prytaneion.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml	(revision 23082)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Cost>
     <PopulationBonus>12</PopulationBonus>
   </Cost>
   <Footprint replace="">
     <Circle radius="17.0"/>
     <Height>18.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Dunon</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </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>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/britons/fortress_briton.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>28</Length>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml	(revision 23082)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="30.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Blockhouse Fort</GenericName>
     <SpecificName>Ḥamet</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="26.0" depth="28.0"/>
   </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>
     <FoundationActor>structures/carthaginians/fndn_fortress.xml</FoundationActor>
     <Actor>structures/carthaginians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>25.0</Length>
     <Indent>6.4</Indent>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_temple.xml	(revision 23082)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Cost>
     <Resources>
       <stone>400</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="32.0"/>
     <Height>12.0</Height>
   </Footprint>
   <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"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/temple_big.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml	(revision 23082)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>200</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="24.0" depth="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <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>
     <metal>10</metal>
   </Loot>
   <Obstruction>
     <Static width="22.0" depth="24.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <TerritoryDecay disable=""/>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
     <Actor>structures/carthaginians/tophet.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml	(revision 23082)
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Cost>
     <PopulationBonus>12</PopulationBonus>
   </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
   </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>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/gauls/fortress_gallic.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>16.8</Length>
     <Indent>5.8</Indent>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml	(revision 23082)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Cost>
     <PopulationBonus>15</PopulationBonus>
     <BuildTime op="mul">1.5</BuildTime>
     <Resources>
       <stone>1200</stone>
     </Resources>
   </Cost>
   <Health>
     <Max>6000</Max>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Castro</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </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>
     <Actor>structures/iberians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.5</Length>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml	(revision 23082)
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="26.0" depth="28.0"/>
     <Height>8.0</Height>
   </Footprint>
   <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
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/fortress_up.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.0</Length>
     <Indent>7.6</Indent>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml	(revision 23082)
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <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
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryas/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>22.0</Length>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_palace.xml	(revision 23082)
@@ -1,42 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <PopulationBonus>10</PopulationBonus>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <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>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_female_citizen
       units/{civ}_champion_maiden_archer
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/mauryas/misc_structure_01.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml	(revision 23082)
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Apadana</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <PopulationBonus>10</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>300</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Throne Hall</GenericName>
     <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>
     <stone>75</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <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
     </Technologies>
   </ProductionQueue>
   <ResourceTrickle>
     <Rates>
       <food>1.0</food>
       <wood>1.0</wood>
       <stone>0.75</stone>
       <metal>0.75</metal>
     </Rates>
     <Interval>1000</Interval>
   </ResourceTrickle>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/apadana.xml</Actor>
     <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_hall.xml	(revision 23082)
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Hall</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>250</stone>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>pers</Civ>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <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>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_kardakes_hoplite
       units/{civ}_kardakes_skirmisher
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>38</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/persians/hall.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml	(revision 23082)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Castellum</SpecificName>
   </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>
     <Actor>structures/romans/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>25.0</Length>
     <Indent>8.4</Indent>
   </WallPiece>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml	(revision 23082)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="12.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <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>
     <wood>0</wood>
     <stone>25</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_hero_leonidas
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/spartans/gerousia.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml	(revision 23082)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="20.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>spart</Civ>
     <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>
     <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="26.0"/>
   </Obstruction>
   <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
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/spartans/syssiton.xml</Actor>
     <FoundationActor>structures/fndn_5x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 23082)
@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Auras datatype="tokens">
     structures/temple_heal
   </Auras>
   <BuildRestrictions>
     <Category>Temple</Category>
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>300</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="31.5"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>3</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </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>
   </Identity>
   <Loot>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_healer_b
     </Entities>
     <Technologies datatype="tokens">
       heal_range
       heal_range_2
       heal_rate
       heal_rate_2
       heal_temple
       health_regen_units
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <constructed>interface/complete/building/complete_temple.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 23081)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 23082)
@@ -1,108 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
     <Hack op="add">5</Hack>
     <Pierce op="add">5</Pierce>
     <Crush op="add">3</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>16.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>9.81</Gravity>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
     <Distance>
       <FromClass>Fortress</FromClass>
       <MinDistance>80</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>4000</CapturePoints>
     <RegenRate>10.0</RegenRate>
   </Capturable>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>1000</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.075</EjectHealth>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>4200</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
     <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
     <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>
     <wood>0</wood>
     <stone>65</stone>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>100</Radius>
   </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>