diff --git a/data/movements/scripts/misc/snow.lua b/data/movements/scripts/misc/snow.lua
index 86fb79f..1618d47 100644
--- a/data/movements/scripts/misc/snow.lua
+++ b/data/movements/scripts/misc/snow.lua
@@ -3,7 +3,12 @@ function onStepOut(creature, item, position, fromPosition)
 	if player and player:isInGhostMode() then
 		return true
 	end
-
+	
+	local tile = Tile(position)
+	if tile == nil or tile:hasProperty(CONST_PROP_HASHEIGHT) then
+		return true
+	end
+	
 	if item.itemid == 799 then
 		item:transform(6594)
 	else
diff --git a/data/world800/map-house.xml b/data/world800/map-house.xml
index 4ed9a45..9e5a3e0 100644
--- a/data/world800/map-house.xml
+++ b/data/world800/map-house.xml
@@ -963,35 +963,35 @@
 	<house name="Tusk Flats 2" houseid="2415" entryx="32301" entryy="31117" entryz="7" rent="835" townid="13" size="16" />
 	<house name="Tusk Flats 3" houseid="2416" entryx="32308" entryy="31111" entryz="7" rent="660" townid="13" size="11" />
 	<house name="Tusk Flats 4" houseid="2417" entryx="32307" entryy="31105" entryz="7" rent="315" townid="13" size="6" />
-	<house name="Tusk Flats 6" houseid="2418" entryx="32308" entryy="31099" entryz="7" rent="660" townid="13" size="12" />
-	<house name="Tusk Flats 5" houseid="2419" entryx="32320" entryy="31108" entryz="7" rent="455" townid="13" size="11" />
-	<house name="Shady Rocks 5" houseid="2420" entryx="32288" entryy="31125" entryz="7" rent="2890" townid="13" size="57" />
-	<house name="Shady Rocks 4 (Shop)" houseid="2421" entryx="32279" entryy="31118" entryz="7" rent="2710" townid="13" size="50" />
+	<house name="Tusk Flats 6" houseid="2418" entryx="32308" entryy="31099" entryz="7" rent="660" townid="13" size="11" />
+	<house name="Tusk Flats 5" houseid="2419" entryx="32320" entryy="31108" entryz="7" rent="455" townid="13" size="10" />
+	<house name="Shady Rocks 5" houseid="2420" entryx="32288" entryy="31125" entryz="7" rent="2890" townid="13" size="55" />
+	<house name="Shady Rocks 4 (Shop)" houseid="2421" entryx="32279" entryy="31118" entryz="7" rent="2710" townid="13" size="48" />
 	<house name="Shady Rocks 3" houseid="2422" entryx="32277" entryy="31121" entryz="7" rent="4115" townid="13" size="76" />
-	<house name="Shady Rocks 2" houseid="2423" entryx="32259" entryy="31119" entryz="7" rent="2010" townid="13" size="29" />
-	<house name="Shady Rocks 1" houseid="2424" entryx="32259" entryy="31110" entryz="7" rent="3630" townid="13" size="65" />
-	<house name="Crystal Glance" houseid="2425" entryx="32246" entryy="31118" entryz="7" rent="19625" townid="13" size="235" />
+	<house name="Shady Rocks 2" houseid="2423" entryx="32259" entryy="31119" entryz="7" rent="2010" townid="13" size="27" />
+	<house name="Shady Rocks 1" houseid="2424" entryx="32259" entryy="31110" entryz="7" rent="3630" townid="13" size="63" />
+	<house name="Crystal Glance" houseid="2425" entryx="32246" entryy="31118" entryz="7" rent="19625" townid="13" size="229" />
 	<house name="Arena Walk 3" houseid="2426" entryx="32235" entryy="31118" entryz="7" rent="3550" townid="13" size="59" />
