diff --git a/factions/magic/magic.xml b/factions/magic/magic.xml
index b699a0c..6944beb 100644
--- a/factions/magic/magic.xml
+++ b/factions/magic/magic.xml
@@ -2,9 +2,7 @@
 
 <faction>
 	<starting-resources>
-		<resource name="gold" amount="200"/>
-		<resource name="wood" amount="200"/>
-		<resource name="stone" amount="400"/>
+		<resource name="gold" amount="100"/>
 		<resource name="energy" amount="14"/>
 	</starting-resources>
 	<starting-units>
diff --git a/factions/magic/units/archmage/archmage.xml b/factions/magic/units/archmage/archmage.xml
index 065a92a..a83aa3e 100644
--- a/factions/magic/units/archmage/archmage.xml
+++ b/factions/magic/units/archmage/archmage.xml
@@ -29,7 +29,8 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="150"/>
+			<resource name="gold" amount="50"/>
+			<resource name="stone" amount="150"/>
 			<resource name="energy" amount="2"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/archmage_tower/archmage_tower.xml b/factions/magic/units/archmage_tower/archmage_tower.xml
index ad9b90e..0902acf 100644
--- a/factions/magic/units/archmage_tower/archmage_tower.xml
+++ b/factions/magic/units/archmage_tower/archmage_tower.xml
@@ -28,9 +28,8 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="200" />
-			<resource name="stone" amount="300" />
-			<resource name="wood" amount="100" />
+			<resource name="gold" amount="150" />
+			<resource name="stone" amount="150" />
 		</resource-requirements>
 		<resources-stored />
 		<image path="images/archmage_tower.bmp"/>
diff --git a/factions/magic/units/dragon/dragon.xml b/factions/magic/units/dragon/dragon.xml
index 898e9d4..2ea453d 100644
--- a/factions/magic/units/dragon/dragon.xml
+++ b/factions/magic/units/dragon/dragon.xml
@@ -9,7 +9,7 @@
 		<armor value="20"/>
 		<armor-type value="organic"/>
 		<sight value="15"/>
-		<time value="150"/>
+		<time value="140"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels>
@@ -28,8 +28,7 @@
 		</upgrade-requirements>
 		<resource-requirements>
 			<resource name="gold" amount="250"/>
-			<resource name="stone" amount="100"/>
-			<resource name="wood" amount="100"/>
+			<resource name="stone" amount="150"/>
 			<resource name="energy" amount="2"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/dragon_rider/dragon_rider.xml b/factions/magic/units/dragon_rider/dragon_rider.xml
index 5eb0f5b..8b12c55 100644
--- a/factions/magic/units/dragon_rider/dragon_rider.xml
+++ b/factions/magic/units/dragon_rider/dragon_rider.xml
@@ -11,7 +11,7 @@
 		<armor value="50"/>
 		<armor-type value="organic"/>
 		<sight value="10"/>
-		<time value="120"/>
+		<time value="60"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels>
@@ -28,8 +28,8 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="100"/>
-			<resource name="wood" amount="25"/>
+			<resource name="gold" amount="125"/>
+			<resource name="stone" amount="50"/>
 			<resource name="energy" amount="2"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/energy_source/energy_source.xml b/factions/magic/units/energy_source/energy_source.xml
index 93df773..7659957 100644
--- a/factions/magic/units/energy_source/energy_source.xml
+++ b/factions/magic/units/energy_source/energy_source.xml
@@ -27,7 +27,6 @@
 		<upgrade-requirements />
 		<resource-requirements>
 			<resource name="gold" amount="100"/>
-			<resource name="stone" amount="100"/>
 			<resource name="energy" amount="-16"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/evil_dragon/evil_dragon.xml b/factions/magic/units/evil_dragon/evil_dragon.xml
index 736ae69..d8a4546 100644
--- a/factions/magic/units/evil_dragon/evil_dragon.xml
+++ b/factions/magic/units/evil_dragon/evil_dragon.xml
@@ -9,7 +9,7 @@
 		<armor value="20"/>
 		<armor-type value="organic"/>
 		<sight value="15"/>
