diff --git a/pup_land/ancient/castle/castle.2 b/pup_land/ancient/castle/castle.2
index 5b52aeeaa..f3e53bfc9 100644
--- a/pup_land/ancient/castle/castle.2
+++ b/pup_land/ancient/castle/castle.2
@@ -3198,8 +3198,6 @@ y 5
 end
 arch check_inv
 slaying mortex
-resist_magic 30
-resist_electricity 30
 connected 10
 x 17
 y 6
@@ -3216,11 +3214,10 @@ they ruled with might,
 the realm was peaceful,
 the crowd at delight."
 endmsg
-resist_magic 30
-resist_electricity 30
 connected 10
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 17
 y 6
 end
@@ -3594,9 +3591,6 @@ y 13
 end
 arch check_inv
 slaying mortex
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 x 19
 y 14
@@ -3613,12 +3607,10 @@ Shall the peace be gone?
 That is out of question,
 so life must go on."
 endmsg
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 19
 y 14
 end
diff --git a/pup_land/ancient/castle/castle.3 b/pup_land/ancient/castle/castle.3
index 5f7de03b0..bd22df13a 100644
--- a/pup_land/ancient/castle/castle.3
+++ b/pup_land/ancient/castle/castle.3
@@ -2754,9 +2754,6 @@ y 8
 end
 arch check_inv
 slaying mortex
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 x 14
 y 9
@@ -2773,12 +2770,10 @@ to leave death behind,
 a pact with the devil
 but still, it was signed."
 endmsg
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 14
 y 9
 end
@@ -3473,8 +3468,6 @@ y 19
 end
 arch check_inv
 slaying mortex
-resist_magic 30
-resist_electricity 30
 connected 10
 x 17
 y 20
@@ -3491,11 +3484,10 @@ it was written in blood,
 Four brethren would not die,
 so far it sounds good..."
 endmsg
-resist_magic 30
-resist_electricity 30
 connected 10
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 17
 y 20
 end
diff --git a/pup_land/ancient/castle/castle.4 b/pup_land/ancient/castle/castle.4
index ab5c49dc9..897b8a88b 100644
--- a/pup_land/ancient/castle/castle.4
+++ b/pup_land/ancient/castle/castle.4
@@ -5,9 +5,9 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun Dec 15 18:38:35 1996
 endmsg
-x 28
-y 28
-level 6
+width 28
+height 28
+difficulty 6
 end
 arch marble
 end
@@ -1916,10 +1916,10 @@ y 4
 end
 arch torch_1
 food 0
-x 10
-y 4
 no_pick 1
 changing 0
+x 10
+y 4
 end
 arch marble
 x 10
@@ -1990,20 +1990,20 @@ x 10
 y 21
 end
 arch igate_closed_1
-x 10
-y 21
 speed 0.500000
 connected 1
+x 10
+y 21
 end
 arch afloor_right
 x 10
 y 22
 end
 arch igate_closed_1
-x 10
-y 22
 speed 0.500000
 connected 1
+x 10
+y 22
 end
 arch afloor_right
 x 10
@@ -2056,7 +2056,7 @@ msg
 person - every week... and
 Gothwolte... searching for the
 `perfect body'... so they... joined
-forces... 
+forces...
 @match [Gg]othwolte
 ... Gothwolte... testing our
 strengh... all of us... died...
@@ -2070,10 +2070,10 @@ Con 10
 Pow 0
 hp 100
 maxhp 100
-x 11
-y 1
 level 10
 immune 31
+x 11
+y 1
 end
 arch permanent_lava
 name fire
@@ -2163,21 +2163,22 @@ y 18
 end
 arch check_inv
 slaying mortex
+connected 10
 x 11
 y 19
-connected 10
 end
 arch magic_mouth
 msg
 You decipher the ancient symbols:
 "To meet Gothwolte, speaketh the name
- of his sword."
+of his sword."
 endmsg
-x 11
-y 19
 connected 10
 walk_on 0
 fly_on 0
+activate_on_release 0
+x 11
+y 19
 end
 arch afloor_right
 x 11
@@ -2198,9 +2199,9 @@ msg
 @match whirlwind|Whirlwind
 Click.
 endmsg
+connected 1
 x 11
 y 20
-connected 1
 end
 arch afloor_right
 x 11
@@ -2211,20 +2212,20 @@ x 11
 y 21
 end
 arch igate_closed_1
-x 11
-y 21
 speed 0.500000
 connected 1
+x 11
+y 21
 end
 arch afloor_right
 x 11
 y 22
 end
 arch igate_closed_1
-x 11
-y 22
 speed 0.500000
 connected 1
+x 11
+y 22
 end
 arch afloor_right
 x 11
@@ -2288,10 +2289,10 @@ y 4
 end
 arch torch_1
 food 0
-x 12
-y 4
 no_pick 1
 changing 0
+x 12
+y 4
 end
 arch marble
 x 12
@@ -2362,20 +2363,20 @@ x 12
 y 21
 end
 arch igate_closed_1
-x 12
-y 21
 speed 0.500000
 connected 1
+x 12
+y 21
 end
 arch afloor_right
 x 12
 y 22
 end
 arch igate_closed_1
-x 12
-y 22
 speed 0.500000
 connected 1
+x 12
+y 22
 end
 arch afloor_right
 x 12
@@ -4411,12 +4412,12 @@ x 24
 y 3
 end
 arch pentagram
+type 66
 slaying gothwolte.1
 hp 12
 sp 23
 x 24
 y 3
-type 66
 end
 arch afloor_right
 x 24
diff --git a/pup_land/ancient/castle/castle.6 b/pup_land/ancient/castle/castle.6
index 63f044d95..53ee92869 100644
--- a/pup_land/ancient/castle/castle.6
+++ b/pup_land/ancient/castle/castle.6
@@ -1305,8 +1305,6 @@ y 21
 end
 arch check_inv
 slaying mortex
-resist_magic 30
-resist_electricity 30
 connected 10
 x 4
 y 22
@@ -1320,11 +1318,10 @@ You decipher the ancient symbols:
 - Ivan the honorable
 - Bymon the righteous "
 endmsg
-resist_magic 30
-resist_electricity 30
 connected 10
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 4
 y 22
 end
@@ -5100,9 +5097,6 @@ y 21
 end
 arch check_inv
 slaying mortex
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 x 14
 y 22
@@ -5119,12 +5113,10 @@ only ashes to remain,
 but their spirits lived on
 to spread terror and pain."
 endmsg
-resist_physical 30
-resist_magic 30
-resist_electricity 30
 connected 11
 walk_on 0
 fly_on 0
+activate_on_release 0
 x 14
 y 22
 end