diff --git a/pup_land/lone_town/shops/buildshop b/pup_land/lone_town/shops/buildshop
index 0febe19c9..20eaefcff 100644
--- a/pup_land/lone_town/shops/buildshop
+++ b/pup_land/lone_town/shops/buildshop
@@ -9,7 +9,7 @@ width 40
 height 26
 enter_x 19
 enter_y 20
-shopitems building material:95;item builder:95;*:-100
+shopitem building material:95;item builder:95;*:-100
 shopgreed 1.0
 end
 arch cobblestones
@@ -2416,10 +2416,14 @@ arch cobblestones
 x 18
 y 22
 end
-arch window_win2
+arch wall_1_3
 x 18
 y 22
 end
+arch dungeon_magic
+x 18
+y 23
+end
 arch cobblestones
 x 18
 y 23
@@ -2542,21 +2546,30 @@ arch cobblestones
 x 19
 y 21
 end
-arch oakdoor
+arch invis_exit
 slaying /pup_land/lone_town/town
-hp 7
+hp 6
 sp 16
 x 19
-y 21
+y 22
+end
+arch dungeon_magic
+x 19
+y 22
 end
 arch cobblestones
 x 19
 y 22
 end
-arch window_win2
+arch door_2
+no_pass 0
 x 19
 y 22
 end
+arch dungeon_magic
+x 19
+y 23
+end
 arch cobblestones
 x 19
 y 23
@@ -2676,21 +2689,30 @@ arch cobblestones
 x 20
 y 21
 end
-arch oakdoor
+arch invis_exit
 slaying /pup_land/lone_town/town
 hp 7
 sp 16
 x 20
-y 21
+y 22
+end
+arch dungeon_magic
+x 20
+y 22
 end
 arch cobblestones
 x 20
 y 22
 end
-arch window_win2
+arch door_2
+no_pass 0
 x 20
 y 22
 end
+arch dungeon_magic
+x 20
+y 23
+end
 arch cobblestones
 x 20
 y 23
@@ -2861,10 +2883,14 @@ arch cobblestones
 x 21
 y 22
 end
-arch window_win2
+arch wall_1_4
 x 21
 y 22
 end
+arch dungeon_magic
+x 21
+y 23
+end
 arch cobblestones
 x 21
 y 23
diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town
index 43be4a6d0..0272efa7c 100644
--- a/pup_land/lone_town/town
+++ b/pup_land/lone_town/town
@@ -706,7 +706,7 @@ arch market1
 name Acme Building Supply
 slaying /pup_land/lone_town/shops/buildshop
 hp 19
-sp 20
+sp 21
 x 6
 y 15
 end
@@ -828,11 +828,11 @@ arch grass
 x 7
 y 15
 end
-arch market2
+arch market3
 name Acme Building Supply
 slaying /pup_land/lone_town/shops/buildshop
-hp 19
-sp 20
+hp 20
+sp 21
 x 7
 y 15
 end
@@ -930,14 +930,6 @@ arch grass
 x 8
 y 15
 end
-arch market3
-name Acme Building Supply
-slaying /pup_land/lone_town/shops/buildshop
-hp 20
-sp 20
-x 8
-y 15
-end
 arch cobblestones
 x 8
 y 16
@@ -1021,7 +1013,11 @@ arch grass
 x 9
 y 12
 end
-arch evergreens
+arch grass
+x 9
+y 13
+end
+arch evergreens2
 x 9
 y 13
 end
@@ -1318,10 +1314,6 @@ arch grass
 x 12
 y 13
 end
-arch grass
-x 12
-y 14
-end
 arch footpath_3_4
 x 12
 y 14
@@ -2157,7 +2149,7 @@ end
 arch dwall_2_1_2
 x 20
 end
-arch grass
+arch evergreen
 x 20
 y 1
 end
@@ -2165,39 +2157,39 @@ arch pstone_1
 x 20
 y 2
 end
-arch grass
+arch evergreen
 x 20
 y 3
 end
-arch grass
+arch evergreen
 x 20
 y 4
 end
-arch grass
+arch evergreen
 x 20
 y 5
 end
