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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 24623)
@@ -1,87 +1,84 @@
 <?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>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Dock</GenericName>
     <SelectionGroupName>template_structure_military_dock</SelectionGroupName>
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Establish trade routes. Construct Ships and research Ship technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Economic Naval Trade Village Dock</VisibleClasses>
     <Icon>structures/dock.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
   </Loot>
   <Market>
     <TradeType>land naval</TradeType>
     <InternationalBonus>0.2</InternationalBonus>
   </Market>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/ship_fishing
       units/{civ}/ship_merchant
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
       units/{civ}/ship_quinquereme
       units/{civ}/ship_fire
     </Entities>
     <Technologies datatype="tokens">
       fishing_boat_gather_rate
       fishing_boat_gather_capacity
       ship_cost_time
       ship_health
       ship_movement_speed
       equine_transports
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
       <constructed>interface/complete/building/complete_dock.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence disable=""/>
   <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_special_rotarymill.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml	(revision 24623)
@@ -1,59 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/rotary_mill
   </Auras>
   <Cost>
     <BuildTime>100</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Rotary Mill</GenericName>
     <SelectionGroupName>template_structure_special_rotarymill</SelectionGroupName>
     <VisibleClasses datatype="tokens">RotaryMill</VisibleClasses>
     <Icon>structures/rotarymill.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_ffactri.xml</select>
       <constructed>interface/complete/building/complete_ffactri.xml</constructed>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>32</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/barracks.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/barracks.xml	(revision 24623)
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
     <Resources>
       <wood>300</wood>
       <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Coriosessa</SpecificName>
   </Identity>
   <Loot>
     <wood>60</wood>
     <stone>0</stone>
   </Loot>
-  <Population>
-    <Bonus>4</Bonus>
-  </Population>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/britons/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/dock.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/dock.xml	(revision 24623)
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_celt_dock</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Counos</SpecificName>
   </Identity>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <Obstruction>
     <Static width="10.0" depth="22.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/britons/dock.xml</Actor>
     <FoundationActor>structures/fndn_celt_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/farmstead.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/farmstead.xml	(revision 24623)
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
     <Square width="12.0" depth="12.0"/>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Buta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="10.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/britons/farmstead.xml</Actor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/forge.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/forge.xml	(revision 24623)
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_forge">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Gobanion</SpecificName>
   </Identity>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/britons/blacksmith.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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml	(revision 24623)
@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <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>
     <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>12</Bonus>
-  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/hero_boudicca
       units/{civ}/hero_caratacos
       units/{civ}/hero_cunobelin
     </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.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/brit/market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/market.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/market.xml	(revision 24623)
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Magos</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="25.0" depth="23.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/britons/market.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/storehouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/storehouse.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/storehouse.xml	(revision 24623)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
   <Footprint>
     <Square width="18.0" depth="18.0"/>
   </Footprint>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Capanon</SpecificName>
   </Identity>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/britons/storehouse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml	(revision 24623)
@@ -1,101 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Auras datatype="tokens">
     structures/cart_super_dock_repair
   </Auras>
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>2000</CapturePoints>
     <GarrisonRegenRate>10</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>300</wood>
       <stone>200</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="42.0" depth="58.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Ship</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>5000</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Naval Shipyard</GenericName>
     <SpecificName>Cothon</SpecificName>
     <Tooltip>Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Construct Warships and research technologies.</Tooltip>
     <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Naval -City Town Shipyard</VisibleClasses>
     <Icon>structures/uber_dock.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>
     <stone>40</stone>
   </Loot>
   <Obstruction>
     <Static width="42.0" depth="58.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
       units/{civ}/ship_quinquereme
     </Entities>
     <Technologies datatype="tokens">
       exploration
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
       <constructed>interface/complete/building/complete_dock.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>200</Radius>
     <Weight>25000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>100</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/carthaginians/super_dock.xml</Actor>
     <FoundationActor>structures/fndn_dock_super.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/barracks.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/barracks.xml	(revision 24623)
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Cost>
     <Resources>
       <wood>300</wood>
       <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Coriosedlon</SpecificName>
   </Identity>
   <Loot>
     <wood>60</wood>
     <stone>0</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>4</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/dock.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/dock.xml	(revision 24623)
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_dock">
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_celt_dock</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Counos</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="10.0" depth="22.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/celts/dock.xml</Actor>
     <FoundationActor>structures/fndn_celt_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/farmstead.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/farmstead.xml	(revision 24623)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
   <Footprint>
     <Square width="19.0" depth="18.0"/>
   </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Buta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="17.0" depth="16.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/gauls/farmstead.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/forge.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/forge.xml	(revision 24623)
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_forge">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Gobanion</SpecificName>
   </Identity>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/gauls/blacksmith.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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml	(revision 24623)
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
     <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
