diff --git a/quests/greyshield/Cavern2 b/quests/greyshield/Cavern2
index 858c449b4..1a9816b8c 100644
--- a/quests/greyshield/Cavern2
+++ b/quests/greyshield/Cavern2
@@ -6,6 +6,7 @@ enter_x 15
 enter_y 18
 msg
 Created:  1996-09-13 Chris Jeske
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch blocked
@@ -17,15 +18,9 @@ end
 arch blocked
 y 20
 end
-arch blackrock
-y 21
-end
 arch blocked
 y 21
 end
-arch blackrock
-y 22
-end
 arch blocked
 y 22
 end
@@ -77,9 +72,6 @@ end
 arch cave17
 y 30
 end
-arch blackrock
-y 31
-end
 arch blocked
 y 31
 end
@@ -95,10 +87,6 @@ arch blocked
 x 1
 y 20
 end
-arch blackrock
-x 1
-y 21
-end
 arch blocked
 x 1
 y 21
@@ -175,10 +163,6 @@ arch blocked
 x 2
 y 20
 end
-arch blackrock
-x 2
-y 21
-end
 arch blocked
 x 2
 y 21
@@ -508,6 +492,10 @@ y 14
 end
 arch blocked
 x 6
+y 15
+end
+arch blocked
+x 6
 y 18
 end
 arch blocked
@@ -681,10 +669,6 @@ arch cave2
 x 7
 y 25
 end
-arch blackrock
-x 7
-y 26
-end
 arch blocked
 x 7
 y 26
@@ -721,10 +705,6 @@ arch cave20
 x 7
 y 30
 end
-arch blackrock
-x 7
-y 31
-end
 arch blocked
 x 7
 y 31
@@ -737,76 +717,40 @@ arch blocked
 x 8
 y 8
 end
-arch blackrock
-x 8
-y 9
-end
 arch blocked
 x 8
 y 9
 end
-arch blackrock
+arch blocked
 x 8
 y 10
 end
 arch blocked
 x 8
-y 10
-end
-arch blackrock
-x 8
 y 11
 end
 arch blocked
 x 8
-y 11
-end
-arch blackrock
-x 8
 y 12
 end
 arch blocked
 x 8
-y 12
-end
-arch blackrock
-x 8
 y 13
 end
 arch blocked
 x 8
-y 13
-end
-arch blackrock
-x 8
 y 14
 end
 arch blocked
 x 8
-y 14
-end
-arch blackrock
-x 8
 y 15
 end
 arch blocked
 x 8
-y 15
-end
-arch blackrock
-x 8
 y 16
 end
 arch blocked
 x 8
-y 16
-end
-arch blackrock
-x 8
-y 17
-end
-arch blocked
-x 8
 y 17
 end
 arch blocked
@@ -857,52 +801,28 @@ arch cave20
 x 8
 y 25
 end
-arch blackrock
-x 8
-y 26
-end
 arch blocked
 x 8
 y 26
 end
-arch blackrock
+arch blocked
 x 8
 y 27
 end
 arch blocked
 x 8
-y 27
-end
-arch blackrock
-x 8
 y 28
 end
 arch blocked
 x 8
-y 28
-end
-arch blackrock
-x 8
 y 29
 end
 arch blocked
 x 8
-y 29
-end
-arch blackrock
-x 8
 y 30
 end
 arch blocked
 x 8
-y 30
-end
-arch blackrock
-x 8
-y 31
-end
-arch blocked
-x 8
 y 31
 end
 arch blocked
@@ -913,18 +833,10 @@ arch blocked
 x 9
 y 8
 end
-arch blackrock
-x 9
-y 9
-end
 arch blocked
 x 9
 y 9
 end
-arch blackrock
-x 9
-y 10
-end
 arch blocked
 x 9
 y 10
@@ -961,28 +873,16 @@ arch cave17
 x 9
 y 14
 end
-arch blackrock
+arch blocked
 x 9
 y 15
 end
 arch blocked
 x 9
-y 15
-end
-arch blackrock
-x 9
 y 16
 end
 arch blocked
 x 9
-y 16
-end
-arch blackrock
-x 9
-y 17
-end
-arch blocked
-x 9
 y 17
 end
 arch blocked
@@ -1029,60 +929,32 @@ arch cave20
 x 9
 y 24
 end
