diff --git a/world/world_102_115 b/world/world_102_115
index f6f1d3410..07ceaee7e 100644
--- a/world/world_102_115
+++ b/world/world_102_115
@@ -808,7 +808,7 @@ x 3
 y 15
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 3
 y 15
 end
@@ -825,7 +825,7 @@ x 3
 y 18
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 3
 y 18
 end
@@ -1313,7 +1313,7 @@ x 5
 y 16
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 5
 y 16
 end
@@ -2560,7 +2560,7 @@ x 10
 y 17
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 10
 y 17
 end
@@ -3333,7 +3333,7 @@ x 13
 y 22
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 13
 y 22
 end
@@ -3563,7 +3563,7 @@ x 14
 y 19
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 14
 y 19
 end
@@ -3784,7 +3784,7 @@ x 15
 y 14
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 15
 y 14
 end
@@ -4051,7 +4051,7 @@ x 16
 y 19
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 16
 y 19
 end
@@ -4786,7 +4786,7 @@ x 19
 y 21
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 19
 y 21
 end
@@ -4803,7 +4803,7 @@ x 19
 y 24
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 19
 y 24
 end
@@ -5264,7 +5264,7 @@ x 21
 y 18
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 21
 y 18
 end
@@ -6009,7 +6009,7 @@ x 24
 y 19
 end
 arch mushroom_1
-no_pcik 1
+no_pick 1
 x 24
 y 19
 end
diff --git a/world/world_105_113 b/world/world_105_113
index 1d2c15fb7..b2369a736 100644
--- a/world/world_105_113
+++ b/world/world_105_113
@@ -1549,10 +1549,15 @@ arch tree6
 x 7
 y 16
 end
+arch grass
+x 7
+y 17
+end
 arch hole
 name Abyss
 slaying /euthville/wiz1
 hp 3
+is_floor 0
 x 7
 y 17
 end
diff --git a/world/world_105_115 b/world/world_105_115
index 4ce420833..e36941ed6 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -10590,6 +10590,10 @@ arch mountain2
 x 33
 y 14
 end
+arch mountain2
+x 33
+y 15
+end
 arch mountain_cave2
 msg
 layoutstyle maze
@@ -10605,6 +10609,7 @@ orientation 1
 finalmap /quests/peterm/random_quests/goblin_chief
 endmsg
 slaying /!
+is_floor 0
 x 33
 y 15
 end
diff --git a/world/world_105_116 b/world/world_105_116
index fe0353a52..f85eeeaa2 100644
--- a/world/world_105_116
+++ b/world/world_105_116
@@ -1839,10 +1839,15 @@ arch mountain
 x 9
 y 20
 end
+arch mountain
+x 9
+y 21
+end
 arch mountain_cave
 slaying /scorn/dtabb/cave3
 hp 19
 sp 3
+is_floor 0
 x 9
 y 21
 end
@@ -3589,10 +3594,15 @@ arch mountain
 x 18
 y 9
 end
+arch mountain
+x 18
+y 10
+end
 arch mountain_cave
 slaying /scorn/temples/gnarg
 hp 4
 sp 10
+is_floor 0
 x 18
 y 10
 end
diff --git a/world/world_105_118 b/world/world_105_118
index 16282d106..cda9708cb 100644
--- a/world/world_105_118
+++ b/world/world_105_118
@@ -6947,6 +6947,11 @@ elevation 7187
 x 28
 y 2
 end
+arch mountain
+elevation 7187
+x 28
+y 3
+end
 arch mountain_cave2
 msg
 floorstyle stones2
@@ -6959,6 +6964,7 @@ dungeon_depth 8
 final_map /quests/peterm/quests/wyvern_quest
 endmsg
 slaying /!
+is_floor 0
 x 28
 y 3
 end
diff --git a/world/world_106_115 b/world/world_106_115
index 7e74f7e28..cf36cfdd4 100644
--- a/world/world_106_115
+++ b/world/world_106_115
@@ -2261,6 +2261,11 @@ elevation 5615
 x 9
 y 17
 end
+arch mountain
+elevation 5615
+x 9
+y 18
+end
 arch hole
 msg
 layoutstyle maze
@@ -2274,6 +2279,7 @@ orientation 1
 final_map /quests/peterm/quests/ogre_chief
 endmsg
 slaying /!
+is_floor 0
 x 9
 y 18
 end
diff --git a/world/world_106_116 b/world/world_106_116
index 0dcd59580..e5ff1d54c 100644
--- a/world/world_106_116
+++ b/world/world_106_116
@@ -3504,6 +3504,7 @@ arch hole
 slaying /dungeons/hole
 hp 18
 sp 17
+is_floor 0
 x 14
 y 10
 end
diff --git a/world/world_107_114 b/world/world_107_114
index 3e58266d3..46ff97f10 100644
--- a/world/world_107_114
+++ b/world/world_107_114
@@ -5608,11 +5608,17 @@ elevation 5502
 x 22
 y 33
 end