-  <Population>
-    <Bonus>12</Bonus>
-  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       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.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>16.8</Length>
     <Indent>5.8</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/market.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/market.xml	(revision 24623)
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
   <Footprint>
     <Square width="26.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Magos</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="25.0" depth="23.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/gauls/market.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/storehouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/storehouse.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/storehouse.xml	(revision 24623)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_storehouse">
   <Footprint>
     <Square width="15.0" depth="17.0"/>
   </Footprint>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Capanon</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="13.0" depth="15.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>2</Bonus>
-  </Population>
   <VisualActor>
     <Actor>structures/gauls/storehouse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_propylaea.xml	(revision 24623)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="28.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Portico</GenericName>
     <SpecificName>Propylaea</SpecificName>
     <Icon>structures/tholos.png</Icon>
   </Identity>
   <Loot>
     <stone>75</stone>
     <metal>75</metal>
   </Loot>
   <Obstruction>
     <Static width="26.0" depth="30.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue disable=""/>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/hellenes/propylaea.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/hellenic_stoa.xml	(revision 24623)
@@ -1,51 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <BuildRestrictions>
     <Category>Stoa</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>110</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>100</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="28" depth="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Health>
     <Max>1100</Max>
   </Health>
   <Identity>
     <GenericName>Stoa</GenericName>
     <SpecificName>Hellenic Stoa</SpecificName>
     <Icon>gaia/special_stoa.png</Icon>
   </Identity>
   <Loot>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="26.0" depth="10.5"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>36</Radius>
     <Weight>65535</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>special/greek_stoa.xml</Actor>
     <FoundationActor>structures/fndn_6x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/defense_tower.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/defense_tower.xml	(revision 24623)
@@ -1,53 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower_stone">
   <Attack>
     <Ranged>
       <MinRange>12</MinRange>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
   </BuildingAI>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>50</wood>
       <stone>250</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="8.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>8</Max>
   </GarrisonHolder>
   <Health>
     <Max>2400</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Dorre</SpecificName>
   </Identity>
   <Loot>
     <wood>10</wood>
     <stone>50</stone>
   </Loot>
   <Obstruction>
     <Static width="14.0" depth="14.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <StatusBars>
     <HeightOffset>17.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
     <Radius>38</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/iberians/scout_tower.xml</Actor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml	(revision 24623)
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Castro</SpecificName>
     <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>15</Bonus>
-  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/hero_caros
       units/{civ}/hero_indibil
       units/{civ}/hero_viriato
     </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/kush/temple_amun.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/temple_amun.xml	(revision 24623)
@@ -1,58 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Auras datatype="tokens">
     structures/kush_temple_amun
   </Auras>
   <BuildRestrictions>
     <Category>TempleOfAmun</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime op="mul">2</BuildTime>
     <Resources>
       <stone op="mul">2</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="62.0"/>
   </Footprint>
   <GarrisonHolder>
     <Max op="mul">2</Max>
   </GarrisonHolder>
   <Health>
     <Max op="mul">2</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Grand Temple of Amun</GenericName>
     <SpecificName>Pr-ʿImn</SpecificName>
     <Tooltip>Train Healers and Amun Champions and research healing technologies.</Tooltip>
     <Classes datatype="tokens">CivSpecific</Classes>
     <VisibleClasses datatype="tokens">-Town City TempleOfAmun</VisibleClasses>
     <Icon>structures/temple_epic.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <stone op="mul">2</stone>
   </Loot>
   <Obstruction>
     <Static width="28" depth="56.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       -units/{civ}/support_healer_b
       units/{civ}/support_healer_e
       units/{civ}/champion_infantry_amun
     </Entities>
   </ProductionQueue>
   <TerritoryInfluence>
     <Radius op="mul">2</Radius>
   </TerritoryInfluence>
   <VisualActor>
     <Actor>structures/kushites/temple_amun.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
 </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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/palace.xml	(revision 24623)
