diff --git a/quests/peterm/quests/dragonquest2 b/quests/peterm/quests/dragonquest2
index 139f1c740..3ef23ba85 100644
--- a/quests/peterm/quests/dragonquest2
+++ b/quests/peterm/quests/dragonquest2
@@ -6,7 +6,7 @@ enter_x 2
 enter_y 2
 msg
 Created:  1994-08-19 peterm (peterm@soda.csua.berkeley.edu)
-Modified: 2008-03-24 Nicolas Weeger
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -36,18 +36,12 @@ end
 arch blocked
 y 7
 end
-arch pstone_2
-y 8
-end
 arch cave19
 y 8
 end
 arch blocked
 y 8
 end
-arch pstone_2
-y 9
-end
 arch cave14
 y 9
 end
@@ -61,9 +55,6 @@ passageway here.
 endmsg
 y 10
 end
-arch pstone_2
-y 10
-end
 arch blocked
 y 10
 end
@@ -74,9 +65,6 @@ passage way here
 endmsg
 y 11
 end
-arch pstone_2
-y 11
-end
 arch blocked
 y 11
 end
@@ -87,24 +75,15 @@ passageway here.
 endmsg
 y 12
 end
-arch pstone_2
-y 12
-end
 arch blocked
 y 12
 end
-arch pstone_2
-y 13
-end
 arch cave15
 y 13
 end
 arch blocked
 y 13
 end
-arch pstone_2
-y 14
-end
 arch cave20
 y 14
 end
@@ -207,9 +186,6 @@ end
 arch blocked
 y 38
 end
-arch pstone_1
-y 39
-end
 arch blocked
 y 39
 end
@@ -267,10 +243,6 @@ arch blocked
 x 1
 y 8
 end
-arch pstone_1
-x 1
-y 9
-end
 arch cave25
 x 1
 y 9
@@ -279,10 +251,6 @@ arch blocked
 x 1
 y 9
 end
-arch pstone_1
-x 1
-y 10
-end
 arch cave14
 x 1
 y 10
@@ -291,10 +259,6 @@ arch blocked
 x 1
 y 10
 end
-arch pstone_2
-x 1
-y 11
-end
 arch blocked
 x 1
 y 11
@@ -323,10 +287,6 @@ arch cave23
 x 1
 y 13
 end
-arch pstone_1
-x 1
-y 14
-end
 arch cave23
 x 1
 y 14
@@ -467,6 +427,10 @@ arch cave12
 x 1
 y 36
 end
+arch pstone_2
+x 1
+y 37
+end
 arch cave23
 x 1
 y 37
@@ -475,10 +439,6 @@ arch blocked
 x 1
 y 38
 end
-arch pstone_1
-x 1
-y 39
-end
 arch blocked
 x 1
 y 39
@@ -533,6 +493,10 @@ arch blocked
 x 2
 y 7
 end
+arch pstone_2
+x 2
+y 8
+end
 arch blocked
 x 2
 y 8
@@ -621,6 +585,10 @@ arch cave17
 x 2
 y 17
 end
+arch pstone_2
+x 2
+y 18
+end
 arch cave24
 x 2
 y 18
@@ -745,6 +713,10 @@ arch cave11
 x 2
 y 36
 end
+arch pstone_2
+x 2
+y 37
+end
 arch cave22
 x 2
 y 37
@@ -753,10 +725,6 @@ arch blocked
 x 2
 y 38
 end
-arch pstone_1
-x 2
-y 39
-end
 arch blocked
 x 2
 y 39
@@ -795,6 +763,10 @@ arch cave12
 x 3
 y 4
 end
+arch pstone_2
+x 3
+y 5
+end
 arch cave17
 x 3
 y 5
@@ -991,10 +963,6 @@ arch blocked
 x 3
 y 38
 end
-arch pstone_1
-x 3
-y 39
-end
 arch blocked
 x 3
 y 39
@@ -1202,10 +1170,6 @@ arch blocked
 x 4
 y 38
 end
-arch pstone_1
-x 4
-y 39
-end
 arch blocked
 x 4
 y 39
@@ -1420,10 +1384,6 @@ arch cave2
 x 5
 y 36
 end
-arch pstone_1
-x 5
-y 37
-end
 arch blocked
 x 5
 y 37
@@ -1432,10 +1392,6 @@ arch blocked
 x 5
 y 38
 end
-arch pstone_1
-x 5
-y 39
-end
 arch blocked
 x 5
 y 39
@@ -1506,14 +1462,6 @@ arch pstone_2
 x 6
 y 10
 end
-arch cave5
-x 6
-y 10
-end
-arch pstone_2
-x 6
-y 10
-end
 arch pstone_2
 x 6
 y 11