+arch mountain
+elevation 5502
+x 22
+y 34
+end
 arch mountain_cave
 name Strange Mountain
 slaying /quests/hendel/mountain_pass
 hp 27
 sp 12
+is_floor 0
 x 22
 y 34
 end
diff --git a/world/world_107_124 b/world/world_107_124
index 0f378c98c..9e54cdd6b 100644
--- a/world/world_107_124
+++ b/world/world_107_124
@@ -2117,6 +2117,7 @@ arch mountain_cave
 slaying /brest/brittany/enigme.1
 hp 16
 sp 33
+is_floor 0
 x 8
 y 32
 end
@@ -3541,6 +3542,7 @@ arch mountain_cave2
 slaying /brest/brittany/khazad.1
 hp 1
 sp 20
+is_floor 0
 x 14
 y 16
 end
diff --git a/world/world_108_123 b/world/world_108_123
index 9fb63283d..f18513672 100644
--- a/world/world_108_123
+++ b/world/world_108_123
@@ -1968,10 +1968,16 @@ elevation 6631
 x 8
 y 17
 end
+arch grass
+elevation 4000
+x 8
+y 18
+end
 arch hole
 slaying /brest/brittany/hole
 hp 49
 sp 11
+is_floor 0
 x 8
 y 18
 end
diff --git a/world/world_109_126 b/world/world_109_126
index 850f5c61d..24531d47f 100644
--- a/world/world_109_126
+++ b/world/world_109_126
@@ -8398,10 +8398,16 @@ name_pl bellow
 x 32
 y 22
 end
+arch mountain
+elevation 8000
+x 32
+y 22
+end
 arch mountain_cave2
 slaying /lake_country/shops/Mopoon_wshop
 hp 7
 sp 7
+is_floor 0
 x 32
 y 22
 end
@@ -9097,10 +9103,15 @@ arch wasteland
 x 35
 y 19
 end
+arch mountain
+x 35
+y 20
+end
 arch mountain_cave
 slaying /lake_country/snake_pit/snakepit_1
 hp 7
 sp 16
+is_floor 0
 x 35
 y 20
 end
@@ -9566,6 +9577,7 @@ arch mountain_cave
 slaying /lake_country/snake_pit/snakepit_5
 hp 38
 sp 4
+is_floor 0
 x 37
 y 19
 end
diff --git a/world/world_111_117 b/world/world_111_117
index e2cb1305c..e4a688a17 100644
--- a/world/world_111_117
+++ b/world/world_111_117
@@ -7894,10 +7894,16 @@ elevation 9014
 x 31
 y 42
 end
+arch mountain2
+elevation 9014
+x 31
+y 43
+end
 arch mountain_cave
 slaying /quests/peterm/DragonQuest/Entrance
 hp 1
 sp 7
+is_floor 0
 x 31
 y 43
 end
@@ -9883,6 +9889,11 @@ elevation 9882
 x 39
 y 41
 end
+arch mountain2
+elevation 9882
+x 39
+y 42
+end
 arch magic_mouth
 msg
 You notice a well-hidden cave, high in
@@ -9903,6 +9914,7 @@ final_map /quests/peterm/quests/dragonquest2
 dungeon_depth 12
 endmsg
 slaying /!
+is_floor 0
 x 39
 y 42
 end
diff --git a/world/world_116_103 b/world/world_116_103
index e95bb1d80..f5100ba59 100644
--- a/world/world_116_103
+++ b/world/world_116_103
@@ -11104,10 +11104,16 @@ elevation 5888
 x 44
 y 42
 end
+arch mountain
+elevation 5888
+x 44
+y 43
+end
 arch mountain_cave
 slaying /darcap/cave/level1
 hp 9
 sp 9
+is_floor 0
 x 44
 y 43
 end
diff --git a/world/world_120_108 b/world/world_120_108
index bc1283c54..36b3b9905 100644
--- a/world/world_120_108
+++ b/world/world_120_108
@@ -4574,6 +4574,11 @@ arch cobblestones
 x 18
 y 28
 end
+arch mountain
+elevation 8197
+x 18
+y 29
+end
 arch mountain_cave
 msg
 Going through the old mine tunnels should save a lot
@@ -4583,6 +4588,7 @@ endmsg
 slaying /under_world/uworld_120_109
 hp 1
 sp 1
+is_floor 0
 x 18
 y 29
 end
diff --git a/world/world_120_109 b/world/world_120_109
index 791dab512..9297cfe72 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -10431,6 +10431,11 @@ elevation 7059
 x 41
 y 36
 end
+arch mountain
+elevation 7059
+x 41
+y 37
+end
 arch mountain_cave
 msg
 Going through the old mine tunnels should save a lot
@@ -10440,6 +10445,7 @@ endmsg
 slaying /under_world/uworld_120_109
 hp 24
 sp 58
+is_floor 0
 x 41
 y 37
 end