@@ -1,67 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Palace</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Palace</GenericName>
     <SpecificName>Harmya</SpecificName>
     <Tooltip>Territory root. Train Maiden Guards and Heroes.</Tooltip>
     <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
     <Icon>gaia/special_stoa.png</Icon>
   </Identity>
   <Loot>
     <stone>40</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="12.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_maiden
       units/{civ}/champion_maiden_archer
       units/{civ}/hero_chanakya
       units/{civ}/hero_chandragupta
       units/{civ}/hero_ashoka
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/mauryas/misc_structure_01.xml</Actor>
     <FoundationActor>structures/fndn_9x4.xml</FoundationActor>
   </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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/apadana.xml	(revision 24623)
@@ -1,82 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <BuildRestrictions>
     <Category>Palace</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <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>
     <Tooltip>Train Champions and Heroes.</Tooltip>
     <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
     <Icon>structures/palace.png</Icon>
   </Identity>
   <Loot>
     <stone>60</stone>
     <metal>40</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/hero_cyrus_ii
       units/{civ}/hero_darius_i
       units/{civ}/hero_xerxes_i
     </Entities>
     <Technologies datatype="tokens">
       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>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <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/tacara.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tacara.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/tacara.xml	(revision 24623)
@@ -1,58 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>400</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="24.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>Palace</GenericName>
     <SpecificName>Taçara</SpecificName>
     <Classes datatype="tokens">ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Palace</VisibleClasses>
     <Icon>structures/palace.png</Icon>
   </Identity>
   <Loot>
     <wood>40</wood>
     <stone>80</stone>
   </Loot>
   <Obstruction>
     <Static width="38.5" depth="22.5"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <ProductionQueue disable=""/>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>48</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/persians/palace.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml	(revision 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml	(revision 24623)
@@ -1,137 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>25</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>15</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>neutral enemy</Territory>
     <Category>ArmyCamp</Category>
     <Distance>
       <FromClass>ArmyCamp</FromClass>
       <MinDistance>45</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>1500</CapturePoints>
     <RegenRate>10.0</RegenRate>
     <GarrisonRegenRate>3.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <BuildTime>250</BuildTime>
     <Resources>
       <wood>500</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="40.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_rome_sb</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Army Camp</GenericName>
     <SpecificName>Castra</SpecificName>
     <Tooltip>Build in neutral or enemy territory. Train Melee Infantry. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
     <VisibleClasses datatype="tokens">City ArmyCamp</VisibleClasses>
     <Icon>structures/roman_camp.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>100</wood>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/infantry_axeman_a
       units/{civ}/infantry_swordsman_a
       units/{civ}/infantry_spearman_a
       units/{civ}/infantry_pikeman_a
     </Entities>
   </ProductionQueue>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>15</Hack>
         <Pierce>25</Pierce>
         <Crush>2</Crush>
       </Damage>
     </Entity>
     <Foundation>
       <Damage>
         <Hack>1</Hack>
         <Pierce>5</Pierce>
         <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>37.5</DecayRate>
   </TerritoryDecay>
   <Vision>
     <Range>100</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/romans/camp.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>29.5</Length>
     <Indent>8</Indent>
   </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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(revision 24623)
@@ -1,76 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <Auras datatype="tokens">
     structures/temple_heal
   </Auras>
   <Cost>
     <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>
     <SelectionGroupName>template_structure_civic_temple</SelectionGroupName>
     <Tooltip>Train Healers and research healing technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Town Temple</VisibleClasses>
     <Icon>structures/temple.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>60</stone>
   </Loot>
   <Obstruction>
     <Static width="17.5" depth="30.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>5</Bonus>
-  </Population>
   <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
       garrison_heal
       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 24622)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 24623)
@@ -1,112 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>16</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>70</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <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>
     <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
     <Distance>
       <FromClass>Fortress</FromClass>
       <MinDistance>55</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>4000</CapturePoints>
     <RegenRate>10.0</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>450</BuildTime>
     <Resources>
       <wood>300</wood>
       <stone>600</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>5200</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
     <SelectionGroupName>template_structure_military_fortress</SelectionGroupName>
     <Tooltip>Territory root. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">Defensive City Fortress</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>
     <stone>120</stone>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
-  <Population>
-    <Bonus>10</Bonus>
-  </Population>
   <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>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>80</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>100</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>