-arch blackrock
-x 9
-y 25
-end
 arch blocked
 x 9
 y 25
 end
-arch blackrock
+arch blocked
 x 9
 y 26
 end
 arch blocked
 x 9
-y 26
-end
-arch blackrock
-x 9
 y 27
 end
 arch blocked
 x 9
-y 27
-end
-arch blackrock
-x 9
 y 28
 end
 arch blocked
 x 9
-y 28
-end
-arch blackrock
-x 9
 y 29
 end
 arch blocked
 x 9
-y 29
-end
-arch blackrock
-x 9
 y 30
 end
 arch blocked
 x 9
-y 30
-end
-arch blackrock
-x 9
-y 31
-end
-arch blocked
-x 9
 y 31
 end
 arch blocked
@@ -1093,10 +965,6 @@ arch blocked
 x 10
 y 8
 end
-arch blackrock
-x 10
-y 9
-end
 arch blocked
 x 10
 y 9
@@ -1141,18 +1009,10 @@ arch cave17
 x 10
 y 15
 end
-arch blackrock
-x 10
-y 16
-end
 arch blocked
 x 10
 y 16
 end
-arch blackrock
-x 10
-y 17
-end
 arch blocked
 x 10
 y 17
@@ -1221,10 +1081,6 @@ arch blocked
 x 11
 y 8
 end
-arch blackrock
-x 11
-y 9
-end
 arch blocked
 x 11
 y 9
@@ -1273,18 +1129,10 @@ arch cave2
 x 11
 y 15
 end
-arch blackrock
-x 11
-y 16
-end
 arch blocked
 x 11
 y 16
 end
-arch blackrock
-x 11
-y 17
-end
 arch blocked
 x 11
 y 17
@@ -1353,10 +1201,6 @@ arch blocked
 x 12
 y 8
 end
-arch blackrock
-x 12
-y 9
-end
 arch blocked
 x 12
 y 9
@@ -1481,10 +1325,6 @@ arch blocked
 x 13
 y 8
 end
-arch blackrock
-x 13
-y 9
-end
 arch blocked
 x 13
 y 9
@@ -1601,18 +1441,10 @@ arch blocked
 x 14
 y 8
 end
-arch blackrock
-x 14
-y 9
-end
 arch blocked
 x 14
 y 9
 end
-arch blackrock
-x 14
-y 10
-end
 arch blocked
 x 14
 y 10
@@ -1725,36 +1557,20 @@ arch blocked
 x 15
 y 8
 end
-arch blackrock
-x 15
-y 9
-end
 arch blocked
 x 15
 y 9
 end
-arch blackrock
+arch blocked
 x 15
 y 10
 end
 arch blocked
 x 15
-y 10
-end
-arch blackrock
-x 15
 y 11
 end
 arch blocked
 x 15
-y 11
-end
-arch blackrock
-x 15
-y 12
-end
-arch blocked
-x 15
 y 12
 end
 arch blackrock
@@ -1849,36 +1665,20 @@ arch blocked
 x 16
 y 8
 end
-arch blackrock
-x 16
-y 9
-end
 arch blocked
 x 16
 y 9
 end
-arch blackrock
+arch blocked
 x 16
 y 10
 end
 arch blocked
 x 16
-y 10
-end
-arch blackrock
-x 16
 y 11
 end
 arch blocked
 x 16
-y 11
-end
-arch blackrock
-x 16
-y 12
-end
-arch blocked
-x 16
 y 12
 end
 arch blackrock
@@ -1921,152 +1721,80 @@ arch cave17
 x 16
 y 18
 end
-arch blackrock
-x 16
-y 19
-end
 arch blocked
 x 16
 y 19
 end
-arch blackrock
+arch blocked
 x 16
 y 20
 end
 arch blocked
 x 16
-y 20
-end
-arch blackrock
-x 16
 y 21
 end
 arch blocked
 x 16
-y 21
-end
-arch blackrock
-x 16
 y 22
 end
 arch blocked
 x 16
-y 22
-end
-arch blackrock
-x 16
 y 23
 end
 arch blocked
 x 16
-y 23
-end
-arch blackrock
-x 16
 y 24
 end
 arch blocked
 x 16
-y 24
-end
-arch blackrock
-x 16
 y 25
 end
 arch blocked
 x 16