-		<time value="450"/>
+		<time value="50"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels>
@@ -27,7 +27,6 @@
 		<resource-requirements>
 			<resource name="gold" amount="100"/>
 			<resource name="stone" amount="200"/>
-			<resource name="wood" amount="50"/>
 			<resource name="energy" amount="2"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/ghost_armor/ghost_armor.xml b/factions/magic/units/ghost_armor/ghost_armor.xml
index e4518f7..d2fa925 100644
--- a/factions/magic/units/ghost_armor/ghost_armor.xml
+++ b/factions/magic/units/ghost_armor/ghost_armor.xml
@@ -9,7 +9,7 @@
 		<armor value="30"/>
 		<armor-type value="metal"/>
 		<sight value="11"/>
-		<time value="75"/>
+		<time value="40"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels>
@@ -25,7 +25,8 @@
 			<upgrade name="ancient_summoning"/>
 		</upgrade-requirements>
 		<resource-requirements>
-			<resource name="gold" amount="150"/>
+			<resource name="gold" amount="75"/>
+			<resource name="stone" amount="25"/>
 			<resource name="energy" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/initiate/initiate.xml b/factions/magic/units/initiate/initiate.xml
index 83743fd..27bd6cc 100644
--- a/factions/magic/units/initiate/initiate.xml
+++ b/factions/magic/units/initiate/initiate.xml
@@ -21,7 +21,7 @@
 		<unit-requirements/>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="75"/>
+			<resource name="gold" amount="50"/>
 			<resource name="energy" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
@@ -66,15 +66,6 @@
 			<animation path="models/initiate_standing_loaded.g3d"/>
 			<sound enabled="false"/>
 		</skill>
-		<skill>
-			<type value="stop"/>
-			<name value="stop_loaded_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="70"/>
-			<anim-speed value="60"/>
-			<animation path="models/initiate_standing_loaded_wood.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 		<skill>
 			<type value="move"/>
 			<name value="move_skill"/>
@@ -84,15 +75,6 @@
 			<animation path="models/initiate_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
-		<skill>
-			<type value="move"/>
-			<name value="move_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="265"/>
-			<anim-speed value="230"/>
-			<animation path="models/initiate_walking.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 		<skill>
 			<type value="move"/>
 			<name value="move_gold_skill"/>
@@ -111,15 +93,6 @@
 			<animation path="models/initiate_walking_loaded.g3d"/>
 			<sound enabled="false"/>
 		</skill>
-		<skill>
-			<type value="move"/>
-			<name value="move_loaded_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="230"/>
-			<anim-speed value="220"/>
-			<animation path="models/initiate_walking_loaded_wood.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 		<skill>
 			<type value="build"/>
 			<name value="build_skill"/>
@@ -329,22 +302,6 @@
 			<max-load value="20"/>
 			<hits-per-unit value="1"/>
 		</command>
-		<command>
-			<type value="harvest"/>
-			<name value="harvest"/>
-			<image path="images/initiate_harvest_wood.bmp"/>
-			<unit-requirements/>
-			<upgrade-requirements/>
-			<move-skill value="move_wood_skill"/>
-			<harvest-skill value="harvest_skill"/>
-			<stop-loaded-skill value="stop_loaded_wood_skill"/>
-			<move-loaded-skill value="move_loaded_wood_skill"/>
-			<harvested-resources>
-				<resource name="wood"/>
-			</harvested-resources>
-			<max-load value="20"/>
-			<hits-per-unit value="1"/>
-		</command>
 		<command>
 			<type value="morph"/>
 			<name value="promote_to_battlemage"/>
diff --git a/factions/magic/units/library/library.xml b/factions/magic/units/library/library.xml
index 7cd7f83..58cf7ee 100644
--- a/factions/magic/units/library/library.xml
+++ b/factions/magic/units/library/library.xml
@@ -30,9 +30,7 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="100"/>
-			<resource name="stone" amount="250"/>
-			<resource name="wood" amount="100"/>
+			<resource name="gold" amount="150"/>
 		</resource-requirements>
 		<resources-stored />
 		<image path="images/library.bmp"/>