-	<house name="Arena Walk 2" houseid="2427" entryx="32239" entryy="31126" entryz="7" rent="1400" townid="13" size="21" />
-	<house name="Arena Walk 1" houseid="2428" entryx="32238" entryy="31134" entryz="7" rent="3250" townid="13" size="55" />
-	<house name="Bears Paw 2" houseid="2429" entryx="32241" entryy="31133" entryz="7" rent="2305" townid="13" size="44" />
-	<house name="Bears Paw 1" houseid="2430" entryx="32264" entryy="31132" entryz="7" rent="1810" townid="13" size="33" />
+	<house name="Arena Walk 2" houseid="2427" entryx="32239" entryy="31126" entryz="7" rent="1400" townid="13" size="20" />
+	<house name="Arena Walk 1" houseid="2428" entryx="32238" entryy="31134" entryz="7" rent="3250" townid="13" size="51" />
+	<house name="Bears Paw 2" houseid="2429" entryx="32241" entryy="31133" entryz="7" rent="2305" townid="13" size="42" />
+	<house name="Bears Paw 1" houseid="2430" entryx="32264" entryy="31132" entryz="7" rent="1810" townid="13" size="32" />
 	<house name="Spirit Homes 5" houseid="2431" entryx="32223" entryy="31142" entryz="7" rent="1450" townid="13" size="21" />
 	<house name="Glacier Side 3" houseid="2432" entryx="32206" entryy="31140" entryz="7" rent="1950" townid="13" size="30" />
-	<house name="Glacier Side 2" houseid="2433" entryx="32203" entryy="31132" entryz="7" rent="4750" townid="13" size="83" />
-	<house name="Glacier Side 1" houseid="2434" entryx="32206" entryy="31126" entryz="7" rent="1600" townid="13" size="26" />
-	<house name="Spirit Homes 1" houseid="2435" entryx="32210" entryy="31124" entryz="7" rent="1700" townid="13" size="27" />
-	<house name="Spirit Homes 2" houseid="2436" entryx="32219" entryy="31124" entryz="7" rent="1900" townid="13" size="31" />
+	<house name="Glacier Side 2" houseid="2433" entryx="32203" entryy="31132" entryz="7" rent="4750" townid="13" size="82" />
+	<house name="Glacier Side 1" houseid="2434" entryx="32206" entryy="31126" entryz="7" rent="1600" townid="13" size="23" />
+	<house name="Spirit Homes 1" houseid="2435" entryx="32210" entryy="31124" entryz="7" rent="1700" townid="13" size="26" />
+	<house name="Spirit Homes 2" houseid="2436" entryx="32219" entryy="31124" entryz="7" rent="1900" townid="13" size="29" />
 	<house name="Spirit Homes 3" houseid="2437" entryx="32216" entryy="31124" entryz="6" rent="4250" townid="13" size="75" />
-	<house name="Spirit Homes 4" houseid="2438" entryx="32220" entryy="31129" entryz="7" rent="1100" townid="13" size="19" />
-	<house name="Glacier Side 4" houseid="2439" entryx="32204" entryy="31147" entryz="6" rent="2050" townid="13" size="38" />
-	<house name="Shelf Site" houseid="2440" entryx="32197" entryy="31150" entryz="6" rent="4800" townid="13" size="83" />
+	<house name="Spirit Homes 4" houseid="2438" entryx="32220" entryy="31129" entryz="7" rent="1100" townid="13" size="18" />
+	<house name="Glacier Side 4" houseid="2439" entryx="32204" entryy="31147" entryz="6" rent="2050" townid="13" size="37" />
+	<house name="Shelf Site" houseid="2440" entryx="32197" entryy="31150" entryz="6" rent="4800" townid="13" size="80" />
 	<house name="Raven Corner 1" houseid="2441" entryx="32234" entryy="31154" entryz="7" rent="855" townid="13" size="15" />
-	<house name="Raven Corner 2" houseid="2442" entryx="32233" entryy="31156" entryz="7" rent="1685" townid="13" size="25" />
+	<house name="Raven Corner 2" houseid="2442" entryx="32233" entryy="31156" entryz="7" rent="1685" townid="13" size="24" />
 	<house name="Raven Corner 3" houseid="2443" entryx="32234" entryy="31157" entryz="7" rent="855" townid="13" size="15" />