-y 25
-end
-arch blackrock
-x 16
 y 26
 end
 arch blocked
 x 16
-y 26
-end
-arch blackrock
-x 16
 y 27
 end
 arch blocked
 x 16
-y 27
-end
-arch blackrock
-x 16
 y 28
 end
 arch blocked
 x 16
-y 28
-end
-arch blackrock
-x 16
 y 29
 end
 arch blocked
 x 16
-y 29
-end
-arch blackrock
-x 16
 y 30
 end
 arch blocked
 x 16
-y 30
-end
-arch blackrock
-x 16
-y 31
-end
-arch blocked
-x 16
 y 31
 end
 arch blocked
 x 17
 y 8
 end
-arch blackrock
-x 17
-y 9
-end
 arch blocked
 x 17
 y 9
 end
-arch blackrock
+arch blocked
 x 17
 y 10
 end
 arch blocked
 x 17
-y 10
-end
-arch blackrock
-x 17
 y 11
 end
 arch blocked
 x 17
-y 11
-end
-arch blackrock
-x 17
 y 12
 end
 arch blocked
 x 17
-y 12
-end
-arch blackrock
-x 17
-y 13
-end
-arch blocked
-x 17
 y 13
 end
 arch blackrock
@@ -2101,28 +1829,16 @@ arch cave2
 x 17
 y 18
 end
-arch blackrock
+arch blocked
 x 17
 y 19
 end
 arch blocked
 x 17
-y 19
-end
-arch blackrock
-x 17
 y 20
 end
 arch blocked
 x 17
-y 20
-end
-arch blackrock
-x 17
-y 21
-end
-arch blocked
-x 17
 y 21
 end
 arch blackrock
@@ -2181,28 +1897,16 @@ arch cave17
 x 17
 y 28
 end
-arch blackrock
+arch blocked
 x 17
 y 29
 end
 arch blocked
 x 17
-y 29
-end
-arch blackrock
-x 17
 y 30
 end
 arch blocked
 x 17
-y 30
-end
-arch blackrock
-x 17
-y 31
-end
-arch blocked
-x 17
 y 31
 end
 arch blocked
@@ -2225,52 +1929,28 @@ arch blocked
 x 18
 y 8
 end
-arch blackrock
-x 18
-y 9
-end
 arch blocked
 x 18
 y 9
 end
-arch blackrock
+arch blocked
 x 18
 y 10
 end
 arch blocked
 x 18
-y 10
-end
-arch blackrock
-x 18
 y 11
 end
 arch blocked
 x 18
-y 11
-end
-arch blackrock
-x 18
 y 12
 end
 arch blocked
 x 18
-y 12
-end
-arch blackrock
-x 18
 y 13
 end
 arch blocked
 x 18
-y 13
-end
-arch blackrock
-x 18
-y 14
-end
-arch blocked
-x 18
 y 14
 end
 arch blackrock
@@ -2301,28 +1981,16 @@ arch cave2
 x 18
 y 18
 end
-arch blackrock
+arch blocked
 x 18
 y 19
 end
 arch blocked
 x 18
-y 19
-end
-arch blackrock
-x 18
 y 20
 end
 arch blocked
 x 18
-y 20
-end
-arch blackrock
-x 18
-y 21
-end
-arch blocked
-x 18
 y 21
 end
 arch blackrock
@@ -2385,10 +2053,6 @@ arch cave17
 x 18
 y 30
 end
-arch blackrock
-x 18
-y 31
-end
 arch blocked
 x 18
 y 31
@@ -2461,28 +2125,16 @@ arch cave2
 x 19
 y 18
 end
-arch blackrock
+arch blocked
 x 19
 y 19
 end
 arch blocked
 x 19
-y 19
-end
-arch blackrock
-x 19
 y 20
 end
 arch blocked
 x 19
-y 20
-end
-arch blackrock
-x 19
-y 21
-end
-arch blocked
-x 19
 y 21
 end
 arch blackrock
@@ -2665,10 +2317,6 @@ arch cave17
 x 20
 y 20
 end
-arch blackrock
-x 20
-y 21
-end
 arch blocked
 x 20
 y 21
@@ -2745,28 +2393,16 @@ arch cave2
 x 20
 y 31
 end
-arch blackrock
+arch blocked
 x 21
 y 2
 end
 arch blocked
 x 21