diff --git a/factions/magic/units/mage_tower/mage_tower.xml b/factions/magic/units/mage_tower/mage_tower.xml
index 53f13b0..9b75b19 100644
--- a/factions/magic/units/mage_tower/mage_tower.xml
+++ b/factions/magic/units/mage_tower/mage_tower.xml
@@ -31,9 +31,7 @@
 		<unit-requirements/>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="300"/>
-			<resource name="stone" amount="150"/>
-			<resource name="wood" amount="50"/>
+			<resource name="gold" amount="400"/>
 		</resource-requirements>
 		<resources-stored>
 			<resource name= "gold" amount="1800"/>
diff --git a/factions/magic/units/summoner_guild/summoner_guild.xml b/factions/magic/units/summoner_guild/summoner_guild.xml
index ec92b2a..3737c70 100644
--- a/factions/magic/units/summoner_guild/summoner_guild.xml
+++ b/factions/magic/units/summoner_guild/summoner_guild.xml
@@ -31,12 +31,10 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="100"/>
-			<resource name="stone" amount="150"/>
-			<resource name="wood" amount="50"/>
+			<resource name="gold" amount="150"/>
+			<resource name="stone" amount="50"/>
 		</resource-requirements>
 		<resources-stored>
-			<resource name="wood" amount="200" />
 		</resources-stored>
 		<image path="images/summoner_guild.bmp"/>
 		<image-cancel path="../archmage/images/magic_cancel.bmp"/>
diff --git a/factions/magic/units/tower_of_souls/tower_of_souls.xml b/factions/magic/units/tower_of_souls/tower_of_souls.xml
index dcb3734..a1f8da4 100644
--- a/factions/magic/units/tower_of_souls/tower_of_souls.xml
+++ b/factions/magic/units/tower_of_souls/tower_of_souls.xml
@@ -28,8 +28,7 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="200"/>
-			<resource name="stone" amount="250"/>
+			<resource name="gold" amount="150"/>
 			<resource name="energy" amount="3"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/magic/units/wicker_behemoth/wicker_behemoth.xml b/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
index 7e1f804..c0bcdd3 100644
--- a/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
+++ b/factions/magic/units/wicker_behemoth/wicker_behemoth.xml
@@ -28,7 +28,6 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="wood" amount="200"/>
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/wicker_behemoth.bmp"/>
diff --git a/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml b/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
index 70a38b3..e22fd1a 100644
--- a/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
+++ b/factions/magic/upgrades/ancient_summoning/ancient_summoning.xml
@@ -7,8 +7,8 @@
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="wood" amount="100"/>
 		<resource name="gold" amount="50"/>
+		<resource name="stone" amount="50"/>
 	</resource-requirements>
 	<effects>
 		<unit name="summoner"/>
diff --git a/factions/magic/upgrades/dragon_call/dragon_call.xml b/factions/magic/upgrades/dragon_call/dragon_call.xml
index 2f580fe..9a0b015 100644
--- a/factions/magic/upgrades/dragon_call/dragon_call.xml
+++ b/factions/magic/upgrades/dragon_call/dragon_call.xml
@@ -3,12 +3,12 @@
 <upgrade>
 	<image path="images/dragon_call.bmp"/>
 	<image-cancel path="../ancient_summoning/images/magic_upgrade_cancel.bmp"/>
-	<time value="400"/>
+	<time value="150"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="wood" amount="150"/>
-		<resource name="gold" amount="250"/>
+		<resource name="gold" amount="100"/>
+		<resource name="stone" amount="100"/>
 	</resource-requirements>
 	<effects/>
 	<max-hp value="0"/>
diff --git a/factions/magic/upgrades/energy_compression/energy_compression.xml b/factions/magic/upgrades/energy_compression/energy_compression.xml
index cc9e7b5..e0e4d4b 100644
--- a/factions/magic/upgrades/energy_compression/energy_compression.xml
+++ b/factions/magic/upgrades/energy_compression/energy_compression.xml
@@ -3,11 +3,12 @@
 <upgrade>
 	<image path="images/energy_compression.bmp"/>
 	<image-cancel path="../ancient_summoning/images/magic_upgrade_cancel.bmp"/>
-	<time value="250"/>
+	<time value="125"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="gold" amount="150"/>
+		<resource name="gold" amount="100"/>
+		<resource name="stone" amount="100"/>
 	</resource-requirements>
 	<effects>
 		<unit name="battlemage"/>