-arch grass
+arch evergreen
 x 20
 y 6
 end
-arch grass
+arch evergreen
 x 20
 y 7
 end
-arch grass
+arch evergreen
 x 20
 y 8
 end
-arch grass
+arch evergreen
 x 20
 y 9
 end
-arch grass
+arch evergreen
 x 20
 y 10
 end
-arch grass
+arch evergreen
 x 20
 y 11
 end
@@ -2213,7 +2205,7 @@ arch rcrook_we-sw
 x 20
 y 13
 end
-arch grass
+arch evergreen
 x 20
 y 14
 end
@@ -2221,7 +2213,7 @@ arch pstone_1
 x 20
 y 15
 end
-arch grass
+arch evergreen
 x 20
 y 16
 end
@@ -2251,7 +2243,7 @@ end
 arch dwall_2_1_2
 x 21
 end
-arch grass
+arch evergreen
 x 21
 y 1
 end
@@ -2259,23 +2251,23 @@ arch pstone_1
 x 21
 y 2
 end
-arch grass
+arch evergreen
 x 21
 y 3
 end
-arch grass
+arch evergreen
 x 21
 y 4
 end
-arch grass
+arch evergreen
 x 21
 y 5
 end
-arch grass
+arch evergreen
 x 21
 y 6
 end
-arch grass
+arch evergreen
 x 21
 y 7
 end
@@ -2283,11 +2275,11 @@ arch evergreen
 x 21
 y 8
 end
-arch grass
+arch evergreen
 x 21
 y 9
 end
-arch grass
+arch evergreen
 x 21
 y 10
 end
@@ -2319,7 +2311,7 @@ arch grass
 x 21
 y 16
 end
-arch brush
+arch evergreen
 x 21
 y 17
 end
@@ -2345,15 +2337,15 @@ end
 arch dwall_2_1_2
 x 22
 end
-arch grass
+arch evergreen
 x 22
 y 1
 end
-arch grass
+arch evergreen
 x 22
 y 2
 end
-arch grass
+arch pstone_1
 x 22
 y 3
 end
@@ -2361,7 +2353,7 @@ arch grass
 x 22
 y 4
 end
-arch grass
+arch pstone_1
 x 22
 y 5
 end
@@ -2395,7 +2387,7 @@ arch grass
 x 22
 y 9
 end
-arch grass
+arch pstone_1
 x 22
 y 10
 end
@@ -2453,43 +2445,43 @@ end
 arch dwall_2_1_2
 x 23
 end
-arch grass
+arch evergreen
 x 23
 y 1
 end
-arch grass
+arch evergreen
 x 23
 y 2
 end
-arch grass
+arch evergreen
 x 23
 y 3
 end
-arch grass
+arch evergreen
 x 23
 y 4
 end
-arch grass
+arch evergreen
 x 23
 y 5
 end
-arch grass
+arch evergreen
 x 23
 y 6
 end
-arch grass
+arch evergreen
 x 23
 y 7
 end
-arch grass
+arch evergreen
 x 23
 y 8
 end
-arch grass
+arch evergreen
 x 23
 y 9
 end
-arch grass
+arch evergreen
 x 23
 y 10
 end
@@ -2559,39 +2551,39 @@ arch dwall_2_2_1
 x 24
 y 1
 end
-arch grass
+arch evergreen
 x 24
 y 2
 end
-arch brush
+arch evergreen
 x 24
 y 3
 end
-arch grass
+arch evergreen
 x 24
 y 4
 end
-arch grass
+arch evergreen
 x 24
 y 5
 end
-arch grass
+arch evergreen
 x 24
 y 6
 end
-arch grass
+arch evergreen
 x 24
 y 7
 end
-arch brush
+arch evergreen
 x 24
 y 8
 end
-arch grass
+arch evergreen
 x 24
 y 9
 end
-arch grass
+arch evergreen
 x 24
 y 10
 end
@@ -2637,7 +2629,7 @@ arch grass
 x 24
 y 17
 end
-arch grass
+arch evergreen
 x 24
 y 18
 end