diff --git a/factions/magic/units/battlemage/battlemage.xml b/factions/magic/units/battlemage/battlemage.xml
index 4cab871..18e6c4f 100644
--- a/factions/magic/units/battlemage/battlemage.xml
+++ b/factions/magic/units/battlemage/battlemage.xml
@@ -78,8 +78,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="250"/>
-			<anim-speed value="100"/>
+			<speed value="330"/>
+			<anim-speed value="110"/>
 			<animation path="models/battlemage_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -88,8 +88,8 @@
 			<type value="attack"/>
 			<name value="attack_skill"/>
 			<ep-cost value="40"/>
-			<speed value="60"/>
-			<anim-speed value="60"/>
+			<speed value="90"/>
+			<anim-speed value="90"/>
 			<animation path="models/battlemage_attacking.g3d"/>
 			<sound enabled="true" start-time="0.3">
 				<sound-file path="sounds/battlemage_attack1.wav"/>
diff --git a/factions/magic/units/daemon/daemon.xml b/factions/magic/units/daemon/daemon.xml
index 103b626..bfacf50 100644
--- a/factions/magic/units/daemon/daemon.xml
+++ b/factions/magic/units/daemon/daemon.xml
@@ -63,7 +63,7 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="250"/>
+			<speed value="375"/>
 			<anim-speed value="150"/>
 			<animation path="models/daemon_walking.g3d"/>
 			<sound enabled="false"/>
diff --git a/factions/magic/units/initiate/initiate.xml b/factions/magic/units/initiate/initiate.xml
index 7afdec1..469c9d0 100644
--- a/factions/magic/units/initiate/initiate.xml
+++ b/factions/magic/units/initiate/initiate.xml
@@ -79,8 +79,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="150"/>
-			<anim-speed value="130"/>
+			<speed value="200"/>
+			<anim-speed value="160"/>
 			<animation path="models/initiate_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
diff --git a/factions/tech/units/archer/archer.xml b/factions/tech/units/archer/archer.xml
index 532f556..1fbfbf3 100644
--- a/factions/tech/units/archer/archer.xml
+++ b/factions/tech/units/archer/archer.xml
@@ -83,8 +83,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="220"/>
-			<anim-speed value="125"/>
+			<speed value="330"/>
+			<anim-speed value="109"/>
 			<animation path="models/archer_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -93,8 +93,8 @@
 			<type value="attack"/>
 			<name value="attack_skill"/>
 			<ep-cost value="0"/>
-			<speed value="50"/>
-			<anim-speed value="50"/>
+			<speed value="75"/>
+			<anim-speed value="75"/>
 			<animation path="models/archer_attacking.g3d"/>
 			<sound enabled="true" start-time="0.5">
 				<sound-file path="$COMMONDATAPATH/sounds/archer_attack1.wav"/>
diff --git a/factions/tech/units/battle_machine/battle_machine.xml b/factions/tech/units/battle_machine/battle_machine.xml
index 888b684..57bc0b0 100644
--- a/factions/tech/units/battle_machine/battle_machine.xml
+++ b/factions/tech/units/battle_machine/battle_machine.xml
@@ -73,8 +73,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="170"/>
-			<anim-speed value="90"/>
+			<speed value="204"/>
+			<anim-speed value="108"/>
 			<animation path="models/battle_machine_walking.g3d"/>
 			<sound enabled="true" start-time="0">
 				<sound-file path="sounds/machine_walk1.wav"/>
@@ -167,8 +167,8 @@
 			<type value="move"/>
 			<name value="charge_skill"/>
 			<ep-cost value="0"/>
-			<speed value="240"/>
-			<anim-speed value="100"/>
+			<speed value="288"/>
+			<anim-speed value="120"/>
 			<animation path="models/battle_machine_charging.g3d"/>
 			<sound enabled="true" start-time="0">
 				<sound-file path="sounds/machine_walk1.wav"/>