diff --git a/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml b/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
index 1b0c873..2f9cfa9 100644
--- a/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
+++ b/factions/magic/upgrades/energy_sharpening/energy_sharpening.xml
@@ -3,12 +3,11 @@
 <upgrade>
 	<image path="images/energy_sharpening.bmp"/>
 	<image-cancel path="../ancient_summoning/images/magic_upgrade_cancel.bmp"/>
-	<time value="400"/>
+	<time value="125"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="gold" amount="250"/>
-                <resource name="wood" amount="200"/>
+		<resource name="gold" amount="150"/>
                 <resource name="stone" amount="150"/>
 	</resource-requirements>
 	<effects>
diff --git a/factions/magic/upgrades/faster_movement/faster_movement.xml b/factions/magic/upgrades/faster_movement/faster_movement.xml
index a112d5b..ee37314 100644
--- a/factions/magic/upgrades/faster_movement/faster_movement.xml
+++ b/factions/magic/upgrades/faster_movement/faster_movement.xml
@@ -3,13 +3,12 @@
 <upgrade>
 	<image path="images/faster_movement.bmp"/>
 	<image-cancel path="../ancient_summoning/images/magic_upgrade_cancel.bmp"/>
-	<time value="300"/>
+	<time value="175"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
 		<resource name="gold" amount="100"/>
-		<resource name="stone" amount="50"/>
-		<resource name="wood" amount="200"/>
+		<resource name="stone" amount="100"/>
 	</resource-requirements>
 	<effects>
 		<unit name="initiate"/>
diff --git a/factions/magic/upgrades/golem_power/golem_power.xml b/factions/magic/upgrades/golem_power/golem_power.xml
index 1823a07..c73421d 100644
--- a/factions/magic/upgrades/golem_power/golem_power.xml
+++ b/factions/magic/upgrades/golem_power/golem_power.xml
@@ -7,8 +7,8 @@
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="wood" amount="200"/>
 		<resource name="gold" amount="200"/>
+		<resource name="stone" amount="200"/>
 	</resource-requirements>
 	<effects>
 	</effects>
diff --git a/factions/magic/upgrades/hell_gate/hell_gate.xml b/factions/magic/upgrades/hell_gate/hell_gate.xml
index 26ad887..1df6cb5 100644
--- a/factions/magic/upgrades/hell_gate/hell_gate.xml
+++ b/factions/magic/upgrades/hell_gate/hell_gate.xml
@@ -7,7 +7,7 @@
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="wood" amount="200"/>
+		<resource name="gold" amount="200"/>
 		<resource name="gold" amount="200"/>
 	</resource-requirements>
 	<effects>
diff --git a/factions/tech/tech.xml b/factions/tech/tech.xml
index de4f86d..3a0b487 100644
--- a/factions/tech/tech.xml
+++ b/factions/tech/tech.xml
@@ -2,9 +2,7 @@
 
 <faction>
 	<starting-resources>
-		<resource name="gold" amount="200"/>
-		<resource name="wood" amount="200"/>
-		<resource name="stone" amount="500"/>
+		<resource name="gold" amount="100"/>
 		<resource name="food" amount="50"/>
 	</starting-resources>
 	<starting-units>
diff --git a/factions/tech/units/aerodrome/aerodrome.xml b/factions/tech/units/aerodrome/aerodrome.xml
index 33919f3..4d480d2 100644
--- a/factions/tech/units/aerodrome/aerodrome.xml
+++ b/factions/tech/units/aerodrome/aerodrome.xml
@@ -33,7 +33,7 @@
 		<upgrade-requirements/>
 		<resource-requirements>
 			<resource name="gold" amount="150" />
-			<resource name="wood" amount="100" />
+			<resource name="stone" amount="100" />
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/aerodrome.bmp"/>
diff --git a/factions/tech/units/air_ballista/air_ballista.xml b/factions/tech/units/air_ballista/air_ballista.xml
index 1979a62..8e882fd 100644
--- a/factions/tech/units/air_ballista/air_ballista.xml
+++ b/factions/tech/units/air_ballista/air_ballista.xml
@@ -27,7 +27,6 @@
 			<upgrade name="advanced_architecture"/>
 		</upgrade-requirements>
 		<resource-requirements>