-	<house name="Bears Paw 3" houseid="2444" entryx="32248" entryy="31157" entryz="7" rent="2090" townid="13" size="35" />
-	<house name="Bears Paw 4" houseid="2445" entryx="32256" entryy="31158" entryz="7" rent="5205" townid="13" size="98" />
-	<house name="Bears Paw 5" houseid="2446" entryx="32272" entryy="31157" entryz="7" rent="2045" townid="13" size="34" />
+	<house name="Bears Paw 3" houseid="2444" entryx="32248" entryy="31157" entryz="7" rent="2090" townid="13" size="33" />
+	<house name="Bears Paw 4" houseid="2445" entryx="32256" entryy="31158" entryz="7" rent="5205" townid="13" size="96" />
+	<house name="Bears Paw 5" houseid="2446" entryx="32272" entryy="31157" entryz="7" rent="2045" townid="13" size="32" />
 	<house name="Trout Plaza 5 (Shop)" houseid="2447" entryx="32268" entryy="31174" entryz="7" rent="3880" townid="13" size="73" />
 	<house name="Pilchard Bin 1" houseid="2448" entryx="32280" entryy="31164" entryz="7" rent="685" townid="13" size="8" />
 	<house name="Pilchard Bin 2" houseid="2449" entryx="32280" entryy="31160" entryz="7" rent="685" townid="13" size="8" />
@@ -1000,22 +1000,22 @@
 	<house name="Pilchard Bin 5" houseid="2452" entryx="32280" entryy="31148" entryz="7" rent="685" townid="13" size="8" />
 	<house name="Pilchard Bin 10" houseid="2453" entryx="32281" entryy="31148" entryz="6" rent="450" townid="13" size="7" />
 	<house name="Pilchard Bin 9" houseid="2454" entryx="32281" entryy="31152" entryz="6" rent="450" townid="13" size="7" />
-	<house name="Pilchard Bin 8" houseid="2455" entryx="32281" entryy="31156" entryz="6" rent="450" townid="13" size="6" />
+	<house name="Pilchard Bin 8" houseid="2455" entryx="32281" entryy="31156" entryz="6" rent="450" townid="13" size="5" />
 	<house name="Pilchard Bin 7" houseid="2456" entryx="32281" entryy="31160" entryz="6" rent="450" townid="13" size="7" />
 	<house name="Pilchard Bin 6" houseid="2457" entryx="32281" entryy="31164" entryz="6" rent="450" townid="13" size="7" />
 	<house name="Trout Plaza 1" houseid="2458" entryx="32248" entryy="31166" entryz="7" rent="2395" townid="13" size="42" />
 	<house name="Trout Plaza 2" houseid="2459" entryx="32260" entryy="31161" entryz="7" rent="1540" townid="13" size="26" />
-	<house name="Trout Plaza 3" houseid="2460" entryx="32255" entryy="31173" entryz="7" rent="900" townid="13" size="18" />
-	<house name="Trout Plaza 4" houseid="2461" entryx="32255" entryy="31177" entryz="7" rent="900" townid="13" size="18" />
-	<house name="Skiffs End 1" houseid="2462" entryx="32250" entryy="31187" entryz="7" rent="1540" townid="13" size="28" />
-	<house name="Skiffs End 2" houseid="2463" entryx="32257" entryy="31189" entryz="7" rent="910" townid="13" size="13" />
+	<house name="Trout Plaza 3" houseid="2460" entryx="32255" entryy="31173" entryz="7" rent="900" townid="13" size="16" />
+	<house name="Trout Plaza 4" houseid="2461" entryx="32255" entryy="31177" entryz="7" rent="900" townid="13" size="16" />
+	<house name="Skiffs End 1" houseid="2462" entryx="32250" entryy="31187" entryz="7" rent="1540" townid="13" size="25" />
+	<house name="Skiffs End 2" houseid="2463" entryx="32257" entryy="31189" entryz="7" rent="910" townid="13" size="12" />
 	<house name="Furrier Quarter 3" houseid="2464" entryx="32232" entryy="31191" entryz="7" rent="1010" townid="13" size="20" />
 	<house name="Mammoth Belly" houseid="2465" entryx="32241" entryy="31174" entryz="7" rent="22810" townid="13" size="278" />
 	<house name="Furrier Quarter 2" houseid="2466" entryx="32225" entryy="31177" entryz="7" rent="1045" townid="13" size="21" />
