diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 0e2878cae..c5db5ffd4 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1871,7 +1871,6 @@ report(FILE *F, faction * f, const faction_list * addresses,
 			ADDMSG(&f->msgs, msg_message("changepasswd",
 				"value", gc_add(strdup(f->passw))));
 		}
-		*/
 		/* Was tut das? */
 		RENDER(f, buf, sizeof(buf), ("newbie_password", "password", f->passw));
 		rnl(F);
diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 60b9fbb10..2d23ab92a 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -145,6 +145,9 @@ static attrib_type at_driveweight = {
 int
 personcapacity(const unit *u)
 {
+#if RACE_CAPACITY
+	int cap = u->race->weight+u->race->capacity;
+#else
 	int cap = u->race->weight+540;
 
 	if (old_race(u->race) == RC_TROLL)
@@ -153,7 +156,8 @@ personcapacity(const unit *u)
 	else if(old_race(u->race) == RC_GOBLIN)
 		cap -= 100;
 #endif
-
+#endif
+	
 	if (fspecial(u->faction, FS_QUICK))
 		cap -= 200;
 
diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c
index 9f6d52534..3df5d4bbf 100644
--- a/src/common/kernel/race.c
+++ b/src/common/kernel/race.c
@@ -618,6 +618,9 @@ tagbegin(struct xml_stack * stack)
 			rc->recruitcost = xml_ivalue(tag, "recruitcost");
 			rc->maintenance = xml_ivalue(tag, "maintenance");
 			rc->weight = xml_ivalue(tag, "weight");
+#if RACE_CAPACITY
+			rc->capacity = xml_ivalue(tag, "capacity");
+#endif
 			rc->speed = xml_fvalue(tag, "speed");
 			rc->hitpoints = xml_ivalue(tag, "hp");
 			rc->def_damage = strdup(xml_value(tag, "damage"));
diff --git a/src/common/kernel/race.h b/src/common/kernel/race.h
index 005f27847..1546b4180 100644
--- a/src/common/kernel/race.h
+++ b/src/common/kernel/race.h
@@ -58,6 +58,7 @@ typedef struct race {
 	int maintenance;
 	int splitsize;
 	int weight;
+	int capacity;
 	double speed;
 	int hitpoints;
 	const char *def_damage;
diff --git a/src/res/races.xml b/src/res/races.xml
index 10e5e1a5d..bf6860bc5 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -1,5 +1,5 @@
 <races>
-	<race name="clone" magres="0.900000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="1000" speed="1.000000" hp="40" ac="0" damage="0d0" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk nolearn noteach noheal>
+	<race name="clone" magres="0.900000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="40" ac="0" damage="0d0" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk nolearn noteach noheal>
 		<ai splitsize="10000"></ai>
 		<skill name="sk_alchemy" modifier="-99"></skill>
 		<skill name="sk_crossbow" modifier="-99"></skill>
@@ -32,11 +32,11 @@
 		<skill name="sk_unarmed" modifier="-99"></skill>
 		<attack type="1" damage="0d0"></attack>
 	</race>
-	<race name="template" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="0" speed="10.000000" hp="10" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace fly swim walk shapeshift shapeshiftany giveitem giveperson giveunit getitem canguard recruitethereal recruitunlimited equipment>
+	<race name="template" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="0" capacity="0" speed="10.000000" hp="10" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace fly swim walk shapeshift shapeshiftany giveitem giveperson giveunit getitem canguard recruitethereal recruitunlimited equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="gnome" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" speed="1.000000" hp="50" ac="0" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk noteach canguard>
+	<race name="gnome" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="50" ac="0" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk noteach canguard>
 		<ai splitsize="10000"></ai>
 		<skill name="sk_tactics" modifier="1"></skill>
 		<skill name="sk_perception" modifier="1"></skill>
@@ -44,7 +44,7 @@
 		<skill name="sk_unarmed" modifier="1"></skill>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="museumghost" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" speed="1.000000" hp="50" ac="0" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk noteach canguard>
+	<race name="museumghost" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="50" ac="0" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk noteach canguard>
 		<ai splitsize="10000"></ai>
 		<skill name="sk_tactics" modifier="1"></skill>
 		<skill name="sk_perception" modifier="1"></skill>
@@ -58,7 +58,7 @@
 		<attack type="2" damage="5d600"></attack>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="ghast" magres="0.600000" maxaura="1.000000" regaura="1.000000" recruitcost="5" maintenance="0" weight="1000" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment>
+	<race name="ghast" magres="0.600000" maxaura="1.000000" regaura="1.000000" recruitcost="5" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment>
 		<ai splitsize="10000" attackrandom moverandom></ai>
 		<function name="name" value="nameghoul"></function>
 		<skill name="sk_crossbow" modifier="1"></skill>
@@ -76,7 +76,7 @@
 		<attack type="2" damage="1d30"></attack>
 		<attack type="2" damage="1d30"></attack>
 	</race>
-	<race name="ghoul" magres="0.300000" maxaura="1.000000" regaura="1.000000" recruitcost="5" maintenance="0" weight="1000" speed="1.000000" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment>
+	<race name="ghoul" magres="0.300000" maxaura="1.000000" regaura="1.000000" recruitcost="5" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment>
 		<ai splitsize="10000" attackrandom moverandom></ai>
 		<function name="name" value="nameghoul"></function>
 		<function name="age" value="ageghoul"></function>
@@ -94,7 +94,7 @@
 		<attack type="3" damage="1d2"></attack>
 		<attack type="2" damage="1d30"></attack>
 	</race>
-	<race name="juju-zombie" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="8" maintenance="0" weight="1000" speed="1.000000" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment resistbash resistcut resistpierce>
+	<race name="juju-zombie" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="8" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment resistbash resistcut resistpierce>
 		<ai splitsize="10000" attackrandom moverandom></ai>
 		<function name="name" value="namezombie"></function>
 		<skill name="sk_crossbow" modifier="1"></skill>
@@ -110,7 +110,7 @@
 		<attack type="3" damage="1d1"></attack>
 		<attack type="3" damage="1d1"></attack>
 	</race>
-	<race name="zombie" magres="0.200000" maxaura="1.000000" regaura="1.000000" recruitcost="4" maintenance="0" weight="1000" speed="1.000000" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants walk nolearn noteach noheal undead canguard equipment resistcut resistpierce>
+	<race name="zombie" magres="0.200000" maxaura="1.000000" regaura="1.000000" recruitcost="4" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants walk nolearn noteach noheal undead canguard equipment resistcut resistpierce>
 		<ai splitsize="10000" killpeasants attackrandom moverandom></ai>
 		<function name="name" value="namezombie"></function>
 		<function name="age" value="agezombie"></function>
@@ -125,7 +125,7 @@
 		<skill name="sk_unarmed" modifier="1"></skill>
 		<attack type="1" damage="1d7"></attack>
 	</race>
-	<race name="skeleton lord" magres="0.300000" maxaura="1.000000" regaura="1.000000" recruitcost="2" maintenance="0" weight="1000" speed="1.000000" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment resistcut resistpierce>
+	<race name="skeleton lord" magres="0.300000" maxaura="1.000000" regaura="1.000000" recruitcost="2" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants walk nolearn noteach absorbpeasants noheal undead canguard equipment resistcut resistpierce>
 		<ai splitsize="10000" attackrandom moverandom></ai>
 		<function name="name" value="nameskeleton"></function>
 		<skill name="sk_crossbow" modifier="1"></skill>
@@ -140,7 +140,7 @@
 		<attack type="1" damage="1d7"></attack>
 		<attack type="1" damage="1d7"></attack>
 	</race>
-	<race name="skeleton" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="0" maintenance="0" weight="500" speed="1.000000" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants walk nolearn noteach noheal undead canguard equipment resistcut resistpierce>
+	<race name="skeleton" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="0" maintenance="0" weight="500" capacity="540" speed="1.000000" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants walk nolearn noteach noheal undead canguard equipment resistcut resistpierce>
 		<ai splitsize="10000" killpeasants attackrandom moverandom></ai>
 		<function name="name" value="nameskeleton"></function>
 		<function name="age" value="ageskeleton"></function>
@@ -155,7 +155,7 @@
 		<skill name="sk_unarmed" modifier="1"></skill>
 		<attack type="1" damage="1d7"></attack>
 	</race>
-	<race name="centaur" magres="0.000000" maxaura="0.750000" regaura="0.750000" recruitcost="100" maintenance="10" weight="5000" speed="1.000000" hp="30" ac="0" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" playerrace walk horse giveitem giveperson giveunit getitem recruithorses equipment>
+	<race name="centaur" magres="0.000000" maxaura="0.750000" regaura="0.750000" recruitcost="100" maintenance="10" weight="5000" capacity="2040" speed="1.000000" hp="30" ac="0" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" playerrace walk horse giveitem giveperson giveunit getitem recruithorses equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_crossbow" modifier="1"></skill>
 		<skill name="sk_mining" modifier="-3"></skill>
@@ -183,11 +183,11 @@
 		<familiar race="nymph"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="shadow knight" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" speed="1.000000" hp="1" ac="0" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants walk nolearn noteach noblock>
+	<race name="shadow knight" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="5" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="1" ac="0" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants walk nolearn noteach noblock>
 		<ai splitsize="20000" moverandom></ai>
 		<attack type="1" damage="1d1"></attack>
 	</race>
-	<race name="sea serpent" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="20000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants swim noteach getitem canguard>
+	<race name="sea serpent" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="20000" capacity="5000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants swim noteach getitem canguard>
 		<ai splitsize="6" killpeasants attackrandom moverandom learn></ai>
 		<function name="name" value="namedragon"></function>
 		<function name="move" value="moveswimming"></function>
@@ -198,7 +198,7 @@
 		<attack type="6" spell="81"></attack>
 		<attack type="8" damage="1d10"></attack>
 	</race>
-	<race name="kraken" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="2.000000" hp="300" ac="0" damage="2d10" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" swim noteach giveitem getitem>
+	<race name="kraken" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="2.000000" hp="300" ac="0" damage="2d10" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" swim noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_perception" modifier="1"></skill>
@@ -232,7 +232,7 @@
 		<attack type="4" damage="1d10"></attack>
 		<attack type="4" damage="1d10"></attack>
 	</race>
-	<race name="giantturtle" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="900" ac="7" damage="2d50" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="5" swim walk noteach giveitem getitem>
+	<race name="giantturtle" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="1600" capacity="600" speed="1.000000" hp="900" ac="7" damage="2d50" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="5" swim walk noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_perception" modifier="1"></skill>
@@ -261,7 +261,7 @@
 		<skill name="sk_taxation" modifier="-99"></skill>
 		<attack type="4" damage="2d50"></attack>
 	</race>
-	<race name="dolphin" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="2.000000" hp="24" ac="0" damage="1d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="5" swim noteach giveitem getitem>
+	<race name="dolphin" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="2.000000" hp="24" ac="0" damage="1d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="5" swim noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -289,7 +289,7 @@
 		<skill name="sk_taxation" modifier="-99"></skill>
 		<attack type="4" damage="1d6"></attack>
 	</race>
-	<race name="tiger" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="30" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" walk noteach giveitem getitem>
+	<race name="tiger" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="30" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" walk noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -319,7 +319,7 @@
 		<attack type="4" damage="1d6"></attack>
 		<attack type="4" damage="1d6"></attack>
 	</race>
-	<race name="hellcat" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="40" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk noteach giveitem getitem resistpierce>
+	<race name="hellcat" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="40" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk noteach giveitem getitem resistpierce>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_perception" modifier="1"></skill>
@@ -349,7 +349,7 @@
 		<attack type="4" damage="1d6"></attack>
 		<attack type="4" damage="1d6"></attack>
 	</race>
-	<race name="owl" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="9" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="4" fly walk noteach giveitem getitem>
+	<race name="owl" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="9" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="4" fly walk noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_espionage" modifier="1"></skill>
@@ -380,7 +380,7 @@
 		<skill name="sk_taxation" modifier="-99"></skill>
 		<attack type="4" damage="1d4"></attack>
 	</race>
-	<race name="fairy" magres="0.800000" maxaura="1.000000" regaura="1.500000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="6" ac="0" damage="1d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="14" fly walk noteach giveitem getitem equipment>
+	<race name="fairy" magres="0.800000" maxaura="1.000000" regaura="1.500000" recruitcost="50" maintenance="0" weight="200" capacity="100" speed="1.000000" hp="6" ac="0" damage="1d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="14" fly walk noteach giveitem getitem equipment>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_stealth" modifier="5"></skill>
@@ -415,7 +415,7 @@
 		<attack type="4" damage="1d3"></attack>
 		<attack type="4" damage="1d3"></attack>
 	</race>
-	<race name="dreamcat" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="10" ac="0" damage="1d5" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="6" fly walk noteach giveitem getitem invinciblenonmagic>
+	<race name="dreamcat" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="10" ac="0" damage="1d5" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="6" fly walk noteach giveitem getitem invinciblenonmagic>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_magic" modifier="1"></skill>
@@ -446,7 +446,7 @@
 		<attack type="4" damage="1d5"></attack>
 		<attack type="4" damage="1d5"></attack>
 	</race>
-	<race name="imp" magres="0.500000" maxaura="1.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="10" ac="1" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="4" fly walk noteach giveitem getitem equipment>
+	<race name="imp" magres="0.500000" maxaura="1.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="10" ac="1" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="4" fly walk noteach giveitem getitem equipment>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -479,7 +479,7 @@
 		<attack type="1" damage="1d4"></attack>
 		<attack type="6" spell="81"></attack>
 	</race>
-	<race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants fly walk noteach giveitem getitem equipment invinciblenonmagic>
+	<race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants fly walk noteach giveitem getitem equipment invinciblenonmagic>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -510,7 +510,7 @@
 		<attack type="2" damage="2d30"></attack>
 		<attack type="3" damage="1d1"></attack>
 	</race>
-	<race name="wolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="25" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" scarepeasants walk noteach giveitem getitem>
+	<race name="wolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="25" ac="0" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" scarepeasants walk noteach giveitem getitem>
 		<ai splitsize="5000"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -540,7 +540,7 @@
 		<attack type="4" damage="1d4"></attack>
 		<attack type="4" damage="1d4"></attack>
 	</race>
-	<race name="unicorn" magres="0.900000" maxaura="1.500000" regaura="1.500000" recruitcost="50" maintenance="0" weight="50" speed="2.000000" hp="40" ac="0" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk noteach giveitem getitem>
+	<race name="unicorn" magres="0.900000" maxaura="1.500000" regaura="1.500000" recruitcost="50" maintenance="0" weight="5000" capacity="2000" speed="2.000000" hp="40" ac="0" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk noteach giveitem getitem>
 		<ai splitsize="9999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -571,7 +571,7 @@
 		<attack type="4" damage="3d12"></attack>
 		<attack type="4" damage="2d4"></attack>
 	</race>
-	<race name="nymph" magres="0.900000" maxaura="1.000000" regaura="1.500000" recruitcost="50" maintenance="0" weight="10" speed="1.000000" hp="15" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk noteach giveitem getitem equipment>
+	<race name="nymph" magres="0.900000" maxaura="1.000000" regaura="1.500000" recruitcost="50" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="15" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk noteach giveitem getitem equipment>
 		<ai splitsize="9999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_mining" modifier="-99"></skill>
@@ -601,7 +601,7 @@
 		<attack type="1" damage="1d4"></attack>
 		<attack type="2" damage="2d20"></attack>
 	</race>
-	<race name="songdragon" magres="0.990000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="10" speed="1.500000" hp="40" ac="1" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" fly walk noteach giveitem getitem>
+	<race name="songdragon" magres="0.990000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="1000" capacity="600" speed="1.500000" hp="40" ac="1" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" fly walk noteach giveitem getitem>
 		<ai splitsize="9999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -633,7 +633,7 @@
 		<attack type="4" damage="2d4"></attack>
 		<attack type="6" spell="81"></attack>
 	</race>
-	<race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="1" speed="1.000000" hp="10" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk noteach giveitem getitem>
+	<race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="100" capacity="50" speed="1.000000" hp="10" ac="0" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk noteach giveitem getitem>
 		<ai splitsize="9999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_espionage" modifier="5"></skill>
@@ -665,7 +665,7 @@
 		<attack type="4" damage="1d4"></attack>
 		<attack type="4" damage="1d4"></attack>
 	</race>
-	<race name="eagle" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.500000" hp="15" ac="0" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="2" fly walk noteach giveitem getitem>
+	<race name="eagle" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.500000" hp="15" ac="0" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="2" fly walk noteach giveitem getitem>
 		<ai splitsize="9999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -695,7 +695,7 @@
 		<skill name="sk_taxation" modifier="-99"></skill>
 		<attack type="4" damage="2d3"></attack>
 	</race>
-	<race name="tunnelworm" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="30000" speed="1.000000" hp="300" ac="6" damage="3d20" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="1" scarepeasants walk noteach giveitem getitem>
+	<race name="tunnelworm" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="30000" capacity="10000" speed="1.000000" hp="300" ac="6" damage="3d20" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="1" scarepeasants walk noteach giveitem getitem>
 		<ai splitsize="99999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -728,7 +728,7 @@
 		<attack type="4" damage="3d20"></attack>
 		<attack type="8" damage="1d10"></attack>
 	</race>
-	<race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="20" ac="0" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk noteach giveitem getitem>
+	<race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="20" ac="0" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk noteach giveitem getitem>
 		<ai splitsize="99999"></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="-99"></skill>
@@ -759,21 +759,21 @@
 		<skill name="sk_taxation" modifier="-99"></skill>
 		<attack type="4" damage="2d3"></attack>
 	</race>
-	<race name="direwolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="5" speed="1.000000" hp="20" ac="0" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk noteach giveperson>
+	<race name="direwolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="20" ac="0" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk noteach giveperson>
 		<ai splitsize="5000"></ai>
 		<attack type="4" damage="2d4"></attack>
 	</race>
-	<race name="peasant" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="10" speed="1.000000" hp="20" ac="0" damage="1d6" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" cannotmove noteach canguard>
+	<race name="peasant" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="20" ac="0" damage="1d6" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" cannotmove noteach canguard>
 		<ai splitsize="10000"></ai>
 		<attack type="1" damage="1d6"></attack>
 	</race>
-	<race name="braineater" magres="0.900000" maxaura="1.000000" regaura="1.000000" recruitcost="50000" maintenance="0" weight="1" speed="1.000000" hp="20" ac="1" damage="0d0" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="10" scarepeasants fly walk noteach canguard invinciblenonmagic>
+	<race name="braineater" magres="0.900000" maxaura="1.000000" regaura="1.000000" recruitcost="50000" maintenance="0" weight="100" capacity="50" speed="1.000000" hp="20" ac="1" damage="0d0" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="10" scarepeasants fly walk noteach canguard invinciblenonmagic>
 		<ai splitsize="500" killpeasants attackrandom moverandom learn></ai>
 		<attack type="2" damage="3d15"></attack>
 		<attack type="3" damage="1d1"></attack>
 		<attack type="4" damage="1d1"></attack>
 	</race>
-	<race name="toad" magres="0.200000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="1" speed="1.000000" hp="10" ac="0" damage="1d2" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" cannotmove giveitem giveperson giveunit getitem>
+	<race name="toad" magres="0.200000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="100" capacity="50" speed="1.000000" hp="10" ac="0" damage="1d2" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" cannotmove giveitem giveperson giveunit getitem>
 		<ai splitsize="1" attackrandom learn></ai>
 		<skill name="sk_alchemy" modifier="-10"></skill>
 		<skill name="sk_crossbow" modifier="-10"></skill>
@@ -805,55 +805,55 @@
 		<skill name="sk_stamina" modifier="-10"></skill>
 		<attack type="4" damage="1d2"></attack>
 	</race>
-	<race name="alp" magres="0.950000" maxaura="1.000000" regaura="1.000000" recruitcost="50000" maintenance="0" weight="0" speed="1.500000" hp="20" ac="2" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="20" fly walk nolearn noteach>
+	<race name="alp" magres="0.950000" maxaura="1.000000" regaura="1.000000" recruitcost="50000" maintenance="0" weight="0" capacity="0" speed="1.500000" hp="20" ac="2" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="20" fly walk nolearn noteach>
 		<ai splitsize="1"></ai>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="mountainguard" magres="0.500000" maxaura="1.000000" regaura="0.500000" recruitcost="50000" maintenance="0" weight="10000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove nolearn noteach noweapons canguard>
+	<race name="mountainguard" magres="0.500000" maxaura="1.000000" regaura="0.500000" recruitcost="50000" maintenance="0" weight="10000" capacity="2000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove nolearn noteach noweapons canguard>
 		<ai splitsize="1"></ai>
 		<attack type="4" damage="2d40"></attack>
 	</race>
-	<race name="shadowmaster" magres="0.750000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="500" speed="1.000000" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants walk noteach desert>
+	<race name="shadowmaster" magres="0.750000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants walk noteach desert>
 		<ai splitsize="50" killpeasants attackrandom moverandom learn></ai>
 		<function name="name" value="nameshadow"></function>
 		<attack type="4" damage="2d4"></attack>
 		<attack type="2" damage="2d30"></attack>
 		<attack type="3" damage="1d2"></attack>
 	</race>
-	<race name="shadowdemon" magres="0.750000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="500" speed="1.000000" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants walk noteach desert recruitethereal>
+	<race name="shadowdemon" magres="0.750000" maxaura="1.000000" regaura="1.000000" recruitcost="5000" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants walk noteach desert recruitethereal>
 		<ai splitsize="1000" killpeasants attackrandom moverandom learn></ai>
 		<function name="name" value="nameshadow"></function>
 		<attack type="4" damage="2d3"></attack>
 		<attack type="3" damage="1d1"></attack>
 	</race>
-	<race name="stone golem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" speed="1.000000" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
+	<race name="stone golem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
 		<ai splitsize="50"></ai>
 		<skill name="sk_building" modifier="14"></skill>
 		<skill name="sk_roadwork" modifier="14"></skill>
 		<attack type="4" damage="2d10+4"></attack>
 	</race>
-	<race name="irongolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" speed="1.000000" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
+	<race name="irongolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
 		<ai splitsize="50"></ai>
 		<skill name="sk_armorer" modifier="14"></skill>
 		<skill name="sk_weaponsmithing" modifier="14"></skill>
 		<attack type="4" damage="2d8+4"></attack>
 	</race>
-	<race name="spell" magres="0.000000" maxaura="1.000000" regaura="0.100000" recruitcost="0" maintenance="0" weight="0" speed="0.000000" hp="1" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" nolearn noheal noweapons illusionary fly swim walk>
+	<race name="spell" magres="0.000000" maxaura="1.000000" regaura="0.100000" recruitcost="0" maintenance="0" weight="0" capacity="0" speed="0.000000" hp="1" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" nolearn noheal noweapons illusionary fly swim walk>
 		<ai splitsize="1"></ai>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="special" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="0" speed="0.000000" hp="1" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0">
+	<race name="special" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="0" maintenance="0" weight="0" capacity="0" speed="0.000000" hp="1" ac="0" damage="1d4" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0">
 		<ai splitsize="1"></ai>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="dracoid" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="1000" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" walk noteach giveitem giveperson getitem canguard equipment>
+	<race name="dracoid" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" walk noteach giveitem giveperson getitem canguard equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<function name="name" value="namedracoid"></function>
 		<attack type="4" damage="1d6"></attack>
 		<attack type="4" damage="1d6"></attack>
 		<attack type="1" damage="1d5"></attack>
 	</race>
-	<race name="catdragon" magres="0.900000" maxaura="1.000000" regaura="1.000000" recruitcost="500000" maintenance="0" weight="20000" speed="1.000000" hp="20" ac="0" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="50" fly walk noteach shapeshift giveitem giveperson getitem>
+	<race name="catdragon" magres="0.900000" maxaura="1.000000" regaura="1.000000" recruitcost="500000" maintenance="0" weight="20000" capacity="10000" speed="1.000000" hp="20" ac="0" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="50" fly walk noteach shapeshift giveitem giveperson getitem>
 		<ai splitsize="1"></ai>
 		<function name="itemdrop" value="dragondrops"></function>
 		<attack type="4" damage="2d40"></attack>
@@ -861,12 +861,12 @@
 		<attack type="4" damage="2d40"></attack>
 		<attack type="4" damage="2d40"></attack>
 	</race>
-	<race name="ent" magres="0.250000" maxaura="1.000000" regaura="0.500000" recruitcost="5000" maintenance="0" weight="5000" speed="1.000000" hp="50" ac="4" damage="2d4+12" unarmedattack="0" unarmeddefense="0" attackmodifier="9" defensemodifier="7" scarepeasants walk noteach canguard>
+	<race name="ent" magres="0.250000" maxaura="1.000000" regaura="0.500000" recruitcost="5000" maintenance="0" weight="5000" capacity="2500" speed="1.000000" hp="50" ac="4" damage="2d4+12" unarmedattack="0" unarmeddefense="0" attackmodifier="9" defensemodifier="7" scarepeasants walk noteach canguard>
 		<ai splitsize="1000" moverandom learn></ai>
 		<attack type="4" damage="2d12"></attack>
 		<attack type="4" damage="2d12"></attack>
 	</race>
-	<race name="wyrm" magres="0.900000" maxaura="1.000000" regaura="3.000000" recruitcost="250000" maintenance="0" weight="180000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants fly walk noteach getitem canguard>
+	<race name="wyrm" magres="0.900000" maxaura="1.000000" regaura="3.000000" recruitcost="250000" maintenance="0" weight="180000" capacity="100000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants fly walk noteach getitem canguard>
 		<ai splitsize="1" killpeasants attackrandom learn></ai>
 		<function name="name" value="namedragon"></function>
 		<function name="move" value="movedragon"></function>
@@ -878,7 +878,7 @@
 		<attack type="4" damage="5d30"></attack>
 		<attack type="6" spell="83"></attack>
 	</race>
-	<race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="60000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants fly walk noteach getitem canguard>
+	<race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" recruitcost="50000" maintenance="0" weight="60000" capacity="30000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants fly walk noteach getitem canguard>
 		<ai splitsize="2" killpeasants attackrandom learn></ai>
 		<function name="name" value="namedragon"></function>
 		<function name="age" value="agedragon"></function>
@@ -891,7 +891,7 @@
 		<attack type="4" damage="3d30"></attack>
 		<attack type="6" spell="82"></attack>
 	</race>
-	<race name="young dragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="10000" maintenance="0" weight="20000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants fly walk noteach getitem canguard>
+	<race name="young dragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" recruitcost="10000" maintenance="0" weight="20000" capacity="10000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants fly walk noteach getitem canguard>
 		<ai splitsize="6" killpeasants attackrandom learn></ai>
 		<function name="name" value="namedragon"></function>
 		<function name="age" value="agefiredragon"></function>
@@ -903,19 +903,19 @@
 		<attack type="4" damage="1d30"></attack>
 		<attack type="6" spell="81"></attack>
 	</race>
-	<race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="0" speed="1.000000" hp="1" ac="0" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" walk nolearn noteach noweapons illusionary>
+	<race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" maintenance="0" weight="0" capacity="0" speed="1.000000" hp="1" ac="0" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="0" defensemodifier="0" walk nolearn noteach noweapons illusionary>
 		<ai splitsize="999999"></ai>
 		<function name="age" value="ageillusion"></function>
 		<attack type="1" damage="1d1"></attack>
 	</race>
-	<race name="undead" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="2" maintenance="0" weight="1000" speed="1.000000" hp="20" ac="0" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants walk nolearn noteach noheal undead canguard equipment>
+	<race name="undead" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="2" maintenance="0" weight="1000" capacity="540" speed="1.000000" hp="20" ac="0" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants walk nolearn noteach noheal undead canguard equipment>
 		<ai splitsize="20000" attackrandom moverandom></ai>
 		<function name="name" value="nameundead"></function>
 		<function name="age" value="ageundead"></function>
 		<attack type="4" damage="1d7"></attack>
 		<attack type="5"></attack>
 	</race>
-	<race name="aquarian" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="aquarian" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_mining" modifier="-2"></skill>
 		<skill name="sk_building" modifier="-1"></skill>
@@ -933,7 +933,7 @@
 		<familiar race="dolphin"></familiar>
 		<familiar race="kraken"></familiar>
 	</race>
-	<race name="cat" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="1" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="cat" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="1" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_alchemy" modifier="-1"></skill>
 		<skill name="sk_mining" modifier="-2"></skill>
@@ -958,7 +958,7 @@
 		<familiar race="tiger"></familiar>
 		<familiar race="hellcat"></familiar>
 	</race>
-	<race name="halfling" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" speed="1.000000" hp="18" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="halfling" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_crossbow" modifier="1"></skill>
 		<skill name="sk_mining" modifier="1"></skill>
@@ -989,7 +989,7 @@
 		<familiar race="eagle"></familiar>
 		<familiar race="rat"></familiar>
 	</race>
-	<race name="insect" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="insect" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="80" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_crossbow" modifier="1"></skill>
 		<skill name="sk_mining" modifier="1"></skill>
@@ -1017,7 +1017,7 @@
 		<familiar race="tunnelworm"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="demon" magres="0.150000" maxaura="1.000000" regaura="1.250000" recruitcost="150" maintenance="10" weight="1000" speed="1.000000" hp="50" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk shapeshift giveitem giveperson giveunit getitem recruitethereal equipment>
+	<race name="demon" magres="0.150000" maxaura="1.000000" regaura="1.250000" recruitcost="150" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="50" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk shapeshift giveitem giveperson giveunit getitem recruitethereal equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="2"></skill>
@@ -1048,7 +1048,7 @@
 		<familiar race="wolf"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="troll" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="2000" speed="1.000000" hp="30" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="troll" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="90" maintenance="10" weight="2000" capacity="1080" speed="1.000000" hp="30" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_mining" modifier="2"></skill>
 		<skill name="sk_bow" modifier="-2"></skill>
@@ -1078,7 +1078,7 @@
 		<familiar race="tunnelworm"></familiar>
 		<familiar race="wolf"></familiar>
 	</race>
-	<race name="human" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="human" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="75" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_trade" modifier="1"></skill>
 		<skill name="sk_herbalism" modifier="-1"></skill>
@@ -1093,7 +1093,7 @@
 		<familiar race="eagle"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="40" maintenance="10" weight="600" speed="1.000000" hp="16" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="0" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="40" maintenance="10" weight="600" capacity="440" speed="1.000000" hp="16" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="0" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<function name="initfamiliar" value="oldfamiliars"></function>
 		<skill name="sk_alchemy" modifier="1"></skill>
@@ -1118,7 +1118,7 @@
 		<familiar race="rat"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="snotling" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_alchemy" modifier="1"></skill>
 		<skill name="sk_mining" modifier="1"></skill>
@@ -1148,7 +1148,7 @@
 		<familiar race="demon"></familiar>
 	</race>
 
-	<race name="orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" walk giveitem giveperson giveunit getitem equipment>
+	<race name="orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_alchemy" modifier="1"></skill>
 		<skill name="sk_mining" modifier="1"></skill>
@@ -1177,7 +1177,7 @@
 		<familiar race="wolf"></familiar>
 		<familiar race="demon"></familiar>
 	</race>
-	<race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" speed="1.000000" hp="18" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_alchemy" modifier="-1"></skill>
 		<skill name="sk_mining" modifier="-2"></skill>
@@ -1203,7 +1203,7 @@
 		<familiar race="unicorn"></familiar>
 		<familiar race="imp"></familiar>
 	</race>
-	<race name="dwarf" magres="0.050000" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="dwarf" magres="0.050000" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_mining" modifier="2"></skill>
 		<skill name="sk_bow" modifier="-1"></skill>
@@ -1234,7 +1234,7 @@
 		<familiar race="wolf"></familiar>
 		<familiar race="rat"></familiar>
 	</race>
-	<race name="uruk" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
+	<race name="uruk" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" ac="0" damage="1d5" unarmedattack="-2" unarmeddefense="-2" attackmodifier="0" defensemodifier="0" playerrace walk giveitem giveperson giveunit getitem equipment>
 		<ai splitsize="10000" attackrandom moverandom learn></ai>
 		<skill name="sk_alchemy" modifier="1"></skill>
 		<skill name="sk_mining" modifier="1"></skill>
@@ -1263,7 +1263,7 @@
 		<familiar race="wolf"></familiar>
 		<familiar race="demon"></familiar>
 	</race>
-	<race name="shadowdragon" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" maintenance="0" weight="1" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants fly walk noteach getitem canguard>
+	<race name="shadowdragon" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" maintenance="0" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants fly walk noteach getitem canguard>
 		<ai splitsize="1" killpeasants attackrandom learn></ai>
 		<function name="name" value="namedragon"></function>
 		<function name="move" value="movedragon"></function>
@@ -1278,12 +1278,12 @@
 		<attack type="6" spell="175"></attack>
 		<precombatspell spell="176"></precombatspell>
 	</race>
-	<race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="5" speed="1.000000" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants fly walk noteach getitem>
+	<race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="500" capacity="200" speed="1.000000" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants fly walk noteach getitem>
 		<ai splitsize="5000" killpeasants></ai>
 		<attack type="4" damage="1d6"></attack>
 		<attack type="3" damage="1d1"></attack>
 	</race>
-	<race name="nightmare" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="1" speed="1.000000" hp="80" ac="10" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants fly walk noteach getitem invinciblenonmagic>
+	<race name="nightmare" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="100" capacity="540" speed="1.000000" hp="80" ac="10" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants fly walk noteach getitem invinciblenonmagic>
 		<ai splitsize="500" killpeasants></ai>
 		<attack type="4" damage="1d4"></attack>
 		<attack type="4" damage="1d4"></attack>
@@ -1291,7 +1291,7 @@
 		<attack type="3" damage="1d4"></attack>
 		<attack type="2" damage="1d10"></attack>
 	</race>
-	<race name="vampunicorn" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="5" speed="1.000000" hp="30" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants walk noteach getitem>
+	<race name="vampunicorn" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="500" maintenance="0" weight="5000" capacity="2000" speed="1.000000" hp="30" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants walk noteach getitem>
 		<ai splitsize="5000" killpeasants></ai>
 		<attack type="4" damage="2d10"></attack>
 		<attack type="3" damage="1d4"></attack>