diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index d05d02082..54b2e01b0 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -306,6 +306,7 @@ live(region * r)
 					ADDMSG(&u->faction->msgs, msg_message("dumbeffect",
 						"unit weeks skill", u, weeks, (skill_t)sb->id));
 				}	/* sonst Glück gehabt: wer nix weiß, kann nix vergessen... */
+        change_effect(u, oldpotiontype[P_FOOL], -effect);
 			}
 		}
 		age_unit(r, u);
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index fea1d80a8..929917f06 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -2831,6 +2831,7 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
 
 	/* Effekte von Alchemie */
 	berserk = get_effect(u, oldpotiontype[P_BERSERK]);
+  /* change_effect wird in ageing gemacht */
 
 	/* Effekte von Artefakten */
 	strongmen = min(fig->unit->number, get_item(u, I_TROLLBELT));
diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index 0dc019d4b..c00a658f7 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -1779,10 +1779,9 @@ verify_targets(castorder *co)
 						spobj->data.i = u->no;
 						spobj->flag = TARGET_RESISTS;
 						resists++;
-						add_message(&mage->faction->msgs, new_message(mage->faction,
-							"spellunitresists%u:unit%r:region%s:command%d:id",
-							mage, mage->region, strdup(co->order),
-							spobj->data.i));
+						ADDMSG(&mage->faction->msgs, msg_message("spellunitresists",
+              "unit region command target",
+							mage, mage->region, strdup(co->order), u));
 						break;
 					}
 
diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index cc50ff142..033309851 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -254,6 +254,7 @@ walkingcapacity(unit * u)
 	n += personen * personcapacity(u);
 	/* Goliathwasser */
 	n += get_effect(u, oldpotiontype[P_STRONG]) * personcapacity(u);
+  /* change_effect wird in ageing gemacht */
 	n += min(get_item(u, I_TROLLBELT), u->number) * STRENGTHCAPACITY;
 
 	return n;
@@ -606,21 +607,6 @@ drifting_ships(region * r)
 	}
 }
 
-char *
-coords_or_direction(region *r, faction *f, int dir)
-{
-	static char lbuf[32];
-	plane *pl = getplane(r);
-
-	if(fval(pl, PFL_NOCOORDS)) {
-		strcpy(lbuf, locale_string(f->locale, directions[dir]));
-	} else {
-		sprintf(lbuf, "(%d,%d)",region_x(r,f), region_y(r,f));
-	}
-
-	return lbuf;
-}
-
 static void
 ship_in_storm(unit *cap, region *next_point)
 {
@@ -2055,26 +2041,27 @@ destroy_damaged_ships(void)
 	}
 }
 
-boolean
+#ifdef TODO /* Wenn Feature ausgearbeitet */
+
+static boolean
 is_disorientated(unit *u)
 {
-	static boolean init = false;
-	static const curse_type * shipconf_ct, * regconf_ct;
-	if (!init) { 
-		init = true; 
-		regconf_ct = ct_find("disorientationzone"); 
-		shipconf_ct = ct_find("shipdisorientation"); 
-	}
-	if (u->ship && curse_active(get_curse(u->ship->attribs, shipconf_ct)))
-		return true;
+  static boolean init = false;
+  static const curse_type * shipconf_ct, * regconf_ct;
+  if (!init) { 
+    init = true; 
+    regconf_ct = ct_find("disorientationzone"); 
+    shipconf_ct = ct_find("shipdisorientation"); 
+  }
+  if (u->ship && curse_active(get_curse(u->ship->attribs, shipconf_ct)))
+    return true;
 
-	if (curse_active(get_curse(u->region->attribs, regconf_ct)))
-		return true;
+  if (curse_active(get_curse(u->region->attribs, regconf_ct)))
+    return true;
 
-	return false;
+  return false;
 }
 
-#ifdef TODO /* Wenn Feature ausgearbeitet */
 void
 regain_orientation(region * r)
 {
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 730d2cd7b..589d7a75d 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -1212,11 +1212,11 @@
 		<arg name="unit" type="unit"></arg>
 		<arg name="region" type="region"></arg>
 		<arg name="command" type="string"></arg>
-		<arg name="id" type="int"></arg>
+		<arg name="target" type="unit"></arg>
 	</type>
-	<text locale="de">"$unit($unit) in $region($region): '$command' - Einheit $int36($id) widersteht dem Zauber."</text>
-	<text locale="fr">"$unit($unit) in $region($region): '$command' - unit $int36($id) resists the spell."</text>
-	<text locale="en">"$unit($unit) in $region($region): '$command' - unit $int36($id) resists the spell."</text>
+	<text locale="de">"$unit($unit) in $region($region): '$command' - $unit($target) widersteht dem Zauber."</text>
+	<text locale="fr">"$unit($unit) in $region($region): '$command' - $unit($target) resists the spell."</text>
+	<text locale="en">"$unit($unit) in $region($region): '$command' - $unit($target) resists the spell."</text>
 </message>
 <message name="spellshipnotfound" section="magic">
 	<type>