-	<house name="Furrier Quarter 1" houseid="2467" entryx="32221" entryy="31176" entryz="7" rent="1635" townid="13" size="34" />
-	<house name="Fimbul Shelf 3" houseid="2468" entryx="32215" entryy="31177" entryz="7" rent="1255" townid="13" size="28" />
-	<house name="Fimbul Shelf 4" houseid="2469" entryx="32218" entryy="31191" entryz="7" rent="1045" townid="13" size="22" />
+	<house name="Furrier Quarter 1" houseid="2467" entryx="32221" entryy="31176" entryz="7" rent="1635" townid="13" size="32" />
+	<house name="Fimbul Shelf 3" houseid="2468" entryx="32215" entryy="31177" entryz="7" rent="1255" townid="13" size="27" />
+	<house name="Fimbul Shelf 4" houseid="2469" entryx="32218" entryy="31191" entryz="7" rent="1045" townid="13" size="21" />
 	<house name="Fimbul Shelf 2" houseid="2470" entryx="32209" entryy="31175" entryz="7" rent="1045" townid="13" size="21" />
 	<house name="Fimbul Shelf 1" houseid="2471" entryx="32204" entryy="31169" entryz="7" rent="975" townid="13" size="20" />
-	<house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="381" />
+	<house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="378" />
 </houses>
diff --git a/data/world800/map-spawn.xml b/data/world800/map-spawn.xml
index d4e38e5..aee60b7 100644
--- a/data/world800/map-spawn.xml
+++ b/data/world800/map-spawn.xml
@@ -1064,9 +1064,6 @@
 	<spawn centerx="32146" centery="31094" centerz="4" radius="2">
 		<monster name="winter wolf" x="1" y="1" z="4" spawntime="240" />
 	</spawn>
-	<spawn centerx="32252" centery="31097" centerz="4" radius="1">
-		<npc name="Iyad" x="-1" y="0" z="4" spawntime="240" />
-	</spawn>
 	<spawn centerx="32145" centery="31101" centerz="4" radius="2">
 		<monster name="frost troll" x="-1" y="-2" z="4" spawntime="240" />
 		<monster name="winter wolf" x="-1" y="1" z="4" spawntime="240" />
@@ -1996,9 +1993,6 @@
 		<monster name="winter wolf" x="-1" y="-1" z="5" spawntime="240" />
 		<monster name="winter wolf" x="1" y="2" z="5" spawntime="240" />
 	</spawn>
-	<spawn centerx="32212" centery="31057" centerz="5" radius="2">
-		<npc name="Romir" x="-1" y="1" z="5" spawntime="240" />
-	</spawn>
 	<spawn centerx="32180" centery="31058" centerz="5" radius="2">
 		<monster name="mammoth" x="2" y="0" z="5" spawntime="240" />
 	</spawn>
@@ -2094,7 +2088,6 @@
 		<monster name="winter wolf" x="1" y="1" z="5" spawntime="240" />
 	</spawn>
 	<spawn centerx="32120" centery="31093" centerz="5" radius="2">
-		<npc name="A Starving Dog" x="2" y="-2" z="5" spawntime="240" />
 		<monster name="deer" x="0" y="-1" z="5" spawntime="240" />
 	</spawn>
 	<spawn centerx="32171" centery="31094" centerz="5" radius="2">
@@ -2342,7 +2335,6 @@
 		<monster name="Frost Dragon" x="0" y="0" z="5" spawntime="240" />
 	</spawn>
 	<spawn centerx="32023" centery="31443" centerz="5" radius="2">
-		<npc name="Freezhild" x="1" y="-1" z="5" spawntime="240" />
 		<monster name="Barbarian Bloodwalker" x="2" y="2" z="5" spawntime="240" />
 	</spawn>
 	<spawn centerx="32159" centery="31444" centerz="5" radius="1">
