Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml	(revision 13471)
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_wall_tower">
   <Footprint replace="">
     <Circle radius="6.2"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Torre</SpecificName>
     <History>Sturdy battlements for city walls.</History>
   </Identity>
   <Obstruction>
     <Static width="10" depth="10"/>
   </Obstruction>
+  <ProductionQueue>
+    <Technologies datatype="tokens">
+	  -pair_walls_01
+    </Technologies>
+  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/wall_tower.xml</Actor>
   </VisualActor>
   <WallPiece>
   	<Length>10</Length>
   </WallPiece>
 </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 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 13471)
@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Auras>
     <Heal>
       <Radius>40</Radius>
       <Speed>1000</Speed>
     </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>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>3</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Temple</GenericName>
-    <Tooltip>Train healers. Garrison up to 20 units to heal them at a quick rate.</Tooltip>
+    <Tooltip>Train healers. Garrison up to 20 units to heal them at a quick rate. Research healing and religious improvements.</Tooltip>
     <Classes datatype="tokens">
       Town
       Temple
     </Classes>
     <Icon>structures/temple.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>50</stone>
     <metal>500</metal>
   </Loot>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_temple.xml</select>
       <constructed>interface/complete/building/complete_temple.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_healer_b
     </Entities>
     <Technologies datatype="tokens">
       pair_heal_01
       pair_heal_02
       heal_temple
     </Technologies>
   </ProductionQueue>
   <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_economic_farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml	(revision 13471)
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <BuildRestrictions>
     <Category>Farmstead</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="14.0" depth="14.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>900</Max>
     <SpawnEntityOnDeath>rubble/rubble_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Farmstead</GenericName>
-    <Tooltip>Dropsite for the food resource.</Tooltip>
+    <Tooltip>Dropsite for the food resource. Research food gathering improvements.</Tooltip>
     <Classes datatype="tokens">Village -ConquestCritical DropsiteFood Farmstead</Classes>
     <Icon>structures/farmstead.png</Icon>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="12.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       gather_wicker_baskets
 	  gather_farming_plough
     </Technologies>
   </ProductionQueue>
   <RallyPoint disable=""/>
   <ResourceDropsite>
     <Types>food</Types>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_farmstead.xml</select>
       <constructed>interface/complete/building/complete_farmstead.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml	(revision 13471)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <BuildRestrictions>
     <Category>Market</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="33.0" depth="29.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Market</GenericName>
-    <Tooltip>Create trade units to trade between other markets. Barter resources.</Tooltip>
+    <Tooltip>Create trade units to trade between other markets. Barter resources. Research trading and bartering improvements.</Tooltip>
     <Classes datatype="tokens">Town Market BarterMarket -ConquestCritical</Classes>
     <Icon>structures/market.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>25</food>
     <wood>25</wood>
     <stone>25</stone>
     <metal>25</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="26.0"/>
   </Obstruction>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_market.xml</select>
       <constructed>interface/complete/building/complete_market.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       armor_trade_convoys
     </Technologies>
     <Entities datatype="tokens">
       units/{civ}_support_trader
     </Entities>
   </ProductionQueue>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml	(revision 13471)
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <BuildRestrictions>
     <Category>Mill</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="15.0" depth="15.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>800</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Mill</GenericName>
-    <Tooltip>Dropsite for wood, stone, and metal resources.</Tooltip>
+    <Tooltip>Dropsite for wood, stone, and metal resources. Research gathering improvements for these resources.</Tooltip>
     <Classes datatype="tokens">Mill Village -ConquestCritical DropsiteWood DropsiteMetal DropsiteStone</Classes>
     <Icon>structures/mill.png</Icon>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="13.0" depth="13.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
       pair_gather_01
       pair_gather_02
       pair_gather_03
       pair_gather_wood_01
     </Technologies>
   </ProductionQueue>
   <RallyPoint disable=""/>
   <ResourceDropsite>
     <Types>wood stone metal</Types>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_mill.xml</select>
       <constructed>interface/complete/building/complete_mill.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>16</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 13471)
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <BuildRestrictions>
     <Category>Barracks</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <EjectHealth>0.1</EjectHealth>
     <List datatype="tokens">Infantry Cavalry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
-    <Tooltip>Train citizen-soldiers. Research military improvements. Garrison: 10.</Tooltip>
+    <Tooltip>Train citizen-soldiers. Research training improvements. Garrison: 10.</Tooltip>
     <Classes datatype="tokens">
 	  Town
 	  Barracks
 	</Classes>
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>30</wood>
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       pair_levy_01
 	  training_conscription
 	  unlock_champion_units
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_barracks.xml</select>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>50</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 13471)
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>rubble/rubble_4x4_dock</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Dock</GenericName>
-    <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade.</Tooltip>
+    <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade. Research naval improvements.</Tooltip>
     <Classes datatype="tokens">Village Naval Market NavalMarket Dock</Classes>
     <Icon>structures/dock.png</Icon>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>30</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
   </Position>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
       <constructed>interface/complete/building/complete_dock.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_ship_fishing
       units/{civ}_ship_merchant
     </Entities>
     <Technologies datatype="tokens">
       training_naval_architects
 	  armor_ship_reinforcedhull
       armor_ship_hypozomata
       armor_ship_hullsheathing
     </Technologies>
   </ProductionQueue>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4_dock.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 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 13471)
@@ -1,93 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>80.0</MaxRange>
       <MinRange>12.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>300</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>650</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>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>4200</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
-    <Tooltip>Train heroes, champions, and siege weapons. Garrison: 20.</Tooltip>
+    <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements. Garrison: 20.</Tooltip>
     <Classes datatype="tokens">
 	  City
 	  Defensive
 	  GarrisonFortress
 	  Fortress
 	</Classes>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>0</wood>
     <stone>65</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       pair_champ_02
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
       <attack>attack/weapon/arrowfly.xml</attack>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>100</Radius>
     <Weight>65536</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 13470)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 13471)
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="22.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <EjectHealth>0.1</EjectHealth>
     <List datatype="tokens">Animal</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>500</Max>
     <SpawnEntityOnDeath>rubble/rubble_2x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Corral</GenericName>
-    <Tooltip>Raise herd animals for food.</Tooltip>
+    <Tooltip>Raise herd animals for food. Task domestic animals here to gain a trickle of food or other bonus (Not yet implemented).</Tooltip>
     <Classes datatype="tokens">
 	  Village
 	  Corral
 	</Classes>
     <Icon>structures/corral.png</Icon>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Obstruction>
     <Static width="9.5" depth="19.75"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       gaia/fauna_sheep
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_corral.xml</select>
       <constructed>interface/complete/building/complete_corral.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_2x4.xml</FoundationActor>
   </VisualActor>
 </Entity>