@@ -1662,10 +1610,6 @@ arch blocked
 x 6
 y 38
 end
-arch pstone_1
-x 6
-y 39
-end
 arch blocked
 x 6
 y 39
@@ -1732,14 +1676,6 @@ arch pstone_2
 x 7
 y 9
 end
-arch cave24
-x 7
-y 9
-end
-arch pstone_2
-x 7
-y 9
-end
 arch pstone_2
 x 7
 y 10
@@ -1804,6 +1740,10 @@ arch cave20
 x 7
 y 17
 end
+arch pstone_2
+x 7
+y 18
+end
 arch cave25
 x 7
 y 18
@@ -1908,10 +1848,6 @@ arch blocked
 x 7
 y 38
 end
-arch pstone_1
-x 7
-y 39
-end
 arch blocked
 x 7
 y 39
@@ -1962,6 +1898,10 @@ arch cave17
 x 8
 y 7
 end
+arch pstone_2
+x 8
+y 8
+end
 arch cave19
 x 8
 y 8
@@ -2022,6 +1962,10 @@ arch cave20
 x 8
 y 16
 end
+arch pstone_2
+x 8
+y 17
+end
 arch blocked
 x 8
 y 17
@@ -2030,6 +1974,10 @@ arch cave24
 x 8
 y 17
 end
+arch pstone_2
+x 8
+y 18
+end
 arch blocked
 x 8
 y 18
@@ -2146,10 +2094,6 @@ arch blocked
 x 8
 y 38
 end
-arch pstone_1
-x 8
-y 39
-end
 arch blocked
 x 8
 y 39
@@ -2240,6 +2184,10 @@ arch cave11
 x 9
 y 14
 end
+arch pstone_2
+x 9
+y 15
+end
 arch cave22
 x 9
 y 15
@@ -2372,10 +2320,6 @@ arch blocked
 x 9
 y 38
 end
-arch pstone_1
-x 9
-y 39
-end
 arch blocked
 x 9
 y 39
@@ -2470,6 +2414,10 @@ arch cave7
 x 10
 y 14
 end
+arch pstone_2
+x 10
+y 15
+end
 arch cave17
 x 10
 y 15
@@ -2590,6 +2538,10 @@ arch cave12
 x 10
 y 37
 end
+arch pstone_2
+x 10
+y 38
+end
 arch cave23
 x 10
 y 38
@@ -2804,6 +2756,10 @@ arch cave15
 x 11
 y 37
 end
+arch pstone_2
+x 11
+y 38
+end
 arch cave22
 x 11
 y 38
@@ -3010,6 +2966,10 @@ arch cave15
 x 12
 y 36
 end
+arch pstone_2
+x 12
+y 37
+end
 arch cave20
 x 12
 y 37
@@ -4297,6 +4257,10 @@ arch cave12
 x 17
 y 39
 end
+arch pstone_2
+x 17
+y 40
+end
 arch cave23
 x 17
 y 40
@@ -4531,6 +4495,10 @@ arch cave11
 x 18
 y 39
 end
+arch pstone_2
+x 18
+y 40
+end
 arch cave22
 x 18
 y 40
@@ -5148,10 +5116,6 @@ arch cave2
 x 21
 y 39
 end
-arch pstone_1
-x 21
-y 40
-end
 arch blocked
 x 21
 y 40
@@ -5476,6 +5440,10 @@ arch cave20
 x 23
 y 20
 end
+arch pstone_2
+x 23
+y 21
+end
 arch cave25
 x 23
 y 21
@@ -6244,6 +6212,10 @@ arch cave15
 x 27
 y 12
 end
+arch pstone_2
+x 27
+y 13
+end
 arch cave20
 x 27
 y 13
@@ -6606,6 +6578,10 @@ arch cave15
 x 28
 y 39
 end
+arch pstone_2
+x 28
+y 40
+end
 arch cave20
 x 28
 y 40
@@ -6672,6 +6648,10 @@ arch cave15
 x 29
 y 12
 end
+arch pstone_2
+x 29
+y 13
+end
 arch cave22
 x 29
 y 13
@@ -6918,10 +6898,6 @@ arch cave2
 x 30
 y 12
 end
-arch pstone_1
-x 30
-y 13
-end
 arch blocked
 x 30
 y 13
@@ -7201,10 +7177,6 @@ arch cave17
 x 31
 y 13
 end
-arch pstone_1
-x 31
-y 14
-end
 arch blocked
 x 31
 y 14
@@ -7313,10 +7285,18 @@ arch cave18
 x 31
 y 29
 end
+arch pstone_2
+x 31
+y 30
+end
 arch cave17
 x 31
 y 30
 end