@@ -3256,22 +3248,10 @@
 	<spawn centerx="31943" centery="32951" centerz="5" radius="2">
 		<monster name="pirate cutthroat" x="-1" y="1" z="5" spawntime="600" />
 	</spawn>
-	<spawn centerx="32361" centery="31029" centerz="6" radius="2">
-		<npc name="Siflind" x="-1" y="1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="31950" centery="31046" centerz="6" radius="1" />
-	<spawn centerx="32234" centery="31074" centerz="6" radius="2">
-		<npc name="Robert" x="-1" y="-1" z="6" spawntime="240" />
-	</spawn>
-	<spawn centerx="32254" centery="31081" centerz="6" radius="2">
-		<npc name="Hawkyr" x="1" y="-1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32130" centery="31090" centerz="6" radius="3">
 		<monster name="stone golem" x="0" y="1" z="6" spawntime="240" />
 	</spawn>
-	<spawn centerx="32263" centery="31090" centerz="6" radius="2">
-		<npc name="Thorwulf" x="1" y="0" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32104" centery="31091" centerz="6" radius="2">
 		<monster name="frost troll" x="1" y="-2" z="6" spawntime="240" />
 		<monster name="frost troll" x="2" y="2" z="6" spawntime="240" />
@@ -3283,9 +3263,6 @@
 	<spawn centerx="32059" centery="31108" centerz="6" radius="2">
 		<monster name="mammoth" x="-1" y="0" z="6" spawntime="240" />
 	</spawn>
-	<spawn centerx="32342" centery="31108" centerz="6" radius="2">
-		<npc name="Captain Breezelda" x="-1" y="1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32046" centery="31110" centerz="6" radius="3">
 		<monster name="frost troll" x="-2" y="-3" z="6" spawntime="240" />
 		<monster name="Silver Rabbit" x="2" y="-3" z="6" spawntime="240" />
@@ -3327,9 +3304,6 @@
 	<spawn centerx="32042" centery="31122" centerz="6" radius="2">
 		<monster name="mammoth" x="0" y="0" z="6" spawntime="240" />
 	</spawn>
-	<spawn centerx="32354" centery="31125" centerz="6" radius="3">
-		<npc name="Captain Haba" x="-1" y="-1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32036" centery="31127" centerz="6" radius="2">
 		<monster name="mammoth" x="1" y="0" z="6" spawntime="240" />
 	</spawn>
@@ -3695,17 +3669,11 @@
 		<monster name="winter wolf" x="2" y="-2" z="6" spawntime="240" />
 		<monster name="mammoth" x="2" y="1" z="6" spawntime="240" />
 	</spawn>
-	<spawn centerx="32344" centery="31323" centerz="6" radius="2">
-		<npc name="Baltim" x="-1" y="-1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32156" centery="31324" centerz="6" radius="4">
 		<monster name="Barbarian Headsplitter" x="0" y="-2" z="6" spawntime="240" />
 		<monster name="Barbarian Headsplitter" x="0" y="2" z="6" spawntime="240" />
 		<monster name="Barbarian Skullhunter" x="2" y="3" z="6" spawntime="240" />
 	</spawn>
-	<spawn centerx="32363" centery="31325" centerz="6" radius="2">
-		<npc name="Zora" x="1" y="-1" z="6" spawntime="240" />
-	</spawn>
 	<spawn centerx="32193" centery="31326" centerz="6" radius="3">
 		<monster name="winter wolf" x="-2" y="-2" z="6" spawntime="240" />
 		<monster name="winter wolf" x="-1" y="2" z="6" spawntime="240" />
@@ -5536,9 +5504,6 @@
 		<monster name="Penguin" x="3" y="3" z="7" spawntime="240" />
 		<monster name="polar bear" x="-1" y="4" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32349" centery="31026" centerz="7" radius="3">
-		<npc name="Hjaern" x="2" y="0" z="7" spawntime="90" />
-	</spawn>
 	<spawn centerx="32329" centery="31027" centerz="7" radius="3">
 		<monster name="polar bear" x="-1" y="-3" z="7" spawntime="90" />
 		<monster name="polar bear" x="1" y="-1" z="7" spawntime="90" />