-y 2
-end
-arch blackrock
-x 21
 y 3
 end
 arch blocked
 x 21
-y 3
-end
-arch blackrock
-x 21
-y 4
-end
-arch blocked
-x 21
 y 4
 end
 arch blackrock
@@ -2828,6 +2464,10 @@ arch blocked
 x 21
 y 14
 end
+arch blackrock
+x 21
+y 15
+end
 arch cave18
 x 21
 y 15
@@ -2950,36 +2590,20 @@ end
 arch blocked
 x 22
 end
-arch blackrock
-x 22
-y 1
-end
 arch blocked
 x 22
 y 1
 end
-arch blackrock
+arch blocked
 x 22
 y 2
 end
 arch blocked
 x 22
-y 2
-end
-arch blackrock
-x 22
 y 3
 end
 arch blocked
 x 22
-y 3
-end
-arch blackrock
-x 22
-y 4
-end
-arch blocked
-x 22
 y 4
 end
 arch blackrock
@@ -3014,6 +2638,10 @@ arch cave6
 x 22
 y 9
 end
+arch blackrock
+x 22
+y 10
+end
 arch cave20
 x 22
 y 10
@@ -3034,6 +2662,10 @@ arch blocked
 x 22
 y 14
 end
+arch blackrock
+x 22
+y 15
+end
 arch cave4
 x 22
 y 15
@@ -3137,36 +2769,20 @@ end
 arch blocked
 x 23
 end
-arch blackrock
-x 23
-y 1
-end
 arch blocked
 x 23
 y 1
 end
-arch blackrock
+arch blocked
 x 23
 y 2
 end
 arch blocked
 x 23
-y 2
-end
-arch blackrock
-x 23
 y 3
 end
 arch blocked
 x 23
-y 3
-end
-arch blackrock
-x 23
-y 4
-end
-arch blocked
-x 23
 y 4
 end
 arch blackrock
@@ -3228,6 +2844,10 @@ arch blocked
 x 23
 y 14
 end
+arch blackrock
+x 23
+y 15
+end
 arch cave19
 x 23
 y 15
@@ -3323,18 +2943,10 @@ end
 arch blocked
 x 24
 end
-arch blackrock
-x 24
-y 1
-end
 arch blocked
 x 24
 y 1
 end
-arch blackrock
-x 24
-y 2
-end
 arch blocked
 x 24
 y 2
@@ -3383,10 +2995,6 @@ arch cave20
 x 24
 y 8
 end
-arch blackrock
-x 24
-y 9
-end
 arch blocked
 x 24
 y 9
@@ -3507,18 +3115,10 @@ arch cave23
 x 24
 y 29
 end
-arch blackrock
-x 24
-y 30
-end
 arch blocked
 x 24
 y 30
 end
-arch blackrock
-x 24
-y 31
-end
 arch blocked
 x 24
 y 31
@@ -3586,6 +3186,10 @@ arch cave3
 x 25
 y 9
 end
+arch blackrock
+x 25
+y 10
+end
 arch cave23
 x 25
 y 10
@@ -3610,28 +3214,16 @@ arch blocked
 x 25
 y 15
 end
-arch blackrock
+arch blocked
 x 25
 y 16
 end
 arch blocked
 x 25
-y 16
-end
-arch blackrock
-x 25
 y 17
 end
 arch blocked
 x 25
-y 17
-end
-arch blackrock
-x 25
-y 18
-end
-arch blocked
-x 25
 y 18
 end
 arch blackrock
@@ -3710,18 +3302,10 @@ arch cave2
 x 25
 y 29
 end
-arch blackrock
-x 25
-y 30
-end
 arch blocked
 x 25
 y 30
 end
-arch blackrock
-x 25
-y 31
-end
 arch blocked
 x 25
 y 31
@@ -3820,44 +3404,24 @@ arch blocked
 x 26
 y 15
 end
-arch blackrock
-x 26
-y 16
-end
 arch blocked
 x 26
 y 16
 end
-arch blackrock
+arch blocked
 x 26
 y 17
 end
 arch blocked
 x 26
-y 17
-end
-arch blackrock
-x 26
 y 18
 end
 arch blocked
 x 26
-y 18
-end
-arch blackrock
-x 26
 y 19
 end
 arch blocked
 x 26
