diff --git a/quests/greyshield/Castle b/quests/greyshield/Castle
index b27ec21be..5e1403d93 100644
--- a/quests/greyshield/Castle
+++ b/quests/greyshield/Castle
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 30
 msg
 Created:  1996-09-16 Chris Jeske
-Modified: 2012-03-09 Rick Tanner
+Modified: 2016-02-12 Kevin Zheng
 endmsg
 end
 arch woods_3
@@ -2754,12 +2754,13 @@ arch cobblestones2
 x 15
 y 24
 end
-arch sea1
+arch biglake_n
 name moat
 x 15
 y 25
+move_block 0
 end
-arch drawbridge_2
+arch river_bridge_ns
 x 15
 y 25
 end
@@ -2947,12 +2948,13 @@ arch cobblestones2
 x 16
 y 24
 end
-arch sea1
+arch biglake_n
 name moat
 x 16
 y 25
+move_block 0
 end
-arch drawbridge_2
+arch river_bridge_ns
 x 16
 y 25
 end
diff --git a/quests/greyshield/Cavern b/quests/greyshield/Cavern
index b5a069a68..5d36118b9 100644
--- a/quests/greyshield/Cavern
+++ b/quests/greyshield/Cavern
@@ -9,7 +9,7 @@ enter_x 15
 enter_y 18
 msg
 Created:  1996-09-13 Chris Jeske
-Modified: 2012-03-09 Rick Tanner
+Modified: 2016-02-12 radish
 endmsg
 end
 arch cave_15
@@ -1629,7 +1629,7 @@ name page
 msg
 (It appears to be a page ripped from a book.)
 
-...since the guard will not let me into the fortress, I used my magicks to create a secre entrance into one of the castle's bedrooms...
+...since the guard will not let me into the fortress, I used my magicks to create a secret entrance into one of the castle's bedrooms...
 
 ...locked up the teleporter and moved the trigger to a different cave, as the entrance was in danger of being discovered by the...