@@ -5577,9 +5542,6 @@
 		<monster name="Penguin" x="2" y="-1" z="7" spawntime="240" />
 		<monster name="Penguin" x="-1" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32329" centery="31046" centerz="7" radius="2">
-		<npc name="Nilsor" x="1" y="0" z="7" spawntime="90" />
-	</spawn>
 	<spawn centerx="32330" centery="31046" centerz="7" radius="2" />
 	<spawn centerx="32279" centery="31047" centerz="7" radius="4">
 		<monster name="Penguin" x="1" y="-3" z="7" spawntime="240" />
@@ -5795,9 +5757,6 @@
 		<monster name="frost troll" x="-1" y="1" z="7" spawntime="240" />
 		<monster name="frost troll" x="3" y="2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32301" centery="31081" centerz="7" radius="1">
-		<npc name="Iskan" x="1" y="1" z="7" spawntime="90" />
-	</spawn>
 	<spawn centerx="32302" centery="31082" centerz="7" radius="2" />
 	<spawn centerx="32456" centery="31082" centerz="7" radius="1">
 		<monster name="Chakoya Tribewarden" x="0" y="-1" z="7" spawntime="240" />
@@ -5839,9 +5798,6 @@
 	<spawn centerx="32416" centery="31085" centerz="7" radius="1">
 		<monster name="Penguin" x="1" y="-1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32426" centery="31085" centerz="7" radius="2">
-		<npc name="Sinatuki" x="-1" y="0" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32465" centery="31085" centerz="7" radius="1">
 		<monster name="Chakoya Toolshaper" x="1" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -5888,9 +5844,6 @@
 		<monster name="Chakoya Tribewarden" x="-2" y="2" z="7" spawntime="240" />
 		<monster name="Chakoya Tribewarden" x="2" y="2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32227" centery="31098" centerz="7" radius="5">
-		<npc name="Halvar" x="1" y="-2" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32464" centery="31098" centerz="7" radius="1">
 		<monster name="Chakoya Toolshaper" x="0" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -5948,9 +5901,6 @@
 		<monster name="Chakoya Windcaller" x="-1" y="-1" z="7" spawntime="240" />
 		<monster name="Chakoya Windcaller" x="1" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32319" centery="31112" centerz="7" radius="1">
-		<npc name="Bertha" x="0" y="1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32484" centery="31114" centerz="7" radius="1">
 		<monster name="Chakoya Windcaller" x="-1" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -5967,9 +5917,6 @@
 		<monster name="Chakoya Tribewarden" x="-1" y="1" z="7" spawntime="240" />
 		<monster name="polar bear" x="1" y="2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32326" centery="31118" centerz="7" radius="3">
-		<npc name="Sirik" x="2" y="0" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32139" centery="31119" centerz="7" radius="3">
 		<monster name="Novice Of The Cult" x="1" y="2" z="7" spawntime="240" />
 	</spawn>
@@ -6025,21 +5972,9 @@
 	<spawn centerx="32240" centery="31131" centerz="7" radius="2">
 		<monster name="Husky" x="-1" y="-1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32279" centery="31132" centerz="7" radius="1">
-		<npc name="Janz" x="0" y="-1" z="7" spawntime="240" />
-	</spawn>
-	<spawn centerx="32212" centery="31133" centerz="7" radius="3">
-		<npc name="Kjesse" x="-1" y="-1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32018" centery="31134" centerz="7" radius="2">
 		<monster name="Penguin" x="-1" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32308" centery="31134" centerz="7" radius="1">
-		<npc name="Nelly" x="-1" y="0" z="7" spawntime="240" />
-	</spawn>
-	<spawn centerx="32319" centery="31135" centerz="7" radius="2">
-		<npc name="Lurik" x="-1" y="0" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32122" centery="31136" centerz="7" radius="5">
 		<monster name="gargoyle" x="-2" y="-5" z="7" spawntime="240" />
 		<monster name="mammoth" x="1" y="-4" z="7" spawntime="240" />
@@ -6052,19 +5987,10 @@
 		<monster name="Penguin" x="-2" y="0" z="7" spawntime="240" />
 		<monster name="Barbarian Skullhunter" x="2" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32300" centery="31138" centerz="7" radius="2">