-			<resource name="wood" amount="250"/>
 			<resource name="gold" amount="200"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
diff --git a/factions/tech/units/airship/airship.xml b/factions/tech/units/airship/airship.xml
index 835cbf4..188f8a1 100644
--- a/factions/tech/units/airship/airship.xml
+++ b/factions/tech/units/airship/airship.xml
@@ -9,7 +9,7 @@
 		<armor value="20"/>
 		<armor-type value="leather"/>
 		<sight value="15"/>
-		<time value="220"/>
+		<time value="140"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels>
@@ -33,7 +33,7 @@
 		</upgrade-requirements>
 		<resource-requirements>
 			<resource name="gold" amount="300"/>
-			<resource name="wood" amount="250"/>
+			<resource name="stone" amount="250"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/tech/units/barracks/barracks.xml b/factions/tech/units/barracks/barracks.xml
index c1ea304..546ede8 100644
--- a/factions/tech/units/barracks/barracks.xml
+++ b/factions/tech/units/barracks/barracks.xml
@@ -32,9 +32,7 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="100" />
-			<resource name="stone" amount="150" />
-			<resource name="wood" amount="50" />
+			<resource name="gold" amount="150" />
 		</resource-requirements>
 		<resources-stored />
 		<image path="images/barracks.bmp" />
diff --git a/factions/tech/units/battle_machine/battle_machine.xml b/factions/tech/units/battle_machine/battle_machine.xml
index f570f84..7574d71 100644
--- a/factions/tech/units/battle_machine/battle_machine.xml
+++ b/factions/tech/units/battle_machine/battle_machine.xml
@@ -29,8 +29,8 @@
 		<upgrade-requirements>
 		</upgrade-requirements>
 		<resource-requirements>
-			<resource name="wood" amount="150"/>
-			<resource name="gold" amount="100"/>
+			<resource name="stone" amount="300"/>
+			<resource name="gold" amount="200"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/tech/units/blacksmith/blacksmith.xml b/factions/tech/units/blacksmith/blacksmith.xml
index 5adb4fd..cbd1ecc 100644
--- a/factions/tech/units/blacksmith/blacksmith.xml
+++ b/factions/tech/units/blacksmith/blacksmith.xml
@@ -30,11 +30,10 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="100" />
-			<resource name="wood" amount="150" />
+			<resource name="gold" amount="125" />
 		</resource-requirements>
 		<resources-stored>
-			<resource name="wood" amount="200" />
+			<resource name="stone" amount="200" />
 		</resources-stored>
 		<image path="images/blacksmith.bmp"/>
 		<image-cancel path="../archer/images/tech_cancel.bmp"/>
diff --git a/factions/tech/units/castle/castle.xml b/factions/tech/units/castle/castle.xml
index 2267d10..dcfe3dc 100644
--- a/factions/tech/units/castle/castle.xml
+++ b/factions/tech/units/castle/castle.xml
@@ -30,9 +30,7 @@
 		<unit-requirements/>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="300" />
-			<resource name="stone" amount="100" />
-			<resource name="wood" amount="150" />
+			<resource name="gold" amount="400" />
 		</resource-requirements>
 		<resources-stored>
 			<resource name= "gold" amount="2000"/>
diff --git a/factions/tech/units/catapult/catapult.xml b/factions/tech/units/catapult/catapult.xml
index f324ab2..805ed8b 100644
--- a/factions/tech/units/catapult/catapult.xml
+++ b/factions/tech/units/catapult/catapult.xml
@@ -26,8 +26,8 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="100"/>
-			<resource name="wood" amount="100"/>
+			<resource name="gold" amount="150"/>
+			<resource name="stone" amount="125"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/tech/units/defense_tower/defense_tower.xml b/factions/tech/units/defense_tower/defense_tower.xml
index 0b559ef..5d98ede 100644
--- a/factions/tech/units/defense_tower/defense_tower.xml
+++ b/factions/tech/units/defense_tower/defense_tower.xml
@@ -30,8 +30,7 @@
 			<upgrade name="advanced_architecture"/>
 		</upgrade-requirements>
 		<resource-requirements>
