diff --git a/src/combined/gamecode.c b/src/combined/gamecode.c
index 614ba9002..64252598c 100644
--- a/src/combined/gamecode.c
+++ b/src/combined/gamecode.c
@@ -27,6 +27,7 @@
 #include "common/gamecode/items.c"
 #include "common/gamecode/laws.c"
 #include "common/gamecode/luck.c"
+#include "common/gamecode/market.c"
 #include "common/gamecode/monster.c"
 #include "common/gamecode/randenc.c"
 #include "common/gamecode/report.c"
diff --git a/src/common/gamecode.vcproj b/src/common/gamecode.vcproj
index 9c3ad2b70..fcc9f7dc2 100644
--- a/src/common/gamecode.vcproj
+++ b/src/common/gamecode.vcproj
@@ -288,6 +288,14 @@
 				RelativePath=".\gamecode\luck.h"
 				>
 			</File>
+			<File
+				RelativePath=".\gamecode\market.c"
+				>
+			</File>
+			<File
+				RelativePath=".\gamecode\market.h"
+				>
+			</File>
 			<File
 				RelativePath=".\gamecode\monster.c"
 				>
diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index 52935dba1..334c00d77 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -615,18 +615,13 @@ recruit(unit * u, struct order * ord, request ** recruitorders)
   addlist(recruitorders, o);
 }
 
-#define GIVE_SELF 1
-#define GIVE_PEASANTS 2
-#define GIVE_OTHERS 4
-#define GIVE_ANY (GIVE_SELF|GIVE_PEASANTS|GIVE_OTHERS)
-
 static void
 give_cmd(unit * u, order * ord)
 {
   region * r = u->region;
   unit *u2;
   const char *s;
-  int i, n, rule;
+  int i, n, rule = rule_give();
   const item_type * itype;
   param_t p;
 
@@ -639,7 +634,6 @@ give_cmd(unit * u, order * ord)
     return;
   }
 
-  rule = get_param_int(global.parameters, "rules.give", 7);
   if (getunitpeasants && (rule & GIVE_PEASANTS)==0) {
     ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_give_forbidden", ""));
     return;
@@ -1508,7 +1502,7 @@ allocate_resource(unit * u, const resource_type * rtype, int want)
   /* nun ist amount die Gesamtproduktion der Einheit (in punkten) */
   
   /* mit Flinkfingerring verzehnfacht sich die Produktion */
-  amount += skill * MIN(u->number, get_item(u,I_RING_OF_NIMBLEFINGER)) * 9;
+  amount += skill * MIN(u->number, get_item(u, I_RING_OF_NIMBLEFINGER)) * (roqf_factor()-1);
   
   /* Schaffenstrunk: */
   if ((dm = get_effect(u, oldpotiontype[P_DOMORE])) != 0) {
@@ -2918,9 +2912,9 @@ steal_cmd(unit * u, struct order * ord, request ** stealorders)
 		}
 	}
 
-	i = MIN(u->number, get_item(u,I_RING_OF_NIMBLEFINGER));
+	i = MIN(u->number, get_item(u, I_RING_OF_NIMBLEFINGER));
 	if (i > 0) {
-		n *= STEALINCOME * (u->number + i * 9);
+		n *= STEALINCOME * (u->number + i * (roqf_factor()-1));
 	} else {
 		n *= u->number * STEALINCOME;
 	}
diff --git a/src/common/gamecode/give.h b/src/common/gamecode/give.h
index 929dcbcaf..9f4e16a64 100644
--- a/src/common/gamecode/give.h
+++ b/src/common/gamecode/give.h
@@ -10,8 +10,8 @@
  without prior permission by the authors of Eressea.
 
  */
-#ifndef H_KRNL_GIVE
-#define H_KRNL_GIVE
+#ifndef H_GC_GIVE
+#define H_GC_GIVE
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index fb27ca925..4f7541c45 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -35,6 +35,7 @@
 #include "randenc.h"
 #include "spy.h"
 #include "study.h"
+#include "market.h"
 
 /* kernel includes */
 #include <kernel/alchemy.h>
@@ -997,7 +998,7 @@ quit_cmd(unit * u, struct order * ord)
         } else {
           variant var;
           var.i = f2_id;
-          object_create("quit", TINTEGER, var);
+          a_add(&f->attribs, object_create("quit", TINTEGER, var));
         }
       }
     }