-		<npc name="Jessica" x="-1" y="-2" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32059" centery="31140" centerz="7" radius="3">
 		<monster name="Ice Golem" x="3" y="0" z="7" spawntime="240" />
 		<monster name="Ice Golem" x="-2" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32285" centery="31140" centerz="7" radius="5">
-		<npc name="Fynn" x="3" y="-5" z="7" spawntime="240" />
-	</spawn>
-	<spawn centerx="32217" centery="31142" centerz="7" radius="3">
-		<npc name="Eirik" x="2" y="0" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32060" centery="31148" centerz="7" radius="3">
 		<monster name="Ice Witch" x="0" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -6072,9 +5998,7 @@
 		<monster name="deer" x="0" y="0" z="7" spawntime="240" />
 		<monster name="Penguin" x="0" y="1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32202" centery="31154" centerz="7" radius="1">
-		<npc name="Sven" x="0" y="-1" z="7" spawntime="240" />
-	</spawn>
+	<spawn centerx="32202" centery="31154" centerz="7" radius="1" />
 	<spawn centerx="32482" centery="31154" centerz="7" radius="2">
 		<monster name="ghoul" x="0" y="-1" z="7" spawntime="240" />
 		<monster name="Penguin" x="0" y="1" z="7" spawntime="240" />
@@ -6087,9 +6011,7 @@
 		<monster name="skeleton" x="-1" y="1" z="7" spawntime="240" />
 		<monster name="skeleton" x="2" y="2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32209" centery="31156" centerz="7" radius="1">
-		<npc name="Rashid" x="0" y="0" z="7" spawntime="60" />
-	</spawn>
+	<spawn centerx="32209" centery="31156" centerz="7" radius="1" />
 	<spawn centerx="32059" centery="31157" centerz="7" radius="3">
 		<monster name="Ice Witch" x="-1" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -6098,9 +6020,7 @@
 		<monster name="winter wolf" x="-2" y="0" z="7" spawntime="240" />
 		<monster name="winter wolf" x="2" y="0" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32201" centery="31161" centerz="7" radius="1">
-		<npc name="Dankwart" x="1" y="0" z="7" spawntime="240" />
-	</spawn>
+	<spawn centerx="32201" centery="31161" centerz="7" radius="1" />
 	<spawn centerx="32062" centery="31165" centerz="7" radius="3">
 		<monster name="Crystal Spider" x="-1" y="-1" z="7" spawntime="240" />
 	</spawn>
@@ -6129,9 +6049,6 @@
 	<spawn centerx="32250" centery="31172" centerz="7" radius="2">
 		<monster name="Husky" x="-1" y="0" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32463" centery="31174" centerz="7" radius="2">
-		<npc name="Buddel Helheim" x="-1" y="-1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32230" centery="31177" centerz="7" radius="2">
 		<monster name="Husky" x="1" y="0" z="7" spawntime="240" />
 	</spawn>
@@ -6176,9 +6093,6 @@
 	<spawn centerx="32350" centery="31196" centerz="7" radius="4">
 		<monster name="Penguin" x="-1" y="-2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32255" centery="31198" centerz="7" radius="3">
-		<npc name="Buddel" x="0" y="-3" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32337" centery="31202" centerz="7" radius="4">
 		<monster name="Penguin" x="2" y="0" z="7" spawntime="240" />
 		<monster name="Penguin" x="-2" y="1" z="7" spawntime="240" />
@@ -6236,9 +6150,6 @@
 		<monster name="winter wolf" x="-1" y="-2" z="7" spawntime="240" />
 		<monster name="winter wolf" x="2" y="3" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32333" centery="31228" centerz="7" radius="2">
-		<npc name="Buddel Tyrsung" x="-1" y="-1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="31971" centery="31231" centerz="7" radius="2">
 		<monster name="deer" x="1" y="0" z="7" spawntime="240" />
 		<monster name="deer" x="1" y="1" z="7" spawntime="240" />