-			<resource name="gold" amount="250"/>
-			<resource name="wood" amount="250"/>
+			<resource name="gold" amount="100"/>
 		</resource-requirements>
 		<resources-stored/>
 		<image path="images/defense_tower.bmp"/>
diff --git a/factions/tech/units/farm/farm.xml b/factions/tech/units/farm/farm.xml
index 14df17d..3f2b833 100644
--- a/factions/tech/units/farm/farm.xml
+++ b/factions/tech/units/farm/farm.xml
@@ -33,8 +33,6 @@
 		<upgrade-requirements />
 		<resource-requirements>
 			<resource name="gold" amount="100"/>
-			<resource name="wood" amount="50"/>
-			<resource name="stone" amount="50"/>
 			<resource name="food" amount="-10"/>
 		</resource-requirements>
 		<resources-stored>
diff --git a/factions/tech/units/guard/guard.xml b/factions/tech/units/guard/guard.xml
index 0781c66..b0f7c84 100644
--- a/factions/tech/units/guard/guard.xml
+++ b/factions/tech/units/guard/guard.xml
@@ -26,7 +26,7 @@
 		</unit-requirements>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="wood" amount="75"/>
+			<resource name="stone" amount="75"/>
 			<resource name="gold" amount="150"/>
 			<resource name="food" amount="2"/>
 		</resource-requirements>
diff --git a/factions/tech/units/horseman/horseman.xml b/factions/tech/units/horseman/horseman.xml
index 0fa18fd..eaeeb60 100644
--- a/factions/tech/units/horseman/horseman.xml
+++ b/factions/tech/units/horseman/horseman.xml
@@ -28,7 +28,7 @@
 			<upgrade name="stables"/>
 		</upgrade-requirements>
 		<resource-requirements>
-			<resource name="wood" amount="100"/>
+			<resource name="stone" amount="100"/>
 			<resource name="gold" amount="250"/>
 			<resource name="food" amount="2"/>
 		</resource-requirements>
diff --git a/factions/tech/units/ornithopter/ornithopter.xml b/factions/tech/units/ornithopter/ornithopter.xml
index 6c41228..70022b7 100644
--- a/factions/tech/units/ornithopter/ornithopter.xml
+++ b/factions/tech/units/ornithopter/ornithopter.xml
@@ -26,7 +26,7 @@
 		<upgrade-requirements/>
 		<resource-requirements>
 			<resource name="gold" amount="150"/>
-			<resource name="wood" amount="150"/>
+			<resource name="stone" amount="150"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/tech/units/technician/technician.xml b/factions/tech/units/technician/technician.xml
index b039a8f..c0aae96 100644
--- a/factions/tech/units/technician/technician.xml
+++ b/factions/tech/units/technician/technician.xml
@@ -22,7 +22,8 @@
 		<unit-requirements/>
 		<upgrade-requirements/>
 		<resource-requirements>
-			<resource name="gold" amount="150"/>
+			<resource name="gold" amount="75"/>
+			<resource name="stone" amount="50"/>
 			<resource name="food" amount="1"/>
 		</resource-requirements>
 		<resources-stored/>
diff --git a/factions/tech/units/technodrome/technodrome.xml b/factions/tech/units/technodrome/technodrome.xml
index bd1ae0b..f5a1829 100644
--- a/factions/tech/units/technodrome/technodrome.xml
+++ b/factions/tech/units/technodrome/technodrome.xml
@@ -31,11 +31,11 @@
 		</unit-requirements>
 		<upgrade-requirements />
 		<resource-requirements>
-			<resource name="gold" amount="200" />
-			<resource name="wood" amount="200" />
+			<resource name="gold" amount="150" />
+			<resource name="stone" amount="100" />
 		</resource-requirements>
 		<resources-stored>
-			<resource name="wood" amount="200" />
+			<resource name="stone" amount="200" />
 		</resources-stored>
 		<image path="images/technodrome.bmp"/>
 		<image-cancel path="../archer/images/tech_cancel.bmp"/>