@@ -1018,6 +1019,7 @@ quit(void)
     faction * f = *fptr;
     if (f->flags & FFL_QUIT) {
       if (EnhancedQuit()) {
+        /* this doesn't work well (use object_name()) */
         attrib * a = a_find(f->attribs, &at_object);
         if (a) {
           variant var;
@@ -2916,6 +2918,10 @@ age_building(building * b)
   a_age(&b->attribs);
   handle_event(b->attribs, "timer", b);
 
+  if (b->type->age) {
+    b->type->age(b);
+  }
+
   return b;
 }
 
@@ -3005,7 +3011,8 @@ ageing(void)
     /* Gebäude */
     for (bp=&r->buildings;*bp;) {
       building * b = *bp;
-      b = age_building(b);
+      age_building(b);
+      if (b==*bp) bp = &b->next;
     }
 
     blargest = largestbuilding(r, &is_tax_building, false);
@@ -3922,6 +3929,10 @@ processorders (void)
     create_wormholes();
   }
 
+  if (get_param_int(global.parameters, "modules.markets", 0)) {
+    do_markets();
+  }
+
   /* immer ausführen, wenn neue Sprüche dazugekommen sind, oder sich
    * Beschreibungen geändert haben */
   update_spells();
diff --git a/src/common/gamecode/market.c b/src/common/gamecode/market.c
new file mode 100644
index 000000000..ed021ccea
--- /dev/null
+++ b/src/common/gamecode/market.c
@@ -0,0 +1,160 @@
+/* vi: set ts=2:
++-------------------+  Christian Schlittchen <corwin@amber.kn-bremen.de>
+|                   |  Enno Rehling <enno@eressea.de>
+| Eressea PBEM host |  Katja Zedel <katze@felidae.kn-bremen.de>
+| (c) 1998 - 2003   |  Henning Peters <faroul@beyond.kn-bremen.de>
+|                   |  Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
++-------------------+  Stefan Reich <reich@halbling.de>
+
+This program may not be used, modified or distributed 
+without prior permission by the authors of Eressea.
+
+*/
+#include <config.h>
+#include <kernel/eressea.h>
+#include "market.h"
+
+#include <assert.h>
+
+#include <util/attrib.h>
+#include <util/rng.h>
+
+#include <kernel/building.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/message.h>
+#include <kernel/region.h>
+#include <kernel/unit.h>
+
+static unsigned int
+get_markets(region * r, unit ** results, size_t size)
+{
+  unsigned int n = 0;
+  building * b;
+  static building_type * btype;
+  if (!btype) btype = bt_find("market");
+  if (!btype) return 0;
+  for (b=r->buildings;n<size && b;b=b->next) {
+    if (b->type==btype && (b->flags&BLD_WORKING)) {
+      unit * u = buildingowner(r, b);
+      unsigned int i;
+      for (i=0;u && i!=n;++i) {
+        /* only one market per faction */
+        if (results[i]->faction==u->faction) u = NULL;
+      }
+      if (u) {
+        results[n++] = u;
+      }
+    }
+  }
+  return n;
+}
+
+
+static void
+free_market(attrib * a)
+{
+  item * items = (item *)a->data.v;
+  i_freeall(&items);
+  a->data.v = 0;
+}
+
+const item_type * r_luxury(region * r)
+{
+  const luxury_type * ltype;
+  for (ltype = luxurytypes;ltype;ltype=ltype->next) {
+    if (r_demand(r, ltype)<0) return ltype->itype;
+  }
+  return NULL;
+}
+
+attrib_type at_market = {
+  "script",
+  NULL, free_market, NULL,
+  NULL, NULL, ATF_UNIQUE
+};
+
+#define MAX_MARKETS 128
+void do_markets(void)
+{
+  unit_list * traders = 0;
+  unit * markets[MAX_MARKETS];
+  region * r;
+  for (r=regions;r;r=r->next) {
+    if (r->land) {
+      int p = rpeasants(r);
+      int numlux = p/1000;
+      int numherbs = p/500;
+      if (numlux>0 || numherbs>0) {
+        int d, nmarkets = 0;
+        const item_type * lux = r_luxury(r);
+        const item_type * herb = r->land->herbtype;
+
+        nmarkets += get_markets(r, markets+nmarkets, MAX_MARKETS-nmarkets);
+        for (d=0;d!=MAXDIRECTIONS;++d) {
+          region * r2 = rconnect(r, d);
+          if (r2 && r2->buildings) {
+            nmarkets += get_markets(r, markets+nmarkets, MAX_MARKETS-nmarkets);
+          }
+        }
+        while (lux && numlux--) {
+          int n = rng_int() % nmarkets;
+          unit * u = markets[n];
+          item * items;
+          attrib * a = a_find(u->attribs, &at_market);
+          if (a==NULL) {
+            unit_list * ulist = malloc(sizeof(unit_list));
+            a = a_add(&u->attribs, a_new(&at_market));
+            ulist->next = traders;
+            ulist->data = u;
+            traders = ulist;
+          }
+          items = (item *)a->data.v;
+          i_change(&items, lux, 1);
+          a->data.v = items;
+          /* give 1 luxury */
+        }
+        while (herb && numherbs--) {
+          int n = rng_int() % nmarkets;
+          unit * u = markets[n];
+          item * items;
+          attrib * a = a_find(u->attribs, &at_market);
+          if (a==NULL) {
+            unit_list * ulist = malloc(sizeof(unit_list));
+            a = a_add(&u->attribs, a_new(&at_market));
+            ulist->next = traders;
+            ulist->data = u;
+            traders = ulist;
+          }
+          items = (item *)a->data.v;
+          i_change(&items, herb, 1);
+          a->data.v = items;
+          /* give 1 luxury */
+        }
+      }
+    }
+  }
+
+  while (traders) {
+    unit_list * trade = traders;
+    unit * u = trade->data;
+    attrib * a = a_find(u->attribs, &at_market);
+    item * items = a->data.v;
+
+    while (items) {
+      item * itm = items;
+      items = itm->next;
+
+      if (itm->number) {
+        ADDMSG(&u->faction->msgs, msg_message("buyamount",
+          "unit amount resource", u, itm->number, itm->type->rtype));
+        i_add(&u->items, itm);
+      }
+    }
+
+    traders = trade->next;
+
+    a_remove(&u->attribs, a);
+    free(trade);
+  }
+}
diff --git a/src/common/gamecode/market.h b/src/common/gamecode/market.h
new file mode 100644
index 000000000..e45fbb7a1
--- /dev/null
+++ b/src/common/gamecode/market.h
@@ -0,0 +1,25 @@
+/* vi: set ts=2:
++-------------------+  Christian Schlittchen <corwin@amber.kn-bremen.de>
+|                   |  Enno Rehling <enno@eressea.de>
+| Eressea PBEM host |  Katja Zedel <katze@felidae.kn-bremen.de>
+| (c) 1998 - 2003   |  Henning Peters <faroul@beyond.kn-bremen.de>
+|                   |  Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
++-------------------+  Stefan Reich <reich@halbling.de>
+
+This program may not be used, modified or distributed 
+without prior permission by the authors of Eressea.
+
+*/
+#ifndef H_GC_MARKET
+#define H_GC_MARKET
+#ifdef __cplusplus
+extern "C" {
+#endif
+  struct building;
+
+  extern void do_markets(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 756b0a5fc..51a85e0ca 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -524,7 +524,7 @@ build_road(region * r, unit * u, int size, direction_t d)
     item * itm = *i_find(&u->items, olditemtype[I_RING_OF_NIMBLEFINGER]);
     if (itm!=NULL && itm->number>0) {
       int rings = MIN(u->number, itm->number);
-      n = n * (9*rings+u->number) / u->number;
+      n = n * ((roqf_factor()-1)*rings+u->number) / u->number;
     }
   }
   if (n < left) {
@@ -591,6 +591,15 @@ matmod(const attrib * a, const unit * u, const resource_type * material, int val
   return value;
 }
 
+int roqf_factor(void)
+{
+  int value = -1;
+  if (value<0) {
+    value = get_param_int(global.parameters, "rules.economy.roqf", 10);
+  }
+  return value;
+}
+
 /** Use up resources for building an object.
 * Build up to 'size' points of 'type', where 'completed'
 * of the first object have already been finished. return the
@@ -699,7 +708,7 @@ build(unit * u, const construction * ctype, int completed, int want)
       if (itm!=NULL) i = itm->number;
       if (i>0) {
         int rings = MIN(u->number, i);
-        n = n * (9*rings+u->number) / u->number;
+        n = n * ((roqf_factor()-1)*rings+u->number) / u->number;
       }
     }
 
diff --git a/src/common/kernel/build.h b/src/common/kernel/build.h
index 4468a00c7..a727d47ac 100644
--- a/src/common/kernel/build.h
+++ b/src/common/kernel/build.h
@@ -82,6 +82,7 @@ void reportevent(struct region * r, char *s);
 
 void shash(struct ship * sh);
 void sunhash(struct ship * sh);
+extern int roqf_factor(void);
 
 extern int build(struct unit * u, const construction * ctype, int completed, int want);
 extern int maxbuild(const struct unit *u, const construction *cons);
diff --git a/src/common/kernel/building.h b/src/common/kernel/building.h
index f0125733f..10da91bbc 100644
--- a/src/common/kernel/building.h
+++ b/src/common/kernel/building.h
@@ -61,6 +61,7 @@ typedef struct building_type {
 
 	const char * (*name)(const struct building_type*, int size);
 	void (*init)(struct building_type*);
+    void (*age)(struct building *);
 	struct attrib * attribs;
 } building_type;
 
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index 158d15b84..c9ce8c7df 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -3043,6 +3043,15 @@ entertainmoney(const region *r)
   return n;
 }
 
+int rule_give(void)
+{
+  static int value = -1;
+  if (value<0) {
+    value = get_param_int(global.parameters, "rules.give", 7);
+  }
+  return value;
+}
+
 /** releases all memory associated with the game state.
  * call this function before calling read_game() to load a new game
  * if you have a previously loaded state in memory.
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 762e672eb..fc3944a86 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -415,6 +415,14 @@ typedef struct helpmode {
 
 extern struct helpmode helpmodes[];
 
+extern int rule_give(void);
+
+#define GIVE_SELF 1
+#define GIVE_PEASANTS 2
+#define GIVE_OTHERS 4
+#define GIVE_ONDEATH 8
+#define GIVE_ANY (GIVE_SELF|GIVE_PEASANTS|GIVE_OTHERS)
+
 extern struct attrib_type at_guard;
 extern void free_gamedata(void);
 #if 1 /* disable to count all units */
diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c
index bc0171b99..4b72715a0 100644
--- a/src/common/kernel/faction.c
+++ b/src/common/kernel/faction.c
@@ -263,6 +263,7 @@ destroyfaction(faction * f)
   faction *ff;
 
   if (!f->alive) return;
+  fset(f, FFL_QUIT);
 
   freelist(f->spellbook);
 
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index 3ad2185fc..23a0c9a77 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -386,6 +386,7 @@ static const char * it_aliases[][2] = {
   { "Runenschwert", "runesword" },
   { "p12", "truthpotion" },
   { "p1", "goliathwater" },
+  { "p4", "ointment" },
   { "p5", "peasantblood" },
   { "p8", "nestwarmth" },
   { "diamond", "adamantium" },
@@ -927,7 +928,7 @@ static void
 init_oldpotions(void)
 {
   const char * potionnames[MAX_POTIONS] = {
-    "p0", "goliathwater", "p2", "p3", "p4", "peasantblood", "p6",
+    "p0", "goliathwater", "p2", "p3", "ointment", "peasantblood", "p6",
     "p7", "nestwarmth", "p9", "p10", "p11", "truthpotion", "p13",  "p14"
   };
   int p;
diff --git a/src/common/kernel/region.h b/src/common/kernel/region.h
index 097f128c8..3cf61d525 100644
--- a/src/common/kernel/region.h
+++ b/src/common/kernel/region.h
@@ -239,9 +239,9 @@ struct faction * region_get_owner(const struct region * r);
 
 struct region * r_connect(const struct region *, direction_t dir);
 #ifdef FAST_CONNECT
-# define rconnect(r, dir) ((r)->connect[dir]?(r)->connect[dir]:r_connect(r, dir))
+# define rconnect(r, dir) ((r)->connect[dir]?(r)->connect[dir]:r_connect(r, (direction_t)dir))
 #else
-# define rconnect(r, dir) r_connect(r, dir)
+# define rconnect(r, dir) r_connect(r, (direction_t)dir)
 #endif
 
 void free_regions(void);
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index f0d209a67..ef51d0be4 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -214,6 +214,13 @@ gift_items(unit * u, int flags)
   region * r = u->region;
   item ** itm_p = &u->items;
   int retval = 0;
+  int rule = rule_give();
+
+  if ((u->faction->flags&FFL_QUIT)==0 || (rule&GIVE_ONDEATH)==0) {
+    if ((rule&GIVE_OTHERS)==0 && (flags&GIFT_FRIENDS)) flags-=GIFT_FRIENDS;
+    if ((rule&GIVE_PEASANTS)==0 && (flags&GIFT_PEASANTS)) flags-=GIFT_PEASANTS;
+    if ((rule&GIVE_SELF)==0 && (flags&GIFT_SELF)) flags-=GIFT_SELF;
+  }
 
   if (u->items==NULL || fval(u->race, RCF_ILLUSIONARY)) return 0;
   if ((u->race->ec_flags & GIVEITEM) == 0) return 0;
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 498e16d64..ef5dd5126 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -313,6 +313,8 @@ parse_buildings(xmlDocPtr doc)
             btype->name = (const char * (*)(const struct building_type*, int))fun;
           } else if (strcmp((const char*)propValue, "init")==0) {
             btype->init = (void (*)(struct building_type*))fun;
+          } else if (strcmp((const char*)propValue, "age")==0) {
+            btype->age = (void (*)(struct building*))fun;
           } else {
             log_error(("unknown function type '%s' for building %s\n",
               (const char*)propValue, btype->_name));
diff --git a/src/eressea/tolua/helpers.c b/src/eressea/tolua/helpers.c
index 107a17989..5e5df8d88 100644
--- a/src/eressea/tolua/helpers.c
+++ b/src/eressea/tolua/helpers.c
@@ -345,6 +345,32 @@ lua_wage(const region * r, const faction * f, const race * rc)
   return result;
 }
 
+static void
+lua_agebuilding(building * b)
+{
+  lua_State * L = (lua_State *)global.vm_state;
+  char fname[64];
+
+  snprintf(fname, sizeof(fname), "age_%s", b->type->_name);
+
+  lua_pushstring(L, fname);
+  lua_rawget(L, LUA_GLOBALSINDEX);
+  if (lua_isfunction(L, 1)) {
+    tolua_pushusertype(L, (void *)b, "building");
+
+    if (lua_pcall(L, 1, 0, 0)!=0) {
+      const char* error = lua_tostring(L, -1);
+      log_error(("agebuilding(%s) calling '%s': %s.\n",
+        buildingname(b), fname, error));
+      lua_pop(L, 1);
+    }
+  } else {
+    log_error(("agebuilding(%s) calling '%s': not a function.\n",
+      buildingname(b), fname));
+    lua_pop(L, 1);
+  }
+}
+
 static int
 lua_maintenance(const unit * u)
 {
@@ -473,6 +499,7 @@ register_tolua_helpers(void)
 {
   at_building_action.age = lc_age;
 
+  register_function((pf_generic)&lua_agebuilding, "lua_agebuilding");
   register_function((pf_generic)&lua_recruit, "lua_recruit");
   register_function((pf_generic)&lua_callspell, "lua_castspell");
   register_function((pf_generic)&lua_initfamiliar, "lua_initfamiliar");
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index 2a9b21e33..6016d01d3 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -1772,7 +1772,7 @@
   <string name="p3">
     <text locale="de">Schaffenstrunk</text>
   </string>
-  <string name="p4">
+  <string name="ointment">
     <text locale="de">Wundsalbe</text>
   </string>
   <string name="peasantblood">
@@ -1818,7 +1818,7 @@
   <string name="p3_p">
     <text locale="de">Schaffenstrünke</text>
   </string>
-  <string name="p4_p">
+  <string name="ointment_p">
     <text locale="de">Wundsalben</text>
   </string>
   <string name="peasantblood_p">
@@ -3803,7 +3803,7 @@
       <text locale="en">Allow a Tangy Temerity to simmer for three hours in a litre of water, then add a grated Mandrake, and sprinkle in a Gapgrowth harvested at full moon. The whole brew should then be allowed to stew for three days in a warm place. This potion increases the strength and endurance of ten men so that they can achieve twice as much in a week.</text>
       <text locale="de">Man lasse einen Würzigen Wagemut drei Stunden lang in einem Liter Wasser köcheln. Dann gebe man eine geriebene Alraune dazu und bestreue das ganze mit bei Vollmond geerntetem Spaltwachs. Nun lasse man den Sud drei Tage an einem dunklen und warmen Ort ziehen und seie dann die Flüssigkeit ab. Dieser Schaffenstrunk erhöht die Kraft und Ausdauer von zehn Männern, so daß sie doppelt soviel schaffen können wie sonst.</text>
     </string>
-    <string name="p4">
+    <string name="ointment">
       <text locale="en">When one is severely wounded after a hard battle it is advisable to have some Ointment to hand. Applied to wounds, this magical paste closes them in the blink of an eye. For the preparation the alchemist requires a cobalt fungus, tangy temerity, and white hemlock. A dose of the potion heals up to 400 hitpoints.</text>
       <text locale="de">Ist man nach einem einem harten Kampf schwer verwundet, ist es ratsam, etwas Wundsalbe parat zu haben. Streicht man diese magische Paste auf die Wunden, schließen sich diese augenblicklich. Für die Herstellung benötigt der Alchemist nebst einem Blauen Baumringel einen Würzigen Wagemut und einen Weißen Wüterich. Eine solche Portion heilt bis zu 400 Lebenspunkte.</text>
     </string>
diff --git a/src/res/e2k9.xml b/src/res/e2k9.xml
index c62f56bd7..e99d29ac5 100644
--- a/src/res/e2k9.xml
+++ b/src/res/e2k9.xml
@@ -55,6 +55,7 @@
 
     <order name="ARBEITEN" disable="yes"/>
     <order name="BETEN" disable="yes"/>
+    <order name="BELAGERE" disable="yes"/>
     <order name="FRIEDEN" disable="yes"/>
     <order name="GM" disable="yes"/>
     <order name="JIHAD" disable="yes"/>
@@ -106,6 +107,7 @@
 
     <param name="modules.astralspace" value="0"/>
     <param name="modules.wormholes" value="0"/>
+    <param name="modules.markets" value="1/>
 
     <param name="skills.cost" value="500"/>
     <param name="entertain.base" value="0"/>
@@ -129,7 +131,8 @@
     <param name="rules.magic.common" value="tybied"/> <!-- tybied spells can be cast by anyone -->
     <param name="rules.magic.playerschools" value="gwyrrd illaun draig cerddor"/>
     <param name="rules.economy.taxation" value="1"/>
-    <param name="rules.give" value="3"/> <!-- only self + peasants -->
+    <param name="rules.economy.roqf" value="5"/>
+    <param name="rules.give" value="11"/> <!-- only self + peasants + ondeath -->
     <param name="rules.help.mask" value="fight guard money"/>
 	<param name="movement.shipspeed.skillbonus" value="7"/>
     <param name="alliance.auto" value="fight"/>
diff --git a/src/res/e2k9/buildings.xml b/src/res/e2k9/buildings.xml
index 4b38e10fa..ca51a0841 100644
--- a/src/res/e2k9/buildings.xml
+++ b/src/res/e2k9/buildings.xml
@@ -10,5 +10,13 @@
     </construction>
   </building>
 
+  <building name="market" capacity="1" maxsize="10">
+    <maintenance type="money" amount="200" vital="yes"/>
+    <construction skill="building" minskill="2" reqsize="1">
+      <requirement type="log" quantity="1"/>
+      <requirement type="stone" quantity="1"/>
+    </construction>
+  </building>
+
 </buildings>
 
diff --git a/src/res/e2k9/races.xml b/src/res/e2k9/races.xml
index aeb95f895..0053611ec 100644
--- a/src/res/e2k9/races.xml
+++ b/src/res/e2k9/races.xml
@@ -3,7 +3,7 @@
 
   <!-- begin main races -->
 
-  <race name="goblin" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="100" maintenance="6" weight="600" capacity="440" speed="1.000000" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="goblin" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="6" weight="600" capacity="440" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
 	<param name="hunger.damage" value="1d8+7"/>
@@ -24,7 +24,7 @@
     <familiar race="imp"/>
   </race>
 
-  <race name="uruk" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="uruk" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="70" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
 	<param name="other_race" value="troll"/>
@@ -49,7 +49,7 @@
     <familiar race="ghost"/>
   </race>
 
-  <race name="human" magres="0.000000" maxaura="1.000000" regaura="1.000000" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="human" magres="0.000000" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
 	<param name="other_race" value="elf"/>
@@ -64,7 +64,7 @@
     <familiar race="giantturtle"/>
   </race>
 
-  <race name="halfling" magres="0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="halfling" magres="0.05" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
 	<param name="other_race" value="dwarf"/>
@@ -92,7 +92,7 @@
   
   <!-- begin secondary races -->
 
-  <race name="demon" magres="0.150000" maxaura="1.000000" regaura="1.250000" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
+  <race name="demon" magres="0.150000" maxaura="1.0" regaura="1.1" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" ac="2" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" shapeshift="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="cartmaking" modifier="-2"/>
@@ -114,7 +114,7 @@
     <familiar race="ghost"/>
   </race>
 
-  <race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="elf" magres="0.100000" maxaura="1.0" regaura="1.1" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="armorer" modifier="-1"/>
@@ -135,7 +135,7 @@
     <familiar race="unicorn"/>
   </race>
 
-  <race name="troll" magres="0.100000" maxaura="1.000000" regaura="1.000000" recruitcost="100" maintenance="10" weight="2000" capacity="1080" speed="1.000000" hp="20" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="troll" magres="0.100000" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="2000" capacity="1080" speed="1.0" hp="20" ac="1" damage="1d5+3" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="armorer" modifier="2"/>
@@ -158,7 +158,7 @@
     <familiar race="rat"/>
   </race>
 
-  <race name="dwarf" magres="0.050000" maxaura="1.000000" regaura="0.500000" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <race name="dwarf" magres="0.05" maxaura="1.0" regaura="0.9" recruitcost="110" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="armorer" modifier="2"/>
@@ -213,7 +213,7 @@
     <attack type="4" damage="1d10"/>
     <attack type="4" damage="1d10"/>
   </race>
-  <race name="giantturtle" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="1600" capacity="600" speed="1.000000" hp="900" ac="7" damage="2d50" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="5" coastal="yes" swim="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="giantturtle" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="1600" capacity="600" speed="1.0" hp="900" ac="7" damage="2d50" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="5" coastal="yes" swim="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -259,7 +259,7 @@
     <skill name="cartmaking" modifier="-99"/>
     <attack type="4" damage="1d6"/>
   </race>
-  <race name="tiger" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="30" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="tiger" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="30" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -284,7 +284,7 @@
     <attack type="4" damage="1d6"/>
     <attack type="4" damage="1d6"/>
   </race>
-  <race name="hellcat" magres="0.500000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="40" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk="yes" teach="no" giveitem="yes" getitem="yes" resistpierce="yes">
+  <race name="hellcat" magres="0.500000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="40" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="4" walk="yes" teach="no" giveitem="yes" getitem="yes" resistpierce="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -309,7 +309,7 @@
     <attack type="4" damage="1d6"/>
     <attack type="4" damage="1d6"/>
   </race>
-  <race name="owl" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="9" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="4" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="owl" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="9" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="4" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -333,7 +333,7 @@
     <skill name="cartmaking" modifier="-99"/>
     <attack type="4" damage="1d4"/>
   </race>
-  <race name="fairy" magres="0.800000" maxaura="1.000000" regaura="1.500000" weight="200" capacity="540" speed="1.000000" hp="6" damage="1d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="14" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
+  <race name="fairy" magres="0.800000" maxaura="1.0" regaura="1.500000" weight="200" capacity="540" speed="1.0" hp="6" damage="1d3" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="14" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="magic" modifier="1"/>
@@ -361,7 +361,7 @@
     <attack type="4" damage="1d3"/>
     <attack type="4" damage="1d3"/>
   </race>
-  <race name="dreamcat" magres="0.500000" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="10" damage="1d5" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="6" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" invinciblenonmagic="yes">
+  <race name="dreamcat" magres="0.500000" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="10" damage="1d5" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="6" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" invinciblenonmagic="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="magic" modifier="1"/>
@@ -385,7 +385,7 @@
     <attack type="4" damage="1d5"/>
     <attack type="4" damage="1d5"/>
   </race>
-  <race name="imp" magres="0.500000" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="10" ac="1" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="4" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
+  <race name="imp" magres="0.500000" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="10" ac="1" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="4" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -411,7 +411,7 @@
     <attack type="1" damage="1d4"/>
     <attack type="6" spell="fiery_dragonbreath"/>
   </race>
-  <race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" weight="500" capacity="540" speed="1.000000" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants="yes" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes" invinciblenonmagic="yes">
+  <race name="ghost" magres="0.800000" maxaura="0.500000" regaura="0.100000" weight="500" capacity="540" speed="1.0" hp="30" ac="5" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="5" defensemodifier="8" scarepeasants="yes" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes" invinciblenonmagic="yes">
     <ai splitsize="5000"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -438,7 +438,7 @@
     <attack type="2" damage="2d30"/>
     <attack type="3" damage="1d1"/>
   </race>
-  <race name="wolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="25" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" scarepeasants="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="wolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="25" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" scarepeasants="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="5000"/>
     <function name="name" value="namegeneric"/>
     <function name="initfamiliar" value="oldfamiliars"/>
@@ -489,7 +489,7 @@
     <attack type="4" damage="3d12"/>
     <attack type="4" damage="2d4"/>
   </race>
-  <race name="nymph" magres="0.900000" maxaura="1.000000" regaura="1.500000" weight="1000" capacity="540" speed="1.000000" hp="15" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
+  <race name="nymph" magres="0.900000" maxaura="1.0" regaura="1.500000" weight="1000" capacity="540" speed="1.0" hp="15" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes" equipment="yes">
     <ai splitsize="9999"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="mining" modifier="-99"/>
@@ -513,7 +513,7 @@
     <attack type="1" damage="1d4"/>
     <attack type="2" damage="2d20"/>
   </race>
-  <race name="songdragon" magres="0.990000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="600" speed="1.500000" hp="40" ac="1" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="songdragon" magres="0.990000" maxaura="1.0" regaura="1.0" weight="1000" capacity="600" speed="1.500000" hp="40" ac="1" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" fly="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="9999"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -542,7 +542,7 @@
     <attack type="6" spell="fiery_dragonbreath"/>
   </race>
 
-  <race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="100" capacity="540" speed="1.000000" hp="10" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="rat" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="100" capacity="540" speed="1.0" hp="10" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="9999"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -591,7 +591,7 @@
     <skill name="cartmaking" modifier="-99"/>
     <attack type="4" damage="2d3"/>
   </race>
-  <race name="tunnelworm" magres="0.800000" maxaura="0.000000" regaura="0.000000" weight="30000" capacity="10000" speed="1.000000" hp="300" ac="6" damage="3d20" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="1" scarepeasants="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="tunnelworm" magres="0.800000" maxaura="0.000000" regaura="0.000000" weight="30000" capacity="10000" speed="1.0" hp="300" ac="6" damage="3d20" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="1" scarepeasants="yes" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="99999"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -617,7 +617,7 @@
     <attack type="4" damage="3d20"/>
     <attack type="8" damage="1d10"/>
   </race>
-  <race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" giveitem="yes" getitem="yes">
+  <race name="lynx" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="99999"/>
     <function name="initfamiliar" value="oldfamiliars"/>
     <skill name="crossbow" modifier="-99"/>
@@ -641,16 +641,16 @@
     <skill name="cartmaking" modifier="-99"/>
     <attack type="4" damage="2d3"/>
   </race>
-  <race name="direwolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.000000" hp="20" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk="yes" teach="no" giveperson="yes">
+  <race name="direwolf" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="1" walk="yes" teach="no" giveperson="yes">
     <function name="initfamiliar" value="oldfamiliars"/>
     <ai splitsize="5000"/>
     <attack type="4" damage="2d4"/>
   </race>
-  <race name="peasant" magres="0.000000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d6" unarmedattack="0" unarmeddefense="0" cannotmove="yes" teach="no">
+  <race name="peasant" magres="0.000000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d6" unarmedattack="0" unarmeddefense="0" cannotmove="yes" teach="no">
     <ai splitsize="10000"/>
     <attack type="1" damage="1d6"/>
   </race>
-  <race name="braineater" magres="0.900000" maxaura="1.000000" regaura="1.000000" weight="100" capacity="540" speed="1.000000" hp="20" ac="1" damage="0d0" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" invinciblenonmagic="yes">
+  <race name="braineater" magres="0.900000" maxaura="1.0" regaura="1.0" weight="100" capacity="540" speed="1.0" hp="20" ac="1" damage="0d0" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" invinciblenonmagic="yes">
     <ai splitsize="500" killpeasants="yes" moverandom="yes" learn="yes"/>
     <function name="name" value="namegeneric"/>
     <function name="describe" value="describe_braineater"/>
@@ -658,7 +658,7 @@
     <attack type="3" damage="1d1"/>
     <attack type="4" damage="1d1"/>
   </race>
-  <race name="toad" magres="0.200000" maxaura="1.000000" regaura="1.000000" maintenance="10" weight="100" capacity="540" speed="1.000000" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="toad" magres="0.200000" maxaura="1.0" regaura="1.0" maintenance="10" weight="100" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="crossbow" modifier="-10"/>
     <skill name="mining" modifier="-10"/>
@@ -683,7 +683,7 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="smurf" weight="1000" capacity="540" speed="1.000000" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
+  <race name="smurf" weight="1000" capacity="540" speed="1.0" hp="10" damage="1d2" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" giveperson="yes" giveunit="yes" getitem="yes" walk="yes">
     <ai splitsize="1" learn="yes"/>
     <skill name="crossbow" modifier="-10"/>
     <skill name="mining" modifier="-10"/>
@@ -708,43 +708,43 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="alp" magres="0.950000" maxaura="1.000000" regaura="1.000000" weight="0" capacity="0" speed="1.500000" hp="20" ac="2" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="20" fly="yes" walk="yes" canlearn="no" canteach="no">
+  <race name="alp" magres="0.950000" maxaura="1.0" regaura="1.0" weight="0" capacity="0" speed="1.500000" hp="20" ac="2" damage="1d4" unarmedattack="0" unarmeddefense="0" attackmodifier="2" defensemodifier="20" fly="yes" walk="yes" canlearn="no" canteach="no">
     <ai splitsize="1"/>
     <function name="name" value="namegeneric"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="mountainguard" unarmedguard="yes" magres="0.500000" maxaura="1.000000" regaura="0.500000" weight="10000" capacity="2000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" canlearn="no" teach="no" noweapons="yes" giveitem="yes">
+  <race name="mountainguard" unarmedguard="yes" magres="0.500000" maxaura="1.0" regaura="0.500000" weight="10000" capacity="2000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" canlearn="no" teach="no" noweapons="yes" giveitem="yes">
     <ai splitsize="1"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="2d40"/>
   </race>
-  <race name="shadowmaster" cansail="no" cansteal="no" canlearn="no" magres="0.750000" maxaura="1.000000" regaura="2.000000" weight="500" capacity="540" speed="1.000000" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants="yes" walk="yes" teach="no" desert="yes">
+  <race name="shadowmaster" cansail="no" cansteal="no" canlearn="no" magres="0.750000" maxaura="1.0" regaura="2.000000" weight="500" capacity="540" speed="1.0" hp="150" ac="4" damage="2d5" unarmedattack="0" unarmeddefense="0" attackmodifier="11" defensemodifier="13" scarepeasants="yes" walk="yes" teach="no" desert="yes">
     <ai splitsize="50" killpeasants="yes" moverandom="yes" learn="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="2d4"/>
     <attack type="2" damage="2d30"/>
     <attack type="3" damage="1d2"/>
   </race>
-  <race name="shadowdemon" cansail="no" cansteal="no" canlearn="no" magres="0.750000" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants="yes" walk="yes" teach="no" desert="yes" recruitethereal="yes">
+  <race name="shadowdemon" cansail="no" cansteal="no" canlearn="no" magres="0.750000" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="50" ac="3" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="8" defensemodifier="11" scarepeasants="yes" walk="yes" teach="no" desert="yes" recruitethereal="yes">
     <ai splitsize="1000" killpeasants="yes" moverandom="yes" learn="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="2d3"/>
     <attack type="3" damage="1d1"/>
   </race>
-  <race name="stonegolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" weight="10000" capacity="2000" speed="1.000000" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no" giveitem="yes">
+  <race name="stonegolem" magres="0.250000" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no" giveitem="yes">
     <ai splitsize="50"/>
     <skill name="building" modifier="14"/>
     <skill name="roadwork" modifier="14"/>
     <attack type="4" damage="2d10+4"/>
   </race>
-  <race name="irongolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" weight="10000" capacity="2000" speed="1.000000" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no" giveitem="yes">
+  <race name="irongolem" magres="0.250000" maxaura="1.0" regaura="0.100000" weight="10000" capacity="2000" speed="1.0" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk="yes" canlearn="no" teach="no" giveitem="yes">
     <ai splitsize="50"/>
     <function name="name" value="namegeneric"/>
     <skill name="armorer" modifier="14"/>
     <skill name="weaponsmithing" modifier="14"/>
     <attack type="4" damage="2d8+4"/>
   </race>
-  <race name="spell" magres="0.000000" maxaura="1.000000" regaura="0.100000" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2" canlearn="no" noheal="yes" noweapons="yes" illusionary="yes" invisible="yes" fly="yes" swim="yes" walk="yes">
+  <race name="spell" magres="0.000000" maxaura="1.0" regaura="0.100000" weight="0" capacity="0" speed="0.000000" hp="1" damage="1d4" unarmedattack="-2" unarmeddefense="-2" canlearn="no" noheal="yes" noweapons="yes" illusionary="yes" invisible="yes" fly="yes" swim="yes" walk="yes">
     <ai splitsize="1"/>
     <attack type="1" damage="1d4"/>
   </race>
@@ -752,27 +752,27 @@
     <ai splitsize="1"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="dracoid" magres="0.000000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" walk="yes" teach="no" giveitem="yes" giveperson="yes" getitem="yes" equipment="yes">
+  <race name="dracoid" magres="0.000000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" walk="yes" teach="no" giveitem="yes" giveperson="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="name" value="namedracoid"/>
     <attack type="4" damage="1d6"/>
     <attack type="4" damage="1d6"/>
     <attack type="1" damage="1d5"/>
   </race>
-  <race name="catdragon" magres="0.900000" maxaura="1.000000" regaura="1.000000" weight="20000" capacity="10000" speed="1.000000" hp="20" damage="2d40" unarmedattack="0" unarmeddefense="0" defensemodifier="50" fly="yes" walk="yes" teach="no" shapeshift="yes" giveitem="yes" giveperson="yes" getitem="yes">
+  <race name="catdragon" magres="0.900000" maxaura="1.0" regaura="1.0" weight="20000" capacity="10000" speed="1.0" hp="20" damage="2d40" unarmedattack="0" unarmeddefense="0" defensemodifier="50" fly="yes" walk="yes" teach="no" shapeshift="yes" giveitem="yes" giveperson="yes" getitem="yes">
     <ai splitsize="1"/>
     <attack type="4" damage="2d40"/>
     <attack type="4" damage="2d40"/>
     <attack type="4" damage="2d40"/>
     <attack type="4" damage="2d40"/>
   </race>
-  <race name="ent" magres="0.250000" maxaura="1.000000" regaura="0.500000" weight="5000" capacity="2500" speed="1.000000" hp="50" ac="4" damage="2d4+12" unarmedattack="0" unarmeddefense="0" attackmodifier="9" defensemodifier="7" scarepeasants="yes" walk="yes" teach="no">
+  <race name="ent" magres="0.250000" maxaura="1.0" regaura="0.500000" weight="5000" capacity="2500" speed="1.0" hp="50" ac="4" damage="2d4+12" unarmedattack="0" unarmeddefense="0" attackmodifier="9" defensemodifier="7" scarepeasants="yes" walk="yes" teach="no">
     <ai splitsize="1000" moverandom="yes" learn="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="2d12"/>
     <attack type="4" damage="2d12"/>
   </race>
-  <race name="wyrm" magres="0.900000" maxaura="1.000000" regaura="3.000000" weight="18000" capacity="1000000" speed="1.000000" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
+  <race name="wyrm" magres="0.900000" maxaura="1.0" regaura="3.000000" weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="1" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="move" value="movedragon"/>
@@ -783,7 +783,7 @@
     <attack type="4" damage="5d30"/>
     <attack type="6" spell="powerful_dragonbreath"/>
   </race>
-  <race name="dragon" magres="0.700000" maxaura="1.000000" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" giveitem="yes" resistbash="yes">
+  <race name="dragon" magres="0.700000" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac="6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" giveitem="yes" resistbash="yes">
     <ai splitsize="2" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="age" value="agedragon"/>
@@ -795,7 +795,7 @@
     <attack type="4" damage="3d30"/>
     <attack type="6" spell="icy_dragonbreath"/>
   </race>
-  <race name="youngdragon" magres="0.500000" maxaura="1.000000" regaura="1.000000" weight="20000" capacity="10000" speed="1.000000" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
+  <race name="youngdragon" magres="0.500000" maxaura="1.0" regaura="1.0" weight="20000" capacity="10000" speed="1.0" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="6" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="age" value="agefiredragon"/>
@@ -807,13 +807,13 @@
     <attack type="4" damage="1d30"/>
     <attack type="6" spell="fiery_dragonbreath"/>
   </race>
-  <race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="0" capacity="0" speed="1.000000" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" walk="yes" canlearn="no" teach="no" noweapons="yes" illusionary="yes">
+  <race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="0" capacity="0" speed="1.0" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" walk="yes" canlearn="no" teach="no" noweapons="yes" illusionary="yes">
     <ai splitsize="999999"/>
     <function name="age" value="ageillusion"/>
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="1d1"/>
   </race>
-  <race name="undead" magres="0.000000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="20" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes">
+  <race name="undead" magres="0.000000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes">
     <ai splitsize="20000" moverandom="yes"/>
     <function name="name" value="nameundead"/>
     <function name="age" value="ageundead"/>
@@ -821,7 +821,7 @@
     <attack type="5"/>
   </race>
 
-  <race name="clone" magres="0.900000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.000000" hp="40" damage="0d0" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" canlearn="no" teach="no" noheal="yes">
+  <race name="clone" magres="0.900000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="40" damage="0d0" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" canlearn="no" teach="no" noheal="yes">
     <ai splitsize="10000"/>
     <skill name="crossbow" modifier="-99"/>
     <skill name="mining" modifier="-99"/>
@@ -847,18 +847,18 @@
     <skill name="unarmed" modifier="-99"/>
     <attack type="1" damage="0d0"/>
   </race>
-  <race name="template" magres="1.000000" maxaura="0.000000" regaura="0.000000" weight="0" capacity="1000" speed="10.000000" hp="10" damage="1d4" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" fly="yes" swim="yes" walk="yes" shapeshift="yes" shapeshiftany="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" recruitunlimited="yes" equipment="yes">
+  <race name="template" magres="1.0" maxaura="0.000000" regaura="0.000000" weight="0" capacity="1000" speed="10.000000" hp="10" damage="1d4" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" fly="yes" swim="yes" walk="yes" shapeshift="yes" shapeshiftany="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" recruitethereal="yes" recruitunlimited="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="gnome" magres="1.000000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.000000" hp="50" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk="yes" teach="no">
+  <race name="gnome" magres="1.0" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="50" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk="yes" teach="no">
     <ai splitsize="10000"/>
     <skill name="tactics" modifier="1"/>
     <skill name="stamina" modifier="1"/>
     <skill name="unarmed" modifier="1"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="museumghost" magres="1.000000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.000000" hp="50" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk="yes" teach="no">
+  <race name="museumghost" magres="1.0" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="50" damage="1d4" unarmedattack="10" unarmeddefense="10" attackmodifier="10" defensemodifier="10" walk="yes" teach="no">
     <ai splitsize="10000"/>
     <skill name="tactics" modifier="1"/>
     <skill name="stamina" modifier="1"/>
@@ -871,7 +871,7 @@
     <attack type="2" damage="5d600"/>
     <attack type="1" damage="1d4"/>
   </race>
-  <race name="ghast" magres="0.600000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
+  <race name="ghast" magres="0.600000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
     <ai splitsize="2000" aggression="0.02" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="nameghoul"/>
     <skill name="crossbow" modifier="1"/>
@@ -889,7 +889,7 @@
     <attack type="2" damage="1d30"/>
     <attack type="2" damage="1d30"/>
   </race>
-  <race name="ghoul" magres="0.300000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
+  <race name="ghoul" magres="0.300000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="nameghoul"/>
     <function name="age" value="ageghoul"/>
@@ -908,7 +908,7 @@
     <attack type="2" damage="1d30"/>
   </race>
 
-  <race name="juju-zombie" magres="0.500000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes">
+  <race name="juju-zombie" magres="0.500000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes">
     <ai splitsize="2000" aggression="0.02" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="namezombie"/>
     <skill name="crossbow" modifier="1"/>
@@ -925,7 +925,7 @@
     <attack type="3" damage="1d1"/>
   </race>
 
-  <race name="zombie" magres="0.200000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="zombie" magres="0.200000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="namezombie"/>
     <function name="age" value="agezombie"/>
@@ -941,7 +941,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeletonlord" magres="0.300000" maxaura="1.000000" regaura="1.000000" weight="1000" capacity="540" speed="1.000000" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="skeletonlord" magres="0.300000" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
     <ai splitsize="2000" aggression="0.02" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="nameskeleton"/>
     <skill name="crossbow" modifier="1"/>
@@ -957,7 +957,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeleton" magres="0.100000" maxaura="1.000000" regaura="1.000000" weight="500" capacity="540" speed="1.000000" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="skeleton" magres="0.100000" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <function name="name" value="nameskeleton"/>
     <function name="age" value="ageskeleton"/>
@@ -973,13 +973,13 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="shadowknight" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.000000" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noblock="yes">
+  <race name="shadowknight" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="1000" capacity="540" speed="1.0" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noblock="yes">
     <ai splitsize="20000" moverandom="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="1" damage="1d1"/>
   </race>
 
-  <race name="seaserpent" magres="0.500000" maxaura="1.000000" regaura="1.000000" weight="20000" capacity="5000" speed="1.000000" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" swim="yes" teach="no" getitem="yes" resistbash="yes">
+  <race name="seaserpent" magres="0.500000" maxaura="1.0" regaura="1.0" weight="20000" capacity="5000" speed="1.0" hp="600" ac="3" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" swim="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="6" killpeasants="yes" moverandom="yes" learn="yes"/>
     <function name="name" value="namegeneric"/>
     <function name="move" value="moveswimming"/>
@@ -991,7 +991,7 @@
     <attack type="8" damage="1d10"/>
   </race>
 
-  <race name="shadowdragon" magres="0.950000" maxaura="1.000000" regaura="3.000000" recruitcost="2500000" weight="100" capacity="100000" speed="1.000000" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
+  <race name="shadowdragon" magres="0.950000" maxaura="1.0" regaura="3.000000" recruitcost="2500000" weight="100" capacity="100000" speed="1.0" hp="2700" ac="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="12" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
     <ai splitsize="1" killpeasants="yes" learn="yes"/>
     <function name="name" value="namedragon"/>
     <function name="move" value="movedragon"/>
@@ -1005,14 +1005,14 @@
     <precombatspell spell="shadowcall"/>
   </race>
 
-  <race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="500" capacity="540" speed="1.000000" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes">
+  <race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="500" capacity="540" speed="1.0" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes">
     <ai splitsize="5000" killpeasants="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="1d6"/>
     <attack type="3" damage="1d1"/>
   </race>
 
-  <race name="nightmare" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="100" capacity="540" speed="1.000000" hp="80" ac="10" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" invinciblenonmagic="yes">
+  <race name="nightmare" magres="0.500000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="100" capacity="540" speed="1.0" hp="80" ac="10" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" invinciblenonmagic="yes">
     <ai splitsize="500" killpeasants="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="1d4"/>
@@ -1022,7 +1022,7 @@
     <attack type="2" damage="1d10"/>
   </race>
 
-  <race name="vampunicorn" magres="1.000000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="5000" capacity="2000" speed="1.000000" hp="30" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" teach="no" getitem="yes">
+  <race name="vampunicorn" magres="1.0" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="5000" capacity="2000" speed="1.0" hp="30" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" teach="no" getitem="yes">
     <ai splitsize="5000" killpeasants="yes"/>
     <function name="name" value="namegeneric"/>
     <attack type="4" damage="2d10"/>
diff --git a/src/res/e2k9/spells.xml b/src/res/e2k9/spells.xml
index 84ab3f5c3..24bc6f4ca 100644
--- a/src/res/e2k9/spells.xml
+++ b/src/res/e2k9/spells.xml
@@ -364,6 +364,78 @@
   <!-- end gwyrrd -->
 
   <!-- new tybied - spells known to all schools -->
+  <spell name="create_potion_p2" type="tybied" ship="true" rank="5" level="2">
+    <!-- Wasser des Lebens -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="2" cost="linear"/>
+    <resource name="h4" amount="1" cost="linear"/><!-- Baumringel -->
+    <resource name="h6" amount="1" cost="linear"/><!-- Gurgelkraut -->
+  </spell>
+  <spell name="create_potion_p0" type="tybied" ship="true" rank="5" level="3">
+    <!-- Siebenmeilentee -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="2" cost="linear"/>
+    <resource name="h12" amount="1" cost="linear"/><!-- Windbeutel -->
+    <resource name="h17" amount="1" cost="linear"/><!-- Höhlenglimm -->
+  </spell>
+  <spell name="create_potion_p9" type="tybied" ship="true" rank="5" level="4">
+    <!-- Pferdeglück -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="3" cost="linear"/>
+    <resource name="h0" amount="1" cost="linear"/><!-- Flachwurz -->
+    <resource name="h8" amount="1" cost="linear"/><!-- Blasenmorchel -->
+    <resource name="h15" amount="1" cost="linear"/><!-- Steinbeißer -->
+  </spell>
+  <spell name="create_potion_peasantblood" type="tybied" ship="true" rank="5" level="5">
+    <!-- Bauernblut -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="3" cost="linear"/>
+    <resource name="h14" amount="1" cost="linear"/><!-- Alraune -->
+    <resource name="h6" amount="1" cost="linear"/><!-- Gurgelkraut -->
+    <resource name="h17" amount="1" cost="linear"/><!-- Höhlenglimm -->
+    <resource name="peasant" amount="1" cost="fixed"/><!-- Bauer -->
+  </spell>
+
+  <spell name="create_potion_ointment" type="tybied" ship="true" rank="5" level="6">
+    <!-- Wundsalbe -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="4" cost="linear"/>
+    <resource name="h4" amount="1" cost="linear"/><!-- Baumringel -->
+    <resource name="h15" amount="1" cost="linear"/><!-- Steinbeißer -->
+    <resource name="h18" amount="1" cost="linear"/><!-- Eisblume -->
+    <resource name="h11" amount="1" cost="linear"/><!-- Sandfäule -->
+  </spell>
+  <spell name="create_potion_p3" type="tybied" ship="true" rank="5" level="7>
+    <!-- Schaffenstrunk -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="4" cost="linear"/>
+    <resource name="h12" amount="1" cost="linear"/><!-- Windbeutel -->
+    <resource name="h6" amount="1" cost="linear"/><!-- Gurgelkraut -->
+    <resource name="h20" amount="1" cost="linear"/><!-- Schneekristall -->
+    <resource name="h9" amount="1" cost="linear"/><!-- Wasserfinder -->
+  </spell>
+  <spell name="create_potion_p14" type="tybied" ship="true" rank="5" level="8">
+    <!-- Heiltrank -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="5" cost="linear"/>
+    <resource name="h0" amount="1" cost="linear"/><!-- Flachwurz -->
+    <resource name="h8" amount="1" cost="linear"/><!-- Blasenmorchel -->
+    <resource name="h15" amount="1" cost="linear"/><!-- Steinbeißer -->
+    <resource name="h18" amount="1" cost="linear"/><!-- Eisblume -->
+    <resource name="h9" amount="1" cost="linear"/><!-- Wasserfinder -->
+  </spell>
+  <spell name="create_potion_p13" type="tybied" ship="true" rank="5" level="9>
+    <!-- Elixier der Macht -->
+    <function name="cast" value="lua_castspell"/>
+    <resource name="aura" amount="5" cost="linear"/>
+    <resource name="h14" amount="1" cost="linear"/><!-- Alraune -->
+    <resource name="h8" amount="1" cost="linear"/><!-- Blasenmorchel -->
+    <resource name="h17" amount="1" cost="linear"/><!-- Höhlenglimm -->
+    <resource name="h20" amount="1" cost="linear"/><!-- Schneekristall -->
+    <resource name="h11" amount="1" cost="linear"/><!-- Sandfäule -->
+    <resource name="dragonblood" amount="1" cost="fixed"/><!-- Drachenblut -->
+  </spell>
+
   <spell name="create_roi" type="tybied" ship="true" rank="5" level="6" index="130">
     <!-- Erschaffe einen Ring der Unsichtbarkeit -->
     <function name="cast" value="lua_castspell"/>
diff --git a/src/res/e2k9/strings.xml b/src/res/e2k9/strings.xml
index e3d6a00e3..866e305e5 100644
--- a/src/res/e2k9/strings.xml
+++ b/src/res/e2k9/strings.xml
@@ -19,6 +19,10 @@
     <text locale="de">Wache</text>
     <text locale="en">watch</text>
   </string>
+  <string name="market">
+    <text locale="de">Marktplatz</text>
+    <text locale="en">marketplace</text>
+  </string>
 
   <string name="charger">
     <text locale="de">Streitross</text>
@@ -28,4 +32,49 @@
     <text locale="de">Streitrösser</text>
     <text locale="en">chargers</text>
   </string>
+
+  <string name="create_potion_p0">
+    <text locale="de">Siebenmeilentee</text>
+    <text locale="en">seven mile tea</text>
+  </string>
+  <string name="create_potion_p2">
+    <text locale="de">Wasser des Lebens</text>
+    <text locale="en">water of life</text>
+  </string>
+  
+  <namespace name="spell">
+    <string name="create_potion_p0">
+      <text locale="en">For Seven Mile Tea, boil up a Cobalt Fungus and pour the resulting brew into a Windbag. Catch and filter the liquid that drips out and administer it. This tea allows up to ten men to move as fast as a horse.</text>
+      <text locale="de">Für den Siebenmeilentee koche man einen Blauen Baumringel auf und gieße dieses Gebräu in einen Windbeutel. Das heraustropfende Wasser fange man auf, filtere es und verabreiche es alsdann. Durch diesen Tee können bis zu zehn Menschen schnell wie ein Pferd laufen.</text>
+    </string>
+    <string name="create_potion_p2">
+      <text locale="en">The "Water of Life" allows living trees to be created from logs. A Knotroot and Elvendear are heated until one can just still keep one's finger in. This is then poured into a jar and allowed to cool slowly. The extract is sufficient for 10 pieces of wood.</text>
+      <text locale="de">Das 'Wasser des Lebens' ist in der Lage, aus gefällten Baumstämmen wieder lebende Bäume zu machen. Dazu wird ein knotiger Saugwurz zusammen mit einem Elfenlieb erwärmt, so daß man gerade noch den Finger reinhalten kann. Dies gieße man in ein Gefäß und lasse es langsam abkühlen. Der Extrakt reicht für 10 Holzstämme.</text>
+    </string>
+    <string name="create_potion_p3">
+      <text locale="en">Allow a Tangy Temerity to simmer for three hours in a litre of water, then add a grated Mandrake, and sprinkle in a Gapgrowth harvested at full moon. The whole brew should then be allowed to stew for three days in a warm place. This potion increases the strength and endurance of ten men so that they can achieve twice as much in a week.</text>
+      <text locale="de">Man lasse einen Würzigen Wagemut drei Stunden lang in einem Liter Wasser köcheln. Dann gebe man eine geriebene Alraune dazu und bestreue das ganze mit bei Vollmond geerntetem Spaltwachs. Nun lasse man den Sud drei Tage an einem dunklen und warmen Ort ziehen und seie dann die Flüssigkeit ab. Dieser Schaffenstrunk erhöht die Kraft und Ausdauer von zehn Männern, so daß sie doppelt soviel schaffen können wie sonst.</text>
+    </string>
+    <string name="create_potion_ointment">
+      <text locale="en">When one is severely wounded after a hard battle it is advisable to have some Ointment to hand. Applied to wounds, this magical paste closes them in the blink of an eye. For the preparation the alchemist requires a cobalt fungus, tangy temerity, and white hemlock. A dose of the potion heals up to 400 hitpoints.</text>
+      <text locale="de">Ist man nach einem einem harten Kampf schwer verwundet, ist es ratsam, etwas Wundsalbe parat zu haben. Streicht man diese magische Paste auf die Wunden, schließen sich diese augenblicklich. Für die Herstellung benötigt der Alchemist nebst einem Blauen Baumringel einen Würzigen Wagemut und einen Weißen Wüterich. Eine solche Portion heilt bis zu 400 Lebenspunkte.</text>
+    </string>
+    <string name="create_potion_peasantblood">
+      <text locale="en">Knowledge of this potion is amongst the most dangerous and secret wisdom of the alchemist. Snatched from the darkest hells, the knowledge of this formula enables the production of an elixer which serves Demons as nourishment. If used by normal beings it leads to a swift death and eternal undeath. The creation requires Fjord Fungus together with some Cave Lichen and Cobalt Fungus, and an unfortunate peasant from the region, who is killed in the bloody days-long ritual. One vial of the potion satisfies the hunger of 100 Demons for a week.</text>
+      <text locale="de">Zu den gefährlichsten und geheimsten Wissen der Alchemisten zählt die Kenntnis um diesen Trank. Den finstersten Höllen entrissen, ermöglicht die Kenntnis dieser Formel die Herstellung eines Elixiers, welches Dämonen als Nahrung dient. Von normalen Lebewesen eingenommen, führt es zu schnellem Tod und ewigen Nichtleben. Die Herstellung benötigt nebst Fjordwuchs, etwas Höhlenglimm und einem Blauen Baumringel auch einen Bauern aus der Region, welcher in einem tagelangen blutigen Ritual getötet wird. Ein Fläschchen des Tranks kann den Hunger von 100 Dämonen für eine Woche stillen.</text>
+    </string>
+    <string name="create_potion_p9">
+      <text locale="en">To make a horsepower potion, chop a peyote, a cobalt fungus and some knotroot, and boil it in a bucketful of water. Then add some sand reeker and let the mixture steep for three days. Finally one gives this to the horses to drink, to double their procreation.</text>
+      <text locale="de">Für das Pferdeglück zerhacke man einen Kakteenschwitz, einen blauen Baumringel und etwas knotigen Saugwurz und koche das ganze mit einem Eimer Wasser auf. Dann füge man etwas Sandfäule dazu und lasse diesen Sud drei Tage lang ziehen. Letztlich gebe man es den Pferden zu trinken, auf daß sie sich doppelt so schnell vermehren.</text>
+    </string>
+    <string name="create_potion_p13">
+      <text locale="en">One of the most rare and prized of all alchemist elixers, this potion grants the user a dragon's power for a few weeks. The potion increases the life-energy of a maximum of ten people fivefold. The effect is strongest right after drinking and slowly decreases over time. To brew this potion the alchemist needs an elvendear, a windbag, a piece of waterfinder and a spider ivy. Finally he dusts it with some minced bubblemorel and stirrs the powder into some dragon's blood. </text>
+      <text locale="de">Eines der seltensten und wertvollsten alchemistischen Elixiere, verleiht dieser Trank dem Anwender für einige Wochen die Kraft eines Drachen. Der Trank erhöht die Lebensenergie von maximal zehn Personen auf das fünffache. Die Wirkung ist direkt nach der Einnahme am stärksten und klingt danach langsam ab. Zur Herstellung benötigt der Alchemist ein Elfenlieb, einen Windbeutel, ein Stück Wasserfinder und einen Grünen Spinnerich. Über dieses Mischung streue er schließlich einen zerriebenen Blasenmorchel und rühre dieses Pulver unter etwas Drachenblut.</text>
+    </string>
+    <string name="create_potion_p14">
+      <text locale="en">For a healing potion one takes the peel of a windbag and some bugleweed, stirr in some chopped elvendear and sprinkle it with the blossoms of an ice begonia. This has to cook through for four days, while a gapgrowth has to be added on the second day. Then one carefully scoops off the top layer of liquid. One such potion gives four men (or one man four times) a 50% chance to survive otherwise lethal wounds. The potion is automatically used in case of injury.</text>
+      <text locale="de">Für einen Heiltrank nehme man die Schale eines Windbeutels und etwas Gurgelkraut, rühre eine kleingehacktes Elfenlieb dazu und bestreue alles mit den Blüten einer Eisblume. Dies muß vier Tage lang gären, wobei man am zweiten Tag einen Spaltwachs dazutun muß. Dann ziehe man vorsichtig den oben schwimmenden Saft ab. Ein solcher Trank gibt vier Männern (oder einem Mann vier mal) im Kampf eine Chance von 50%, sonst tödliche Wunden zu überleben. Der Trank wird von ihnen automatisch bei Verletzung angewandt.</text>
+    </string>
+  </namespace>
+
 </strings>
diff --git a/src/res/en/strings.xml b/src/res/en/strings.xml
index 37d80e02d..a2297f6cf 100644
--- a/src/res/en/strings.xml
+++ b/src/res/en/strings.xml
@@ -1086,10 +1086,10 @@
   <string name="p3_p">
     <text locale="en">busybeers</text>
   </string>
-  <string name="p4">
+  <string name="ointment">
     <text locale="en">ointment</text>
   </string>
-  <string name="p4_p">
+  <string name="ointment_p">
     <text locale="en">ointments</text>
   </string>
   <string name="peasantblood">
diff --git a/src/scripts/spells.lua b/src/scripts/spells.lua
index e6db19a75..9c3bd022d 100644
--- a/src/scripts/spells.lua
+++ b/src/scripts/spells.lua
@@ -6,14 +6,57 @@ function creation_message(mage, type)
   return msg
 end
 
--- Erschaffe ein Flammenschwert
-local function create_item(mage, level, name)
+local function create_item(mage, level, name, count)
   local msg = creation_message(mage, name)
   msg:send_faction(mage.faction)
-  mage:add_item(name, 1);
+  if count==nil then
+    mage:add_item(name, 1);
+  else
+    mage:add_item(name, count);
+  end
   return level
 end
 
+-- Wasser des Lebens
+function create_potion_p2(r, mage, level, force)
+  return create_item(mage, level, "p2", level/2)
+end
+
+-- Siebenmeilentee
+function create_potion_p0(r, mage, level, force)
+  return create_item(mage, level, "p0", level/2)
+end
+
+-- Wundsalbe
+function create_potion_ointment(r, mage, level, force)
+  return create_item(mage, level, "ointment", level/2)
+end
+
+-- Bauernblut
+function create_potion_peasantblood(r, mage, level, force)
+  return create_item(mage, level, "peasantblood", level/2)
+end
+
+-- Pferdeglück
+function create_potion_p9(r, mage, level, force)
+  return create_item(mage, level, "p9", level/2)
+end
+
+-- Schaffenstrunk
+function create_potion_p3(r, mage, level, force)
+  return create_item(mage, level, "p3", level/2)
+end
+
+-- Heiltrank
+function create_potion_p14(r, mage, level, force)
+  return create_item(mage, level, "p14", level/2)
+end
+
+-- Elixier der Macht
+function create_potion_p13(r, mage, level, force)
+  return create_item(mage, level, "p13", level/2)
+end
+
 -- Erschaffe ein Flammenschwert
 function create_firesword(r, mage, level, force)
   return create_item(mage, level, "firesword")