@@ -6557,9 +6468,6 @@
 	<spawn centerx="32325" centery="31292" centerz="7" radius="2">
 		<monster name="Penguin" x="-1" y="0" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32021" centery="31293" centerz="7" radius="3">
-		<npc name="Buddel Raider Camp" x="-1" y="1" z="7" spawntime="90" />
-	</spawn>
 	<spawn centerx="32065" centery="31293" centerz="7" radius="3" />
 	<spawn centerx="32020" centery="31294" centerz="7" radius="2" />
 	<spawn centerx="32385" centery="31294" centerz="7" radius="5">
@@ -6925,9 +6833,6 @@
 	<spawn centerx="32133" centery="31370" centerz="7" radius="2">
 		<monster name="rabbit" x="-1" y="-1" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32153" centery="31375" centerz="7" radius="2">
-		<npc name="Buddel Raider Camp" x="0" y="1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32135" centery="31377" centerz="7" radius="2">
 		<monster name="polar bear" x="-1" y="-2" z="7" spawntime="240" />
 		<monster name="polar bear" x="1" y="2" z="7" spawntime="240" />
@@ -6943,9 +6848,6 @@
 		<monster name="Barbarian Headsplitter" x="1" y="2" z="7" spawntime="240" />
 		<monster name="Barbarian Brutetamer" x="-1" y="3" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32225" centery="31381" centerz="7" radius="2">
-		<npc name="Buddel Okolnir" x="-1" y="0" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="31997" centery="31382" centerz="7" radius="3">
 		<monster name="Barbarian Brutetamer" x="3" y="1" z="7" spawntime="240" />
 	</spawn>
@@ -7000,11 +6902,11 @@
 		<monster name="Barbarian Headsplitter" x="-2" y="0" z="7" spawntime="240" />
 		<monster name="Barbarian Headsplitter" x="0" y="2" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="31973" centery="31402" centerz="7" radius="3">
-		<monster name="Barbarian Brutetamer" x="-1" y="0" z="7" spawntime="240" />
-		<monster name="Barbarian Brutetamer" x="-1" y="3" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32047" centery="31402" centerz="7" radius="3" />
+	<spawn centerx="31973" centery="31403" centerz="7" radius="3">
+		<monster name="Barbarian Brutetamer" x="-1" y="-1" z="7" spawntime="240" />
+		<monster name="Barbarian Brutetamer" x="-1" y="2" z="7" spawntime="240" />
+	</spawn>
 	<spawn centerx="32279" centery="31403" centerz="7" radius="2">
 		<monster name="frost dragon hatchling" x="2" y="-2" z="7" spawntime="240" />
 		<monster name="frost dragon hatchling" x="-2" y="2" z="7" spawntime="240" />
@@ -7185,9 +7087,6 @@
 	<spawn centerx="32165" centery="31442" centerz="7" radius="2">
 		<monster name="frost dragon hatchling" x="0" y="0" z="7" spawntime="240" />
 	</spawn>
-	<spawn centerx="32002" centery="31444" centerz="7" radius="2">
-		<npc name="Nor" x="2" y="-1" z="7" spawntime="240" />
-	</spawn>
 	<spawn centerx="32006" centery="31444" centerz="7" radius="1" />
 	<spawn centerx="32181" centery="31445" centerz="7" radius="2">
 		<monster name="Frost Dragon" x="1" y="0" z="7" spawntime="240" />
@@ -35104,7 +35003,6 @@
 	</spawn>
 	<spawn centerx="32258" centery="31100" centerz="10" radius="3">
 		<monster name="cave rat" x="0" y="-1" z="10" spawntime="90" />
-		<npc name="A Restless Soul" x="-2" y="1" z="10" spawntime="240" />
 		<monster name="cave rat" x="-1" y="1" z="10" spawntime="240" />
 		<monster name="cave rat" x="1" y="1" z="10" spawntime="240" />
 		<monster name="cave rat" x="-2" y="2" z="10" spawntime="240" />
diff --git a/data/world800/map.otbm b/data/world800/map.otbm
index cb88abb..e76b52a 100644
Binary files a/data/world800/map.otbm and b/data/world800/map.otbm differ