diff --git a/factions/tech/units/worker/worker.xml b/factions/tech/units/worker/worker.xml
index 4c7d0c9..de0c859 100644
--- a/factions/tech/units/worker/worker.xml
+++ b/factions/tech/units/worker/worker.xml
@@ -71,15 +71,6 @@
 			<sound enabled="false"/>
 		</skill>
 
-		<skill>
-			<type value="stop"/>
-			<name value="stop_loaded_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="75"/>
-			<anim-speed value="70"/>
-			<animation path="models/worker_standing_loaded_wood.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 
 		<skill>
 			<type value="move"/>
@@ -91,15 +82,6 @@
 			<sound enabled="false"/>
 		</skill>
 
-		<skill>
-			<type value="move"/>
-			<name value="move_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="260"/>
-			<anim-speed value="163"/>
-			<animation path="models/worker_walking_wood.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 
 		<skill>
 			<type value="move"/>
@@ -121,15 +103,6 @@
 			<sound enabled="false"/>
 		</skill>
 
-		<skill>
-			<type value="move"/>
-			<name value="move_loaded_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="260"/>
-			<anim-speed value="163"/>
-			<animation path="models/worker_walking_loaded_wood.g3d"/>
-			<sound enabled="false"/>
-		</skill>
 
 		<skill>
 			<type value="build"/>
@@ -162,19 +135,6 @@
 			</sound>
 		</skill>
 
-		<skill>
-			<type value="harvest"/>
-			<name value="harvest_wood_skill"/>
-			<ep-cost value="0"/>
-			<speed value="300"/>
-			<anim-speed value="90"/>
-			<animation path="models/worker_harversting_wood.g3d"/>
-			<sound enabled="true" start-time="0.5">
-				<sound-file path="$COMMONDATAPATH/sounds/worker_harvest_wood1.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/worker_harvest_wood2.wav"/>
-				<sound-file path="$COMMONDATAPATH/sounds/worker_harvest_wood3.wav"/>
-			</sound>
-		</skill>
 
 		<skill>
 			<type value="repair"/>
@@ -309,23 +269,6 @@
 			<hits-per-unit value="1"/>
 		</command>
 
-		<command>
-			<type value="harvest"/>
-			<name value="harvest_wood"/>
-			<image path="images/worker_harvest_wood.bmp"/>
-			<unit-requirements/>
-			<upgrade-requirements/>
-			<move-skill value="move_wood_skill"/>
-			<harvest-skill value="harvest_wood_skill"/>
-			<stop-loaded-skill value="stop_loaded_wood_skill"/>
-			<move-loaded-skill value="move_loaded_wood_skill"/>
-			<harvested-resources>
-				<resource name="wood"/>
-			</harvested-resources>
-			<max-load value="10"/>
-			<hits-per-unit value="1"/>
-		</command>
-
 		<command>
 			<type value="repair"/>
 			<name value="repair"/>
diff --git a/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml b/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
index 235b559..2706dfd 100644
--- a/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
+++ b/factions/tech/upgrades/advanced_architecture/advanced_architecture.xml
@@ -7,8 +7,8 @@
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="wood" amount="100"/>
-		<resource name="gold" amount="200"/>
+		<resource name="stone" amount="100"/>
+		<resource name="gold" amount="150"/>
 	</resource-requirements>
 	<effects/>
 	<max-hp value="0"/>
diff --git a/factions/tech/upgrades/blade_weapons/blade_weapons.xml b/factions/tech/upgrades/blade_weapons/blade_weapons.xml
index 91b1f5d..a8b1949 100644
--- a/factions/tech/upgrades/blade_weapons/blade_weapons.xml
+++ b/factions/tech/upgrades/blade_weapons/blade_weapons.xml
@@ -3,12 +3,12 @@
 <upgrade>
 	<image path="images/blade.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="600"/>
+	<time value="160"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
 		<resource name="gold" amount="150"/>
-		<resource name="wood" amount="100"/>
+		<resource name="stone" amount="150"/>
 	</resource-requirements>
 	<effects>
 		<unit name="swordman"/>