diff --git a/factions/tech/units/guard/guard.xml b/factions/tech/units/guard/guard.xml
index 80e82bc..02db80e 100644
--- a/factions/tech/units/guard/guard.xml
+++ b/factions/tech/units/guard/guard.xml
@@ -67,8 +67,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="170"/>
-			<anim-speed value="120"/>
+			<speed value="300"/>
+			<anim-speed value="180"/>
 			<animation path="models/guard_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -128,8 +128,8 @@
 			<type value="move"/>
 			<name value="charge_skill"/>
 			<ep-cost value="0"/>
-			<speed value="170"/>
-			<anim-speed value="120"/>
+			<speed value="300"/>
+			<anim-speed value="180"/>
 			<animation path="models/guard_charging.g3d"/>
 			<sound enabled="false"/>
 		</skill>
diff --git a/factions/tech/units/horseman/horseman.xml b/factions/tech/units/horseman/horseman.xml
index f14e0e6..3fc3011 100644
--- a/factions/tech/units/horseman/horseman.xml
+++ b/factions/tech/units/horseman/horseman.xml
@@ -86,8 +86,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="480"/>
-			<anim-speed value="120"/>
+			<speed value="624"/>
+			<anim-speed value="156"/>
 			<animation path="models/horseman_walking.g3d"/>
 			<sound enabled="true" start-time="0">
 				<sound-file path="$COMMONDATAPATH/sounds/horseman_walk1.wav"/>
diff --git a/factions/tech/units/swordman/swordman.xml b/factions/tech/units/swordman/swordman.xml
index 9c69caf..d27427f 100644
--- a/factions/tech/units/swordman/swordman.xml
+++ b/factions/tech/units/swordman/swordman.xml
@@ -68,8 +68,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="220"/>
-			<anim-speed value="90"/>
+			<speed value="330"/>
+			<anim-speed value="109"/>
 			<animation path="models/swordman_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -78,8 +78,8 @@
 			<type value="move"/>
 			<name value="charge_skill"/>
 			<ep-cost value="0"/>
-			<speed value="220"/>
-			<anim-speed value="125"/>
+			<speed value="330"/>
+			<anim-speed value="109"/>
 			<animation path="models/swordman_charging.g3d"/>
 			<sound enabled="false"/>
 		</skill>
diff --git a/factions/tech/units/technician/technician.xml b/factions/tech/units/technician/technician.xml
index ada85f6..9058661 100644
--- a/factions/tech/units/technician/technician.xml
+++ b/factions/tech/units/technician/technician.xml
@@ -10,7 +10,7 @@
 		<armor value="0"/>
 		<armor-type value="leather"/>
 		<sight value="8"/>
-		<time value="80"/>
+		<time value="20"/>
 		<multi-selection value="true"/>
 		<cellmap value="false"/>
 		<levels/>
@@ -89,8 +89,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="210"/>
-			<anim-speed value="210"/>
+			<speed value="280"/>
+			<anim-speed value="170"/>
 			<animation path="models/technician_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -127,8 +127,8 @@
 			<type value="attack"/>
 			<name value="molotov_skill"/>
 			<ep-cost value="0"/>
-			<speed value="35"/>
-			<anim-speed value="35"/>
+			<speed value="70"/>
+			<anim-speed value="70"/>
 			<animation path="models/technician_attacking.g3d"/>
 			<sound enabled="true" start-time="0.5">
 				<sound-file path="sounds/technician_attack.wav"/>
diff --git a/factions/tech/units/worker/worker.xml b/factions/tech/units/worker/worker.xml
index edbd236..12dcf35 100644
--- a/factions/tech/units/worker/worker.xml
+++ b/factions/tech/units/worker/worker.xml
@@ -86,8 +86,8 @@
 			<type value="move"/>
 			<name value="move_skill"/>
 			<ep-cost value="0"/>
-			<speed value="190"/>
-			<anim-speed value="130"/>
+			<speed value="240"/>
+			<anim-speed value="163"/>
 			<animation path="models/worker_walking.g3d"/>
 			<sound enabled="false"/>
 		</skill>
@@ -303,8 +303,7 @@
 				<unit name="blacksmith"/>
 				<unit name="defense_tower"/>
 				<unit name="technodrome"/>
-				<unit name="castle"/>
-                                <unit name="aerodrome"/>
+                <unit name="aerodrome"/>
 			</repaired-units>
 		</command>