+arch pstone_2
+x 31
+y 31
+end
 arch cave18
 x 31
 y 31
@@ -7451,14 +7431,14 @@ arch cave20
 x 32
 y 13
 end
-arch pstone_1
-x 32
-y 14
-end
 arch blocked
 x 32
 y 14
 end
+arch large_stones
+x 32
+y 15
+end
 arch cave25
 x 32
 y 15
@@ -7607,28 +7587,16 @@ arch cave17
 x 32
 y 37
 end
-arch pstone_1
+arch blocked
 x 32
 y 38
 end
 arch blocked
 x 32
-y 38
-end
-arch pstone_1
-x 32
 y 39
 end
 arch blocked
 x 32
-y 39
-end
-arch pstone_1
-x 32
-y 40
-end
-arch blocked
-x 32
 y 40
 end
 arch pstone_2
@@ -7701,18 +7669,10 @@ arch cave23
 x 33
 y 13
 end
-arch pstone_1
-x 33
-y 14
-end
 arch blocked
 x 33
 y 14
 end
-arch pstone_1
-x 33
-y 15
-end
 arch blocked
 x 33
 y 15
@@ -7853,10 +7813,6 @@ arch cave17
 x 33
 y 39
 end
-arch pstone_1
-x 33
-y 40
-end
 arch blocked
 x 33
 y 40
@@ -7923,28 +7879,16 @@ arch cave2
 x 34
 y 13
 end
-arch pstone_1
+arch blocked
 x 34
 y 14
 end
 arch blocked
 x 34
-y 14
-end
-arch pstone_1
-x 34
 y 15
 end
 arch blocked
 x 34
-y 15
-end
-arch pstone_1
-x 34
-y 16
-end
-arch blocked
-x 34
 y 16
 end
 arch pstone_1
@@ -8154,6 +8098,10 @@ arch cave12
 x 35
 y 13
 end
+arch pstone_2
+x 35
+y 14
+end
 arch cave23
 x 35
 y 14
@@ -8376,6 +8324,10 @@ arch cave11
 x 36
 y 13
 end
+arch pstone_2
+x 36
+y 14
+end
 arch cave22
 x 36
 y 14
@@ -8611,10 +8563,6 @@ arch blocked
 x 37
 y 15
 end
-arch pstone_1
-x 37
-y 16
-end
 arch blocked
 x 37
 y 16
@@ -8755,6 +8703,10 @@ end
 arch blocked
 x 38
 end
+arch pstone_2
+x 38
+y 1
+end
 arch cave19
 x 38
 y 1
@@ -8835,6 +8787,10 @@ arch cave6
 x 38
 y 12
 end
+arch pstone_2
+x 38
+y 13
+end
 arch cave22
 x 38
 y 13
@@ -8847,18 +8803,10 @@ arch blocked
 x 38
 y 15
 end
-arch pstone_1
-x 38
-y 16
-end
 arch blocked
 x 38
 y 16
 end
-arch pstone_1
-x 38
-y 17
-end
 arch blocked
 x 38
 y 17
@@ -9079,28 +9027,16 @@ arch blocked
 x 39
 y 15
 end
-arch pstone_1
+arch blocked
 x 39
 y 16
 end
 arch blocked
 x 39
-y 16
-end
-arch pstone_1
-x 39
 y 17
 end
 arch blocked
 x 39
-y 17
-end
-arch pstone_1
-x 39
-y 18
-end
-arch blocked
-x 39
 y 18
 end
 arch pstone_1
@@ -9318,36 +9254,20 @@ arch blocked
 x 40
 y 15
 end
-arch pstone_1
-x 40
-y 16
-end
 arch blocked
 x 40
 y 16
 end
-arch pstone_1
+arch blocked
 x 40
 y 17
 end
 arch blocked
 x 40
-y 17
-end
-arch pstone_1
-x 40
 y 18
 end
 arch blocked
 x 40
-y 18
-end
-arch pstone_1
-x 40
-y 19
-end
-arch blocked
-x 40
 y 19
 end
 arch pstone_1
@@ -9510,10 +9430,6 @@ arch cave22
 x 40
 y 39
 end
-arch pstone_1
-x 40
-y 40
-end
 arch blocked
 x 40
 y 40
diff --git a/quests/peterm/temple/GemTunnel b/quests/peterm/temple/GemTunnel
index d388867f4..2bbb2ae51 100644
--- a/quests/peterm/temple/GemTunnel
+++ b/quests/peterm/temple/GemTunnel
@@ -6,9 +6,11 @@ width 8
 height 40
 msg
 Created:  1994-01-14 peterm (peterm@soda.berkeley.edu)
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
+arch cobblestones
+end
 arch bwall_2_2_2
 end
 arch cobblestones