diff --git a/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml b/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
index f265452..9bc8266 100644
--- a/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
+++ b/factions/tech/upgrades/piercing_weapons/piercing_weapons.xml
@@ -3,13 +3,13 @@
 <upgrade>
 	<image path="images/piercing.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="600"/>
+	<time value="160"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
 		<resource name="gold" amount="150"/>
-		<resource name="wood" amount="150"/>
+		<resource name="stone" amount="150"/>
 	</resource-requirements>
 	<effects>
 		<unit name="archer"/>
diff --git a/factions/tech/upgrades/robotics/robotics.xml b/factions/tech/upgrades/robotics/robotics.xml
index 7d53e42..6815718 100644
--- a/factions/tech/upgrades/robotics/robotics.xml
+++ b/factions/tech/upgrades/robotics/robotics.xml
@@ -3,12 +3,12 @@
 <upgrade>
 	<image path="images/robotics.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="250"/>
+	<time value="200"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
 		<resource name="gold" amount="150"/>
-		<resource name="wood" amount="100"/>
+		<resource name="stone" amount="100"/>
 	</resource-requirements>
 	<effects>
 		<unit name="barracks"/>
diff --git a/factions/tech/upgrades/shield_level_1/shield_level_1.xml b/factions/tech/upgrades/shield_level_1/shield_level_1.xml
index 515b139..0768a72 100644
--- a/factions/tech/upgrades/shield_level_1/shield_level_1.xml
+++ b/factions/tech/upgrades/shield_level_1/shield_level_1.xml
@@ -3,12 +3,12 @@
 <upgrade>
 	<image path="images/shield1.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="300"/>
+	<time value="160"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="gold" amount="50"/>
-		<resource name="wood" amount="100"/>
+		<resource name="gold" amount="100"/>
+		<resource name="stone" amount="100"/>
 	</resource-requirements>
 	<effects>
 		<unit name="swordman"/>
diff --git a/factions/tech/upgrades/shield_level_2/shield_level_2.xml b/factions/tech/upgrades/shield_level_2/shield_level_2.xml
index c64e147..72fafff 100644
--- a/factions/tech/upgrades/shield_level_2/shield_level_2.xml
+++ b/factions/tech/upgrades/shield_level_2/shield_level_2.xml
@@ -3,14 +3,14 @@
 <upgrade>
 	<image path="images/shield2.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="600"/>
+	<time value="160"/>
 	<unit-requirements/>
 	<upgrade-requirements>
 		<upgrade name="shield_level_1"/>
 	</upgrade-requirements>
 	<resource-requirements>
-		<resource name="gold" amount="250"/>
-		<resource name="wood" amount="250"/>
+		<resource name="gold" amount="175"/>
+		<resource name="stone" amount="175"/>
 	</resource-requirements>
 	<effects>
 		<unit name="swordman"/>
diff --git a/factions/tech/upgrades/stables/stables.xml b/factions/tech/upgrades/stables/stables.xml
index f00d99c..916b3c0 100644
--- a/factions/tech/upgrades/stables/stables.xml
+++ b/factions/tech/upgrades/stables/stables.xml
@@ -7,8 +7,8 @@
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
-		<resource name="gold" amount="200"/>
-		<resource name="wood" amount="150"/>
+		<resource name="gold" amount="150"/>
+		<resource name="stone" amount="150"/>
 	</resource-requirements>
 	<effects/>
 	<max-hp value="0"/>
diff --git a/factions/tech/upgrades/training_field/training_field.xml b/factions/tech/upgrades/training_field/training_field.xml
index 1568cdb..dcba44c 100644
--- a/factions/tech/upgrades/training_field/training_field.xml
+++ b/factions/tech/upgrades/training_field/training_field.xml
@@ -3,12 +3,12 @@
 <upgrade>
 	<image path="images/training_field.bmp"/>
 	<image-cancel path="../advanced_architecture/images/tech_upgrade_cancel.bmp"/>
-	<time value="300"/>
+	<time value="160"/>
 	<unit-requirements/>
 	<upgrade-requirements/>
 	<resource-requirements>
 		<resource name="gold" amount="150"/>
-		<resource name="wood" amount="150"/>
+		<resource name="stone" amount="150"/>
 	</resource-requirements>
 	<effects>
 		<unit name="barracks"/>