-y 19
-end
-arch blackrock
-x 26
-y 20
-end
-arch blocked
-x 26
 y 20
 end
 arch blackrock
@@ -3904,21 +3468,16 @@ arch cave2
 x 26
 y 29
 end
-arch blackrock
+arch blocked
 x 26
 y 30
 end
 arch blocked
 x 26
-y 30
+y 31
 end
 arch blackrock
-x 26
-y 31
-end
-arch blocked
-x 26
-y 31
+x 27
 end
 arch cave18
 x 27
@@ -4011,44 +3570,24 @@ arch blocked
 x 27
 y 15
 end
-arch blackrock
-x 27
-y 16
-end
 arch blocked
 x 27
 y 16
 end
-arch blackrock
+arch blocked
 x 27
 y 17
 end
 arch blocked
 x 27
-y 17
-end
-arch blackrock
-x 27
 y 18
 end
 arch blocked
 x 27
-y 18
-end
-arch blackrock
-x 27
 y 19
 end
 arch blocked
 x 27
-y 19
-end
-arch blackrock
-x 27
-y 20
-end
-arch blocked
-x 27
 y 20
 end
 arch blackrock
@@ -4107,18 +3646,10 @@ arch cave20
 x 27
 y 29
 end
-arch blackrock
-x 27
-y 30
-end
 arch blocked
 x 27
 y 30
 end
-arch blackrock
-x 27
-y 31
-end
 arch blocked
 x 27
 y 31
@@ -4201,44 +3732,24 @@ arch blocked
 x 28
 y 15
 end
-arch blackrock
-x 28
-y 16
-end
 arch blocked
 x 28
 y 16
 end
-arch blackrock
+arch blocked
 x 28
 y 17
 end
 arch blocked
 x 28
-y 17
-end
-arch blackrock
-x 28
 y 18
 end
 arch blocked
 x 28
-y 18
-end
-arch blackrock
-x 28
 y 19
 end
 arch blocked
 x 28
-y 19
-end
-arch blackrock
-x 28
-y 20
-end
-arch blocked
-x 28
 y 20
 end
 arch blackrock
@@ -4293,36 +3804,20 @@ arch cave20
 x 28
 y 27
 end
-arch blackrock
-x 28
-y 28
-end
 arch blocked
 x 28
 y 28
 end
-arch blackrock
+arch blocked
 x 28
 y 29
 end
 arch blocked
 x 28
-y 29
-end
-arch blackrock
-x 28
 y 30
 end
 arch blocked
 x 28
-y 30
-end
-arch blackrock
-x 28
-y 31
-end
-arch blocked
-x 28
 y 31
 end
 arch blackrock
@@ -4435,22 +3930,42 @@ arch blocked
 x 29
 y 21
 end
+arch blackrock
+x 29
+y 22
+end
 arch cave19
 x 29
 y 22
 end
+arch blackrock
+x 29
+y 23
+end
 arch cave20
 x 29
 y 23
 end
+arch blackrock
+x 29
+y 24
+end
 arch cave19
 x 29
 y 24
 end
+arch blackrock
+x 29
+y 25
+end
 arch cave1
 x 29
 y 25
 end
+arch blackrock
+x 29
+y 26
+end
 arch cave20
 x 29
 y 26
@@ -4475,6 +3990,9 @@ arch blocked
 x 29
 y 31
 end
+arch blackrock
+x 30
+end
 arch cave19
 x 30
 end
@@ -4541,6 +4059,10 @@ arch cave1
 x 30
 y 9
 end
+arch blackrock
+x 30
+y 10
+end
 arch cave22
 x 30
 y 10
@@ -4632,6 +4154,10 @@ end
 arch blocked
 x 31
 end
+arch blackrock
+x 31
+y 1
+end
 arch cave19
 x 31
 y 1
@@ -4652,10 +4178,18 @@ arch cave1
 x 31
 y 3
 end
+arch blackrock
+x 31
+y 4
+end
 arch cave20
 x 31
 y 4
 end
+arch blackrock
+x 31
+y 5
+end
 arch cave19
 x 31
 y 5
@@ -4676,6 +4210,10 @@ arch cave1
 x 31
 y 7
 end
+arch blackrock
+x 31
+y 8
+end
 arch cave22
 x 31
 y 8