Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -19,8 +19,7 @@
     </Slaughter>
   </Attack>
   <Cost>
-    <Population>1</Population>
-    <BuildTime>15</BuildTime>
+    <BuildTime>16</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
-    <Population>1</Population>
-    <BuildTime>30</BuildTime>
+    <BuildTime>27</BuildTime>
     <Resources>
       <food>150</food>
       <wood>80</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_champion">
   <Cost>
     <Population>3</Population>
-    <BuildTime>30</BuildTime>
+    <BuildTime>36</BuildTime>
     <Resources>
       <food>300</food>
       <metal>200</metal>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -46,7 +46,7 @@
     </Entities>
   </Builder>
   <Cost>
-    <BuildTime>10</BuildTime>
+    <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Cost>
-    <BuildTime>8</BuildTime>
-  </Cost>
   <Identity>
     <Classes datatype="tokens">Human Organic</Classes>
     <VisibleClasses datatype="tokens">Support</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -53,6 +53,7 @@
     </Entities>
   </Builder>
   <Cost>
+    <BuildTime>9</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>250</food>
     </Resources>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -29,11 +29,8 @@
   </Builder>
   <Cost>
     <Population>0</Population>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
       <metal>50</metal>
     </Resources>
   </Cost>
@@ -50,9 +47,6 @@
   <Loot>
     <xp>1</xp>
     <food>0</food>
-    <wood>1</wood>
-    <stone>1</stone>
-    <metal>1</metal>
   </Loot>
   <ResourceGatherer>
     <BaseSpeed>1.0</BaseSpeed>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
@@ -4,7 +4,7 @@
     units/elephant_worker
   </Auras>
   <Cost>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>150</food>
     </Resources>