Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -26,8 +26,8 @@
   </Cost>
   <Identity>
     <GenericName>Cavalry Spearman</GenericName>
+    <Tooltip>Counters: 1.5× vs Cavalry.</Tooltip>
     <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
-    <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
   </Identity>
   <Resistance>
     <Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -23,9 +23,9 @@
     <Max>300</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
-    <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 1.5× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -23,9 +23,9 @@
     <Max>200</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/syntagma
       special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -23,9 +23,9 @@
     <Max>200</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Spearman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/testudo
     </Formations>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -20,6 +20,7 @@
     </Melee>
   </Attack>
   <Identity>
+    <Tooltip>Counters: 1.5× vs Cavalry. Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -20,9 +20,9 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
-    <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 1.5× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -20,9 +20,9 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/testudo
     </Formations>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -20,9 +20,9 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Hero Spearman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/testudo
     </Formations>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -23,9 +23,9 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Pikeman</VisibleClasses>
     <GenericName>Pikeman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Pikeman</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/syntagma
     </Formations>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -22,9 +22,9 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
     <GenericName>Spearman</GenericName>
-    <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
+    <Tooltip>Counters: 3× vs Cavalry.</Tooltip>
+    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>5</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -11,9 +11,8 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Leial Zalduneria</SpecificName>
-    <Icon>units/iber_champion_cavalry.png</Icon>
     <SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
-    <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
+    <Icon>units/iber_champion_cavalry.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/cavalry_javelinist_c_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -19,7 +19,7 @@
     <Lang>greek</Lang>
     <GenericName>Alexander III the Great</GenericName>
     <SpecificName>Alexandros ho Megas</SpecificName>
-    <Tooltip>"Herocide" Bonus: +20% attack bonus vs. enemy Heroes.</Tooltip>
+    <Tooltip>Counters: 1.2× vs Heroes.</Tooltip>
     <Icon>units/mace_hero_alexander.png</Icon>
   </Identity>
   <VisualActor>