diff --git a/game/data/botdata/bot_dialogue.json b/game/data/botdata/bot_dialogue.json
index 175cd4e..e89dc04 100644
--- a/game/data/botdata/bot_dialogue.json
+++ b/game/data/botdata/bot_dialogue.json
@@ -159,7 +159,6 @@
     " /this @name looks dumb",
     "AAAAAAAAAAAAAAAAAAAAAAAAHHHHHH!!!",
     "como estas @name",
-    "Summer = always the best community manaer",
     "so how about that ceikry guy",
     "so how about that kermit dude",
     "woah is an abusive mod",
@@ -169,7 +168,6 @@
     "Where do i find partyhats?",
     "Why do mobs drop boxes?",
     "What exp rate do you play on @name?",
-    "Have you met Summer?",
     "Hey @name",
     "Hey @name",
     "Hey @name",
diff --git a/game/data/botdata/botnames.txt b/game/data/botdata/botnames.txt
index 73757dd..3024122 100644
--- a/game/data/botdata/botnames.txt
+++ b/game/data/botdata/botnames.txt
@@ -6,17 +6,17 @@
 0416347345
 05venom04
 0600
-07Ash
-07Ashley
-07Ato07
-07Chris
-07Dans
-07Paul
-07Skillerino
-07TroyScape
-07milo456
-07scaping
-07wan
+09Ash
+09Ashley
+09Ato09
+09Chris
+09Dans
+09Paul
+09Skillerino
+09TroyScape
+09milo456
+09scaping
+09wan
 0800
 0837
 0920
@@ -26,7 +26,6 @@
 0Giesel42O
 0Joker0
 0LKI
-0SRS
 0Tempest0
 0X010
 0anabanthis0
@@ -62,7 +61,6 @@
 0rphaned
 0samaBdabbin
 0smasher0
-0srs
 0ssimpwner
 0taku
 0verdrinking
@@ -198,7 +196,7 @@
 2 h p
 2000
 2006nope
-2007Anthony
+2009Anthony
 200mslay1day
 2011Turmoil
 209th
@@ -1639,7 +1637,7 @@ Ashn
 Ashoo
 Ashsole
 Ashton
-Ashwin07
+Ashwin09
 Ashyy
 Asian
 AskMeDolCare
@@ -2044,7 +2042,7 @@ Back
 Back2Backk
 Back2ourdays
 BackInTime
-BackintheOSR
+Backinthe09RS
 Backlit
 Backus
 Baco
@@ -2521,7 +2519,7 @@ BieBras
 Biebop
 Bierliebe
 BierryTaudet
-Bierscape07
+Bierscape09
 Biffo89
 Biffsy
 Bifta89
@@ -2872,7 +2870,7 @@ Bobby Brawl
 BobbyBigLips
 BobbySmooth
 Bobbyccf
-Bobbydrake07
+Bobbydrake09
 BobbyyHill
 Bobi
 Bobicles2
@@ -2934,7 +2932,7 @@ Bomtastic
 BonQong
 Bonar
 Bond
-Bond07
+Bond09
 BondedLiam
 Bonden
 Bondkyle
@@ -4639,7 +4637,7 @@ Coronad1
 Corp
 CorpToMax
 Corpletics
-CorposRS
+Corp09RS
 CorruptDingo
 Corsa
 Corsetti
@@ -5309,7 +5307,7 @@ Darz
 Darzix
 DasGoose
 DasReich88
-Dasgirl07
+Dasgirl09
 Dat2eWoord
 DatBoyLoy
 DatGuySteve
@@ -5531,7 +5529,7 @@ Dellamor
 Dellies
 Delmaro
 Delonius
-Delphan07
+Delphan09
 Delskiii
 Delsym
 Delta
@@ -6834,7 +6832,7 @@ Engen
 Enginaer
 Enginarc
 Enginear
-Enginerd07
+Enginerd09
 Englandwon
 Englebassen
 English
@@ -6928,7 +6926,7 @@ Erijk
 Erik
 ErikProbably
 Erikci Jr
-Erikito07
+Erikito09
 Erikoiskahvi
 Erinus
 Erkki
@@ -7955,7 +7953,7 @@ Frazze
 Frazzt
 Freaak
 Freak
-Freako07
+Freako09
 Freaks
 Freakxx
 Fred
@@ -8060,7 +8058,7 @@ Frote
 Frovz
 Froya
 Froyotech
-Froz07
+Froz09
 Frozah
 Froze
 Frozen
@@ -11200,7 +11198,7 @@ Jazo
 Jazpurs
 Jazz
 JazzFlap
-JazzMaster07
+JazzMaster09
 Jazzjr89
 Jazzy
 JazzyFlips
@@ -11661,7 +11659,7 @@ Juezz90
 Juffo
 Jugalator
 Jugernought
-JuggaloOSR
+Juggalo09R
 Juggerthot
 JuhQ
 Juheniqus
@@ -12366,7 +12364,7 @@ KingCudii
 KingDweebus
 KingEider
 KingFlugal
-KingGoblin07
+KingGoblin09
 KingGrekus
 KingGunshow
 KingJacula
@@ -16531,9 +16529,9 @@ OSColbyStock
 OSGingerkiin
 OSGrindscape
 OSRASS
-OSReaper
-OSRhys
-OSRvape
+09Reaper
+09Rhys
+09Rvape
 OSSD
 OSSoulwars
 OSzerox
@@ -16582,7 +16580,7 @@ Ochit
 Ochrie
 Ocra
 Ocst
-Octane07
+Octane09
 Octanes
 OctarineJake
 Octave
@@ -16818,7 +16816,7 @@ OppositePoop
 Oprego
 Optic
 Opticplex
-Opticplex07
+Opticplex09
 Optimus
 Opts
 Optyfen
@@ -21864,7 +21862,7 @@ SteveChamp
 SteveGuy241
 SteveMCOG
 SteveMerch
-SteveOwner07
+SteveOwner09
 SteveSnow15
 SteveTheMuss
 Stevee
@@ -23209,7 +23207,7 @@ Tiffs
 Tiftanlar
 TigTheWelder
 Tiger
-Tigerheart07
+Tigerheart09
 Tigerlady
 Tigerlady203
 Tigerr
@@ -23389,7 +23387,7 @@ Tomazon
 Tombalo
 Tombat
 Tombazv2
-Tombea07
+Tombea09
 Tomdabom
 TomehhG
 TomiL
@@ -24263,7 +24261,7 @@ Valdevon
 Valdomiro B
 Valendale
 Valete
-ValgeHunt07
+ValgeHunt09
 ValheraUK
 Valhk
 Valiente
@@ -24845,7 +24843,7 @@ Warnings
 WarpedMatrix
 Warph
 Warrior
-Warrior07rs
+Warrior09rs
 WarriorHome
 Warstroy
 Wartika
@@ -24925,7 +24923,7 @@ Weaky
 Wealthy
 WeardBeird
 Wearwolf
-Weasel07
+Weasel09
 WeaselToast
 Weaselious
 Weav
@@ -26057,7 +26055,7 @@ Zetta
 Zettty
 Zeug
 Zeus
-Zeus07
+Zeus09
 Zeusvdl
 Zeveria
 Zevosh
@@ -27599,7 +27597,7 @@ fuktig
 funky
 fuzzlumpkin
 fuzzydenuts
-fwft07
+fwft09
 fxck
 fxck versace
 fyfaen
@@ -29108,7 +29106,7 @@ mks200
 mlbg
 mlgb
 mlgkittycat
-mlkia07
+mlkia09
 mlong06
 mmigo
 mmmmmmmmhmm
@@ -30519,7 +30517,7 @@ tombradynfl
 tominator87
 tommybun
 tomrichmond9
-tomriddle07
+tomriddle09
 tonttitonder
 tony el gros
 toomastoomas
@@ -30613,7 +30611,7 @@ typto
 tyrant
 tzuyah
 tzuyufan14
-u dead now07
+u dead now09
 uEnv
 uKnoTheRules
 uLiveButOnce
diff --git a/game/data/configs/drop_tables.json b/game/data/configs/drop_tables.json
index f71a005..85ef7ee 100644
--- a/game/data/configs/drop_tables.json
+++ b/game/data/configs/drop_tables.json
@@ -8087,12 +8087,6 @@
         "id": "1181",
         "maxAmount": "1"
       },
-      {
-        "minAmount": "1",
-        "weight": "1.0",
-        "id": "9185",
-        "maxAmount": "1"
-      },
       {
         "minAmount": "4",
         "weight": "10.0",
@@ -10372,13 +10366,13 @@
       {
         "minAmount": "15",
         "weight": "4.0",
-        "id": "6964",
+        "id": "995",
         "maxAmount": "15"
       },
       {
         "minAmount": "25",
         "weight": "1.0",
-        "id": "6964",
+        "id": "995",
         "maxAmount": "25"
       },
       {
@@ -33945,20 +33939,20 @@
       {
         "minAmount": "1",
         "weight": "15.0",
-        "id": "1438",
-        "maxAmount": "1"
+        "id": "1439",
+        "maxAmount": "80"
       },
       {
         "minAmount": "1",
         "weight": "15.0",
-        "id": "1440",
-        "maxAmount": "1"
+        "id": "1441",
+        "maxAmount": "80"
       },
       {
         "minAmount": "1",
         "weight": "15.0",
-        "id": "1444",
-        "maxAmount": "1"
+        "id": "1445",
+        "maxAmount": "88"
       },
       {
         "minAmount": "155",
diff --git a/game/data/configs/ground_spawns.json b/game/data/configs/ground_spawns.json
index adfa66c..82cb706 100644
--- a/game/data/configs/ground_spawns.json
+++ b/game/data/configs/ground_spawns.json
@@ -49,7 +49,7 @@
   },
   {
     "item_id": "243",
-    "loc_data": "{1,2910,9809,0,196610}-{1,2908,9805,0,196610}-{1,2902,9806,0,196610}-{1,2906,9796,0,196610}-{1,2905,9801,0,196610}"
+    "loc_data": "{1,2910,9809,0,30}-{1,2908,9805,0,30}-{1,2902,9806,0,30}-{1,2906,9796,0,30}-{1,2905,9801,0,30}"
   },
   {
     "item_id": "245",
diff --git a/game/data/configs/item_configs.json b/game/data/configs/item_configs.json
index b96b9da..68b41bf 100644
--- a/game/data/configs/item_configs.json
+++ b/game/data/configs/item_configs.json
@@ -19310,6 +19310,14 @@
     "archery_ticket_price": "0",
     "id": "1866"
   },
+  {
+    "examine": "It's all burnt.",
+    "durability": null,
+    "name": "Burnt pitta bread",
+    "tradeable": "true",
+    "archery_ticket_price": "0",
+    "id": "1867"
+  },
   {
     "durability": null,
     "name": "Burnt pitta bread",
@@ -20724,6 +20732,14 @@
     "archery_ticket_price": "0",
     "id": "2012"
   },
+  {
+    "examine": "Eew, it's horribly burnt.",
+    "durability": null,
+    "name": "Burnt curry",
+    "tradeable": "true",
+    "archery_ticket_price":"0",
+    "id":"2013"
+  },
   {
     "durability": null,
     "name": "Burnt curry",
@@ -99642,7 +99658,7 @@
   {
     "requirements": "{1,70}-{4,70}",
     "ge_buy_limit": "2",
-    "examine": "A rune plateskirt in the colours of Armadyl.",
+    "examine": "A plateskirt of great craftsmanship.",
     "rare_item": "true",
     "durability": null,
     "weight": "8",
diff --git a/game/data/configs/npc_configs.json b/game/data/configs/npc_configs.json
index b1a24c3..018c8d1 100644
--- a/game/data/configs/npc_configs.json
+++ b/game/data/configs/npc_configs.json
@@ -11632,12 +11632,14 @@
   {
     "examine": "One of the troll generals.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "attack_speed": "5",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll general",
     "defence_level": "65",
     "safespot": null,
@@ -11651,12 +11653,14 @@
   {
     "examine": "One of the troll generals.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "attack_speed": "5",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll general",
     "defence_level": "65",
     "safespot": null,
@@ -11670,12 +11674,14 @@
   {
     "examine": "One of the troll generals.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "attack_speed": "5",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll general",
     "defence_level": "65",
     "safespot": null,
@@ -11689,11 +11695,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11706,11 +11714,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11723,11 +11733,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11740,11 +11752,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11757,11 +11771,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11774,11 +11790,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11791,11 +11809,13 @@
   {
     "examine": "He's watching the arena.",
     "slayer_task": "83",
+    "melee_animation": "1259",
     "range_animation": "0",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Troll spectator",
     "defence_level": "47",
     "safespot": null,
@@ -11814,6 +11834,7 @@
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Dad",
     "defence_level": "50",
     "safespot": null,
@@ -11828,15 +11849,19 @@
     "examine": "He's guarding the cells.",
     "slayer_task": "83",
     "range_animation": "0",
+    "melee_animation": "1158",
+    "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Twig",
     "defence_level": "25",
     "safespot": null,
     "lifepoints": "90",
     "strength_level": "90",
     "id": "1126",
+    "aggressive": "true",
     "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0",
     "range_level": "1",
     "attack_level": "40"
@@ -11845,16 +11870,19 @@
     "examine": "He's guarding the cells.",
     "slayer_task": "83",
     "range_animation": "0",
+    "melee_animation": "1158",
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "7",
     "magic_animation": "0",
+    "death_animation": "287",
     "name": "Berry",
     "defence_level": "40",
     "safespot": null,
     "lifepoints": "90",
     "strength_level": "90",
     "id": "1127",
+    "aggressive": "true",
     "bonuses": "20,20,20,0,0,0,0,10,200,200,0,20,0,0,0",
     "range_level": "1",
     "attack_level": "40"
@@ -11862,7 +11890,6 @@
   {
     "examine": "He's guarding the cells.",
     "slayer_task": "83",
-    "melee_animation": "5821",
     "range_animation": "0",
     "defence_animation": "0",
     "weakness": "7",
@@ -19517,6 +19544,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "He seems to be in charge of the ship on the river.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Dwarven Boatman",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "1846",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "It is the avatar of the Arzinian Being of Bordanzan",
     "melee_animation": "1840",
@@ -22364,15 +22407,23 @@
     "attack_level": "34"
   },
   {
+    "examine": "A member of the Black Guard",
+    "slayer_task": "29",
+    "melee_animation": "99",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "weakness": "6",
     "slayer_exp": "16",
+    "magic_animation": "0",
+    "death_animation": "102",
     "name": "Black Guard",
-    "defence_level": "1",
+    "defence_level": "34",
     "safespot": null,
-    "lifepoints": "10",
-    "strength_level": "1",
+    "lifepoints": "48",
+    "strength_level": "34",
     "id": "2133",
     "range_level": "1",
-    "attack_level": "1"
+    "attack_level": "34"
   },
   {
     "examine": "An elite member of the Black Guard.",
@@ -22435,7 +22486,7 @@
     "examine": "A gnome traveller, visiting Keldagrim.",
     "name": "Gnome traveller",
     "defence_level": "1",
-    "force_talk": "Buying low-level skilling items!",
+    "force_talk": "",
     "safespot": null,
     "lifepoints": "10",
     "strength_level": "1",
@@ -22443,6 +22494,18 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "A gnome traveller, visiting Keldagrim.",
+    "name": "Gnome traveller",
+    "defence_level": "1",
+    "force_talk": "",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2139",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "Very protective of his master... and his property.",
     "melee_animation": "0",
@@ -22475,6 +22538,38 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "Proprietor of Gunslik's Assorted Items.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Gunslik",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2154",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "An old mining dwarf, now he sells pickaxes and generally acts grumpy.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Tati",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2160",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "A rather personable banker lady.",
     "melee_animation": "0",
@@ -22780,7 +22875,7 @@
     "attack_level": "1"
   },
   {
-    "examine": "A loud",
+    "examine": "A loud, drunk and generally obnoxious dwarf.",
     "melee_animation": "0",
     "range_animation": "0",
     "defence_animation": "0",
@@ -22792,12 +22887,155 @@
     "lifepoints": "10",
     "strength_level": "1",
     "id": "2187",
-    "aggressive": "true",
     "range_level": "1",
     "attack_level": "1"
   },
   {
-    "examine": "You cannot see his ship",
+    "examine": "A sad old dwarf living in a sad old home.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Runvastr",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2190",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "He seems to always be busy.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Sune",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2191",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "This dwarf doesn't seem to be very well off.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Bentamir",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2192",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A dwarf minding his own business.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Ulifed",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2193",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "A short, merry guy.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Karl",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2195",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "His kebabs certainly smell delicious.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Kjut",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2198",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "He seems to be very well off.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Audmann",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2201",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "He's had a fair bit to drink...",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Drunken Dwarf",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2202",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "He's had a fair bit to drink...",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Drunken Dwarf",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2203",
+    "range_level": "1",
+    "attack_level": "1"
+  },
+  {
+    "examine": "You cannot see his ship, but presumably he has one.",
     "melee_animation": "0",
     "range_animation": "0",
     "defence_animation": "0",
@@ -22812,6 +23050,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "You cannot see his ship, but presumably he has one.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Dwarven Boatman",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2206",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "He carries a heavy load.",
     "melee_animation": "0",
@@ -22828,6 +23082,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "An elite member of the Black Guard.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Black Guard Berserker",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2232",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "A master at farming.",
     "melee_animation": "0",
@@ -23666,6 +23936,22 @@
     "range_level": "1",
     "attack_level": "1"
   },
+  {
+    "examine": "An expert on the brewing of ales and cider.",
+    "melee_animation": "0",
+    "range_animation": "0",
+    "defence_animation": "0",
+    "magic_animation": "0",
+    "death_animation": "0",
+    "name": "Blandebir",
+    "defence_level": "1",
+    "safespot": null,
+    "lifepoints": "10",
+    "strength_level": "1",
+    "id": "2321",
+    "range_level": "1",
+    "attack_level": "1"
+  },
   {
     "examine": "Only the Grim Reaper would have a pet like this.",
     "melee_animation": "0",
@@ -24223,7 +24509,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "5",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -24246,7 +24532,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "10",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -24269,7 +24555,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "15",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -24292,7 +24578,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "25",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -24315,7 +24601,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "35",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -24338,7 +24624,7 @@
     "combat_style": "2",
     "melee_animation": "2302",
     "range_animation": "2302",
-    "combat_audio": "355,357,356",
+    "combat_audio": "2288,357,356",
     "magic_level": "45",
     "respawn_delay": "25",
     "defence_animation": "2300",
@@ -50112,6 +50398,7 @@
   },
   {
     "slayer_exp": "16",
+    "examine": "A dwarf from Keldagrim.",
     "name": "Dwarf",
     "defence_level": "1",
     "safespot": null,
@@ -50123,6 +50410,7 @@
   },
   {
     "slayer_exp": "16",
+    "examine": "A dwarf from Keldagrim.",
     "name": "Dwarf",
     "defence_level": "1",
     "safespot": null,
@@ -50134,6 +50422,7 @@
   },
   {
     "slayer_exp": "16",
+    "examine": "A dwarf from Keldagrim.",
     "name": "Dwarf",
     "defence_level": "1",
     "safespot": null,
@@ -61629,54 +61918,59 @@
     "examine": "He's just a big bully.",
     "combat_style": "1",
     "melee_animation": "8024",
-    "magic_level": "31",
+    "magic_level": "1",
     "respawn_delay": "0",
     "defence_animation": "8023",
     "death_animation": "8025",
     "name": "Bronze minotaur",
-    "defence_level": "31",
+    "defence_level": "19",
     "safespot": null,
-    "lifepoints": "15",
-    "strength_level": "1",
+    "lifepoints": "133",
+    "strength_level": "19",
     "id": "6853",
-    "bonuses": "15,20,10,15,10,5,35,0,0,0,0,0,0,0,0",
-    "range_level": "31",
-    "attack_level": "31"
+    "bonuses": "-2,6,3,0,0,15,14,9,-6,14,5,90,0,0,0",
+    "range_level": "1",
+    "attack_level": "19"
   },
   {
     "examine": "He's just a big bully.",
     "combat_style": "1",
     "melee_animation": "8024",
     "range_animation": "0",
-    "magic_level": "15",
+    "magic_level": "1",
     "respawn_delay": "0",
     "defence_animation": "0",
     "weakness": "10",
     "magic_animation": "0",
     "death_animation": "8025",
     "name": "Bronze minotaur",
-    "defence_level": "15",
+    "defence_level": "19",
     "safespot": null,
-    "lifepoints": "51",
-    "strength_level": "15",
+    "lifepoints": "133",
+    "strength_level": "19",
     "id": "6854",
-    "range_level": "15",
-    "attack_level": "15"
+    "bonuses": "15,20,10,15,10,15,15,15,0,0,0,90,0,0,0",
+    "range_level": "1",
+    "attack_level": "19"
   },
   {
+    "examine": "He's just a big bully.",
     "combat_style": "1",
     "melee_animation": "8024",
+    "magic_level": "25",
     "respawn_delay": "0",
     "defence_animation": "8023",
+    "magic_animation": "",
     "death_animation": "8025",
     "name": "Iron minotaur",
-    "defence_level": "1",
+    "defence_level": "25",
     "safespot": null,
-    "lifepoints": "24",
-    "strength_level": "1",
+    "lifepoints": "193",
+    "strength_level": "25",
     "id": "6855",
+    "bonuses": "-2,8,5,0,0,21,17,9,-6,20,5,100,0,100,0",
     "range_level": "1",
-    "attack_level": "1"
+    "attack_level": "25"
   },
   {
     "examine": "He's just a big bully.",
@@ -61692,28 +61986,112 @@
     "name": "Iron minotaur",
     "defence_level": "25",
     "safespot": null,
-    "lifepoints": "65",
+    "lifepoints": "193",
     "strength_level": "25",
     "id": "6856",
-    "range_level": "25",
+    "bonuses": "25,25,25,25,0,25,25,25,25,0,0,100,0,100,0",
+    "clue_level": "",
+    "range_level": "1",
     "attack_level": "25"
   },
   {
     "examine": "He's just a big bully!",
     "combat_style": "1",
     "melee_animation": "8024",
+    "magic_level": "28",
     "respawn_delay": "0",
     "defence_animation": "8023",
     "death_animation": "8025",
     "name": "Steel minotaur",
-    "defence_level": "70",
+    "defence_level": "28",
     "safespot": null,
-    "lifepoints": "44",
-    "strength_level": "30",
+    "lifepoints": "260",
+    "strength_level": "28",
     "id": "6857",
-    "bonuses": "40,30,30,30,30,50,30,60,60,60,20,80,40,20,0",
+    "bonuses": "-2,16,11,0,0,32,31,24,-6,31,5,122,0,122,0",
     "range_level": "1",
-    "attack_level": "70"
+    "attack_level": "28"
+  },
+  {
+    "examine": "He's just a big bully.",
+    "combat_style": "1",
+    "melee_animation": "8024",
+    "range_animation": "0",
+    "magic_level": "28",
+    "respawn_delay": "0",
+    "defence_animation": "0",
+    "weakness": "10",
+    "magic_animation": "0",
+    "death_animation": "8025",
+    "name": "Steel minotaur",
+    "defence_level": "28",
+    "safespot": null,
+    "lifepoints": "260",
+    "strength_level": "28",
+    "id": "6858",
+    "bonuses": "40,30,30,30,30,30,30,30,30,30,0,127,0,0,0",
+    "range_level": "1",
+    "attack_level": "28"
+  },
+  {
+    "examine": "He's just a big bully",
+    "combat_style": "1",
+    "melee_animation": "8024",
+    "magic_level": "30",
+    "respawn_delay": "0",
+    "defence_animation": "8023",
+    "death_animation": "8025",
+    "name": "Mithril minotaur",
+    "defence_level": "30",
+    "safespot": null,
+    "lifepoints": "340",
+    "can_tolerate": "",
+    "strength_level": "30",
+    "id": "6859",
+    "bonuses": "-2,22,17,0,0,46,44,38,-6,44,20,146,0,147,0",
+    "range_level": "0",
+    "attack_level": "30"
+  },
+  {
+    "examine": "He's just a big bully.",
+    "combat_style": "1",
+    "melee_animation": "8024",
+    "range_animation": "0",
+    "magic_level": "30",
+    "respawn_delay": "0",
+    "defence_animation": "8023",
+    "weakness": "10",
+    "magic_animation": "0",
+    "death_animation": "8025",
+    "name": "Mithril minotaur",
+    "defence_level": "30",
+    "safespot": null,
+    "lifepoints": "340",
+    "strength_level": "30",
+    "id": "6860",
+    "bonuses": "30,30,30,30,0,30,30,30,30,0,30,146,0,147,0",
+    "range_level": "0",
+    "attack_level": "30"
+  },
+  {
+    "examine": "He's just a big bully.",
+    "combat_style": "1",
+    "melee_animation": "8024",
+    "attack_speed": "",
+    "magic_level": "35",
+    "respawn_delay": "0",
+    "defence_animation": "8023",
+    "death_animation": "8025",
+    "name": "Adamant minotaur",
+    "defence_level": "35",
+    "safespot": null,
+    "poison_immune": "",
+    "lifepoints": "441",
+    "strength_level": "35",
+    "id": "6861",
+    "bonuses": "-2,31,26,-3,-17,65,63,55,-6,63,30,146,0,181,0",
+    "range_level": "1",
+    "attack_level": "35"
   },
   {
     "examine": "He's just a big bully.",
@@ -61726,125 +62104,50 @@
     "weakness": "10",
     "magic_animation": "0",
     "death_animation": "8025",
-    "name": "Steel minotaur",
+    "name": "Adamant minotaur",
     "defence_level": "35",
     "safespot": null,
-    "lifepoints": "80",
+    "lifepoints": "441",
     "strength_level": "35",
-    "id": "6858",
-    "range_level": "35",
+    "id": "6862",
+    "bonuses": "40,50,40,45,35,20,50,36,30,40,15,180,30,10,0",
+    "range_level": "1",
     "attack_level": "35"
   },
   {
-    "examine": "He's just a big bully",
-    "combat_style": "1",
+    "examine": "He's just a big bully.",
     "melee_animation": "8024",
     "magic_level": "40",
     "respawn_delay": "0",
     "defence_animation": "8023",
     "death_animation": "8025",
-    "name": "Mithril minotaur",
+    "name": "Rune minotaur",
     "defence_level": "40",
     "safespot": null,
-    "lifepoints": "37",
+    "lifepoints": "570",
     "strength_level": "40",
-    "id": "6859",
-    "bonuses": "56,35,30,30,30,40,10,12,30,40,30,35,40,0,0",
-    "range_level": "40",
+    "id": "6863",
+    "bonuses": "-2,48,43,0,-1,207,209,192,-12,205,102,157,0,195,0",
+    "range_level": "1",
     "attack_level": "40"
   },
   {
     "examine": "He's just a big bully.",
-    "combat_style": "1",
     "melee_animation": "8024",
-    "range_animation": "0",
-    "magic_level": "45",
-    "respawn_delay": "0",
-    "defence_animation": "0",
-    "weakness": "10",
-    "magic_animation": "0",
-    "death_animation": "8025",
-    "name": "Mithril minotaur",
-    "defence_level": "45",
-    "safespot": null,
-    "lifepoints": "94",
-    "strength_level": "45",
-    "id": "6860",
-    "range_level": "45",
-    "attack_level": "45"
-  },
-  {
-    "examine": "He's just a big bully.",
-    "combat_style": "1",
-    "melee_animation": "8024",
-    "magic_level": "55",
-    "respawn_delay": "0",
-    "defence_animation": "8023",
-    "death_animation": "8025",
-    "name": "Adamant minotaur",
-    "defence_level": "55",
-    "safespot": null,
-    "lifepoints": "43",
-    "strength_level": "1",
-    "id": "6861",
-    "bonuses": "40,50,40,45,35,20,50,36,30,40,15,18,30,10,0",
-    "range_level": "55",
-    "attack_level": "55"
-  },
-  {
-    "examine": "He's just a big bully.",
-    "combat_style": "1",
-    "melee_animation": "8024",
-    "range_animation": "0",
-    "magic_level": "55",
-    "respawn_delay": "0",
-    "defence_animation": "0",
-    "weakness": "10",
-    "magic_animation": "0",
-    "death_animation": "8025",
-    "name": "Adamant minotaur",
-    "defence_level": "55",
-    "safespot": null,
-    "lifepoints": "108",
-    "strength_level": "55",
-    "id": "6862",
-    "range_level": "55",
-    "attack_level": "55"
-  },
-  {
-    "examine": "He's just a big bully.",
-    "melee_animation": "8024",
-    "magic_level": "65",
-    "respawn_delay": "0",
-    "defence_animation": "8023",
-    "death_animation": "8025",
-    "name": "Rune minotaur",
-    "defence_level": "65",
-    "safespot": null,
-    "lifepoints": "57",
-    "strength_level": "65",
-    "id": "6863",
-    "bonuses": "50,40,40,56,40,30,50,30,60,30,40,30,50,40,40",
-    "range_level": "65",
-    "attack_level": "65"
-  },
-  {
-    "examine": "He's just a big bully.",
-    "melee_animation": "8024",
-    "magic_level": "65",
+    "magic_level": "40",
     "respawn_delay": "0",
     "defence_animation": "8023",
     "slayer_exp": "0",
     "death_animation": "8025",
     "name": "Rune minotaur",
-    "defence_level": "65",
+    "defence_level": "40",
     "safespot": null,
-    "lifepoints": "57",
-    "strength_level": "65",
+    "lifepoints": "570",
+    "strength_level": "40",
     "id": "6864",
-    "bonuses": "50,40,40,56,40,30,50,30,60,30,40,30,50,40,40",
-    "range_level": "65",
-    "attack_level": "65"
+    "bonuses": "50,40,40,56,40,30,50,30,60,30,40,219,50,40,40",
+    "range_level": "1",
+    "attack_level": "40"
   },
   {
     "death_animation": "7818",
diff --git a/game/data/configs/npc_spawns.json b/game/data/configs/npc_spawns.json
index f38c683..8613771 100644
--- a/game/data/configs/npc_spawns.json
+++ b/game/data/configs/npc_spawns.json
@@ -2741,23 +2741,39 @@
   },
   {
     "npc_id": "1099",
-    "loc_data": "{2857,3589,0,0,0}-{2857,3589,0,0,0}"
+    "loc_data": "{2857,3589,0,0,0}"
   },
   {
     "npc_id": "1100",
-    "loc_data": "{2859,3589,0,0,0}-{2859,3589,0,0,0}"
+    "loc_data": "{2859,3589,0,0,0}"
   },
   {
     "npc_id": "1101",
-    "loc_data": "{2851,3598,0,0,0}-{2854,3600,0,0,0}"
+    "loc_data": "{2854,3600,0,0,1}"
+  },
+  {
+    "npc_id": "1102",
+    "loc_data": "{2859,3600,0,0,1}"
+  },
+  {
+    "npc_id": "1103",
+    "loc_data": "{2863,3600,0,0,1}"
+  },
+  {
+    "npc_id": "1104",
+    "loc_data": "{2867,3600,0,0,1}"
+  },
+  {
+    "npc_id": "1105",
+    "loc_data": "{2870,3600,0,0,1}-{2851,3598,0,0,1}"
   },
   {
     "npc_id": "1106",
-    "loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2925,3626,0,1,0}-{2843,3682,0,1,1}-{2769,10149,0,1,0}-{2777,10142,0,1,0}"
+    "loc_data": "{2864,3594,0,1,1}-{2881,3592,0,1,5}-{2857,3587,0,1,7}-{2855,3596,0,1,4}-{2827,10078,1,1,6}-{2916,3631,0,1,0}-{2843,3682,0,1,1}-{2769,10149,0,1,0}-{2777,10142,0,1,0}"
   },
   {
     "npc_id": "1107",
-    "loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}-{2781,10143,0,1,0}"
+    "loc_data": "{2874,3595,0,1,3}-{2875,3596,0,1,1}-{2873,3598,0,1,1}-{2836,10088,1,1,5}-{2845,3674,0,1,4}-{2781,10143,0,1,0}-{2917,3634,0,1,0}"
   },
   {
     "npc_id": "1108",
@@ -2765,7 +2781,7 @@
   },
   {
     "npc_id": "1109",
-    "loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2920,3627,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}-{2784,10134,0,1,0}"
+    "loc_data": "{2875,3588,0,1,1}-{2883,3586,0,1,6}-{2825,10087,1,1,3}-{2836,10080,1,1,6}-{2784,10040,2,1,3}-{2909,3641,0,1,0}-{2923,10029,0,1,7}-{2851,3667,0,1,3}-{2784,10134,0,1,0}"
   },
   {
     "npc_id": "1110",
@@ -2781,79 +2797,83 @@
   },
   {
     "npc_id": "1113",
-    "loc_data": "{2831,10083,0,0,0}"
+    "loc_data": "{2829,10083,0,1,0}"
   },
   {
     "npc_id": "1114",
-    "loc_data": "{2826,10078,0,0,0}"
+    "loc_data": "{2827,10077,0,1,0}"
   },
   {
     "npc_id": "1115",
-    "loc_data": "{2832,10088,2,0,0}"
+    "loc_data": "{2831,10086,2,0,0}"
   },
   {
     "npc_id": "1116",
-    "loc_data": "{2824,10073,2,0,0}"
+    "loc_data": "{2822,10073,2,0,0}"
   },
   {
     "npc_id": "1117",
-    "loc_data": "{2829,10101,2,0,0}"
+    "loc_data": "{2829,10100,2,0,0}"
   },
   {
     "npc_id": "1118",
-    "loc_data": "{2920,3613,0,0,0}"
+    "loc_data": "{2906,3623,0,0,6}"
   },
   {
     "npc_id": "1119",
-    "loc_data": "{2930,3614,0,0,0}"
+    "loc_data": "{2920,3622,0,0,3}"
   },
   {
     "npc_id": "1120",
-    "loc_data": "{2927,3608,0,0,0}"
+    "loc_data": "{2923,3616,0,0,3}"
   },
   {
     "npc_id": "1121",
-    "loc_data": "{2930,3600,0,0,0}"
+    "loc_data": "{2923,3612,0,0,3}"
   },
   {
     "npc_id": "1122",
-    "loc_data": "{2918,3604,0,0,0}"
+    "loc_data": "{2916,3601,0,0,0}"
   },
   {
     "npc_id": "1123",
-    "loc_data": "{2914,3603,0,0,0}"
+    "loc_data": "{2902,3604,0,0,1}"
   },
   {
     "npc_id": "1124",
-    "loc_data": "{2925,3600,0,0,0}"
+    "loc_data": "{2922,3606,0,0,3}"
   },
   {
     "npc_id": "1125",
-    "loc_data": "{2916,3610,0,0,0}"
+    "loc_data": "{2911,3612,0,0,3}"
   },
   {
     "npc_id": "1128",
-    "loc_data": "{2833,10080,0,0,0}"
+    "loc_data": "{2832,10079,0,0,4}"
   },
   {
     "npc_id": "1129",
-    "loc_data": "{2833,10084,0,0,0}"
+    "loc_data": "{2832,10083,0,0,4}"
+  },
+  {
+    "npc_id": "1130",
+    "loc_data": "{2902,3696,0,0,1}"
   },
   {
     "npc_id": "1131",
-    "loc_data": "{2905,3694,0,0,1}"
+    "loc_data": "{2898,3698,0,0,1}"
   },
   {
     "npc_id": "1132",
-    "loc_data": "{2901,3697,0,0,1}"
+    "loc_data": "{2893,3700,0,0,1}"
   },
   {
     "npc_id": "1133",
-    "loc_data": "{2895,3699,0,0,1}"
+    "loc_data": "{2889,3699,0,0,1}"
   },
   {
     "npc_id": "1134",
-    "loc_data": "{2891,3699,0,0,1}"
+    "loc_data": "{2886,3698,0,0,1}"
   },
   {
     "npc_id": "1135",
@@ -2869,15 +2889,19 @@
   },
   {
     "npc_id": "1138",
-    "loc_data": "{2826,10083,1,1,0}-{2837,10083,2,1,1}-{2909,3639,0,1,3}-{2923,10031,0,1,3}"
+    "loc_data": "{2826,10083,1,1,0}-{2837,10083,2,1,1}-{2904,3642,0,1,3}-{2923,10031,0,1,3}"
+  },
+  {
+    "npc_id": "1139",
+    "loc_data": "{2854,3689,0,0,6}"
   },
   {
     "npc_id": "1140",
-    "loc_data": "{2856,10054,1,0,0}-{2860,10057,1,0,0}-{2898,3688,0,0,0}-{2819,3586,0,1,4}"
+    "loc_data": "{2856,10054,1,0,0}-{2860,10057,1,0,0}-{2819,3586,0,1,4}-{2892,3685,0,1,0}-{2900,3671,0,1,0}"
   },
   {
     "npc_id": "1141",
-    "loc_data": "{2857,10059,1,0,0}-{2857,10057,1,0,0}"
+    "loc_data": "{2857,10059,1,0,0}-{2857,10057,1,0,0}-{2893,3678,0,1,0}"
   },
   {
     "npc_id": "1142",
@@ -3039,6 +3063,10 @@
     "npc_id": "1213",
     "loc_data": "{2914,3418,0,0,6}"
   },
+  {
+    "npc_id": "1214",
+    "loc_data": "{2891,3676,0,0,1}"
+  },
   {
     "npc_id": "1215",
     "loc_data": "{2612,3287,0,0,0}-{2613,3287,0,0,0}"
@@ -4043,6 +4071,18 @@
     "npc_id": "1841",
     "loc_data": "{3020,3452,0,0,0}"
   },
+  {
+    "npc_id": "1843",
+    "loc_data": "{2839,10128,0,1,0}"
+  },
+  {
+    "npc_id": "1844",
+    "loc_data": "{2855,10144,0,1,0}"
+  },
+  {
+    "npc_id": "1846",
+    "loc_data": "{2873,10166,0,1,3}"
+  },
   {
     "npc_id": "1860",
     "loc_data": "{2957,3203,0,1,3}"
@@ -4343,10 +4383,134 @@
     "npc_id": "2082",
     "loc_data": "{3210,3220,1,1,6}"
   },
+  {
+    "npc_id": "2130",
+    "loc_data": "{2889,10207,0,1,0}"
+  },
+  {
+    "npc_id": "2131",
+    "loc_data": "{2822,10212,0,1,0}-{2891,10192,0,1,0}"
+  },
+  {
+    "npc_id": "2132",
+    "loc_data": "{2828,10210,0,1,0}-{2891,10199,0,1,0}"
+  },
+  {
+    "npc_id": "2133",
+    "loc_data": "{2847,10190,0,1,0}"
+  },
+  {
+    "npc_id": "2134",
+    "loc_data": "{2823,10220,0,1,0}"
+  },
+  {
+    "npc_id": "2135",
+    "loc_data": "{2825,10209,0,1,0}"
+  },
+  {
+    "npc_id": "2136",
+    "loc_data": "{2827,10212,1,1,0}"
+  },
+  {
+    "npc_id": "2138",
+    "loc_data": "{2836,10192,1,1,0}"
+  },
+  {
+    "npc_id": "2139",
+    "loc_data": "{2835,10193,1,0,1}"
+  },
+  {
+    "npc_id": "2154",
+    "loc_data": "{2869,10190,0,1,0}"
+  },
+  {
+    "npc_id": "2156",
+    "loc_data": "{2892,10212,0,1,0}"
+  },
+  {
+    "npc_id": "2157",
+    "loc_data": "{2887,10212,0,1,0}"
+  },
+  {
+    "npc_id": "2158",
+    "loc_data": "{2885,10207,0,1,0}"
+  },
+  {
+    "npc_id": "2159",
+    "loc_data": "{2885,10196,0,1,0}"
+  },
+  {
+    "npc_id": "2160",
+    "loc_data": "{2925,10210,0,1,0}"
+  },
+  {
+    "npc_id": "2171",
+    "loc_data": "{2931,10184,0,1,0}"
+  },
+  {
+    "npc_id": "2172",
+    "loc_data": "{2929,10191,0,1,0}"
+  },
+  {
+    "npc_id": "2173",
+    "loc_data": "{2931,10191,0,1,0}"
+  },
+  {
+    "npc_id": "2174",
+    "loc_data": "{2930,10188,0,1,0}"
+  },
+  {
+    "npc_id": "2175",
+    "loc_data": "{2931,10187,0,1,0}"
+  },
+  {
+    "npc_id": "2178",
+    "loc_data": "{2916,10195,0,1,0}"
+  },
   {
     "npc_id": "2180",
     "loc_data": "{2997,9837,0,1,3}"
   },
+  {
+    "npc_id": "2187",
+    "loc_data": "{2906,10198,0,1,0}"
+  },
+  {
+    "npc_id": "2190",
+    "loc_data": "{2923,10203,0,1,0}"
+  },
+  {
+    "npc_id": "2191",
+    "loc_data": "{2924,10213,0,1,0}"
+  },
+  {
+    "npc_id": "2192",
+    "loc_data": "{2933,10219,0,0,3}"
+  },
+  {
+    "npc_id": "2193",
+    "loc_data": "{2899,10218,0,1,0}"
+  },
+  {
+    "npc_id": "2195",
+    "loc_data": "{2900,10227,0,1,0}"
+  },
+  {
+    "npc_id": "2198",
+    "loc_data": "{2906,10216,0,1,0}"
+  },
+  {
+    "npc_id": "2203",
+    "loc_data": "{2912,10222,0,1,0}"
+  },
+  {
+    "npc_id": "2205",
+    "loc_data": "{2842,10129,0,0,3}"
+  },
+  {
+    "npc_id": "2206",
+    "loc_data": "{2888,10227,0,0,6}"
+  },
   {
     "npc_id": "2234",
     "loc_data": "{3081,3251,0,1,6}-{2636,3365,0,1,6}"
@@ -4575,6 +4739,10 @@
     "npc_id": "2319",
     "loc_data": "{3017,3309,0,0,0}"
   },
+  {
+    "npc_id": "2321",
+    "loc_data": "{2915,10194,1,1,0}"
+  },
   {
     "npc_id": "2323",
     "loc_data": "{3056,3306,0,1,1}"
@@ -4755,26 +4923,6 @@
     "npc_id": "2457",
     "loc_data": "{2500,10148,0,1,3}-{2505,10150,0,1,2}-{2510,10148,0,1,1}-{2511,10147,0,1,6}-{2517,10151,0,1,3}-{2519,10143,0,1,7}-{2529,10148,0,1,3}-{2528,10144,0,1,0}-{2532,10145,0,1,1}-{2532,10140,0,1,7}-{2520,10144,0,1,2}-{1804,4369,2,1,2}-{1812,4363,2,1,5}-{1817,4368,2,1,6}-{1801,4404,3,1,6}-{1805,4405,3,1,1}-{1803,4404,3,1,7}-{1811,4394,1,1,7}-{1804,4391,1,1,2}-{1798,4391,1,1,4}-{1802,4389,1,1,4}-{1799,4386,2,1,1}-{1799,4381,2,1,6}-{1798,4375,1,1,4}-{1803,4376,1,1,6}-{1797,4380,1,1,6}-{1902,4367,0,1,6}-{1894,4367,0,1,1}-{1893,4361,0,1,3}-{1886,4369,0,1,1}-{1848,4394,1,1,3}-{1850,4389,1,1,1}-{1850,4391,1,1,2}"
   },
-  {
-    "npc_id": "2424",
-    "loc_data": "{2871,10187,0,1,0}"
-  },
-  {
-    "npc_id": "1843",
-    "loc_data": "{2841,10129,0,1,0}"
-  },
-  {
-    "npc_id": "1844",
-    "loc_data": "{2840,10127,0,1,0}"
-  },
-  {
-    "npc_id": "2205",
-    "loc_data": "{2839,10128,0,1,0}"
-  },
-  {
-    "npc_id": "2154",
-    "loc_data": "{2839,10128,0,1,0}"
-  },
   {
     "npc_id": "2458",
     "loc_data": "{2599,4774,0,0,3}"
@@ -4891,6 +5039,10 @@
     "npc_id": "2549",
     "loc_data": "{3364,3001,0,0,6}"
   },
+  {
+    "npc_id": "2553",
+    "loc_data": "{1944,4958,0,1,0}"
+  },
   {
     "npc_id": "2564",
     "loc_data": "{1936,4966,0,0,4}"
@@ -8571,6 +8723,30 @@
     "npc_id": "5869",
     "loc_data": "{2744,5344,0,0,0}"
   },
+  {
+    "npc_id": "5880",
+    "loc_data": "{2439,5544,0,1,0}-{2485,5535,0,1,0}"
+  },
+  {
+    "npc_id": "5881",
+    "loc_data": "{2436,5540,0,1,0}"
+  },
+  {
+    "npc_id": "5882",
+    "loc_data": "{2437,5549,0,1,0}-{2484,5531,0,1,0}"
+  },
+  {
+    "npc_id": "5883",
+    "loc_data": "{2436,5526,0,1,0}-{2486,5525,0,1,0}"
+  },
+  {
+    "npc_id": "5884",
+    "loc_data": "{2439,5520,0,1,0}"
+  },
+  {
+    "npc_id": "5885",
+    "loc_data": "{2487,5538,0,1,0}"
+  },
   {
     "npc_id": "5887",
     "loc_data": "{2737,5351,1,0,0}"
@@ -10495,14 +10671,6 @@
     "npc_id": "1184",
     "loc_data": "{2192,3249,0,1,3}-{2200,3249,0,1,3}-{2195,3247,0,1,3}-{2212,3258,0,1,3}"
   },
-  {
-    "npc_id": "2160",
-    "loc_data": "{2925,10211,0,1,0}"
-  },
-  {
-    "npc_id": "2191",
-    "loc_data": "{2925,10213,0,1,0}"
-  },
   {
     "npc_id": "4248",
     "loc_data": "{2849,10183,0,1,0}"
@@ -10531,30 +10699,6 @@
     "npc_id": "4558",
     "loc_data": "{2885,10202,0,1,0}"
   },
-  {
-    "npc_id": "2158",
-    "loc_data": "{2885,10207,0,1,0}"
-  },
-  {
-    "npc_id": "2157",
-    "loc_data": "{2887,10212,0,1,0}"
-  },
-  {
-    "npc_id": "2156",
-    "loc_data": "{2892,10212,0,1,0}"
-  },
-  {
-    "npc_id": "2159",
-    "loc_data": "{2885,10196,0,1,0}"
-  },
-  {
-    "npc_id": "2321",
-    "loc_data": "{2918,10194,0,0,3}"
-  },
-  {
-    "npc_id": "2198",
-    "loc_data": "{2905,10213,0,1,0}"
-  },
   {
     "npc_id": "2164",
     "loc_data": "{2838,10205,0,0,1}"
@@ -10563,42 +10707,6 @@
     "npc_id": "2163",
     "loc_data": "{2836,10205,0,1,0}"
   },
-  {
-    "npc_id": "2130",
-    "loc_data": "{2892,10191,0,1,0}-{2919,10206,0,1,0}-{2923,10230,0,1,0}-{2865,10193,0,1,0}"
-  },
-  {
-    "npc_id": "2131",
-    "loc_data": "{2893,10205,0,1,0}-{2895,10223,0,1,0}-{2871,10199,0,1,0}-{2890,10199,0,1,0}"
-  },
-  {
-    "npc_id": "2132",
-    "loc_data": "{2913,10211,0,1,0}-{2901,10232,0,1,0}-{2823,10193,0,1,0}"
-  },
-  {
-    "npc_id": "5880",
-    "loc_data": "{2888,10226,0,1,0}-{2920,10196,0,1,0}-{2844,10214,0,1,0}"
-  },
-  {
-    "npc_id": "5881",
-    "loc_data": "{2847,10200,0,1,0}-{2863,10233,0,1,0}-{2920,10216,0,1,0}"
-  },
-  {
-    "npc_id": "5882",
-    "loc_data": "{2916,10191,0,1,0}-{2841,10195,0,1,0}-{2831,10219,0,1,0}"
-  },
-  {
-    "npc_id": "2138",
-    "loc_data": "{2890,10232,0,1,0}"
-  },
-  {
-    "npc_id": "2178",
-    "loc_data": "{2916,10192,0,1,0}-{2839,10196,0,1,0}"
-  },
-  {
-    "npc_id": "2187",
-    "loc_data": "{2913,10200,0,1,0}"
-  },
   {
     "npc_id": "1546",
     "loc_data": "{2911,10175,0,0,4}-{2912,10175,0,0,4}-{2913,10175,0,0,4}-{2914,10175,0,0,4}-{2909,10173,0,0,4}-{2910,10173,0,0,4}-{2911,10173,0,0,4}-{2912,10173,0,0,4}-{2913,10173,0,0,4}-{2909,10171,0,0,4}-{2910,10171,0,0,4}-{2911,10169,0,0,4}-{2912,10169,0,0,4}-{2913,10169,0,0,4}"
@@ -10695,10 +10803,6 @@
     "npc_id": "2121",
     "loc_data": "{2880,10195,1,1,0}-{2879,10193,1,1,0}"
   },
-  {
-    "npc_id": "2193",
-    "loc_data": "{2887,10223,0,1,0}"
-  },
   {
     "npc_id": "2197",
     "loc_data": "{2848,10198,0,1,0}"
@@ -10711,10 +10815,6 @@
     "npc_id": "2189",
     "loc_data": "{2851,10223,0,1,0}"
   },
-  {
-    "npc_id": "2171",
-    "loc_data": "{2930,10184,0,1,0}"
-  },
   {
     "npc_id": "1848",
     "loc_data": "{2868,10168,0,1,0}"
@@ -10767,22 +10867,10 @@
     "npc_id": "2199",
     "loc_data": "{2855,10199,0,1,0}"
   },
-  {
-    "npc_id": "2192",
-    "loc_data": "{2933,10219,0,1,0}"
-  },
   {
     "npc_id": "2141",
     "loc_data": "{2906,10204,0,1,0}"
   },
-  {
-    "npc_id": "2202",
-    "loc_data": "{2912,10222,0,1,0}"
-  },
-  {
-    "npc_id": "2195",
-    "loc_data": "{2901,10227,0,1,0}"
-  },
   {
     "npc_id": "2194",
     "loc_data": "{2926,10225,0,1,0}"
@@ -10791,10 +10879,6 @@
     "npc_id": "2142",
     "loc_data": "{2904,10206,0,1,0}"
   },
-  {
-    "npc_id": "2190",
-    "loc_data": "{2922,10201,0,1,0}"
-  },
   {
     "npc_id": "2155",
     "loc_data": "{2871,10199,0,1,0}"
diff --git a/game/data/configs/shops.json b/game/data/configs/shops.json
index e5113fb..1b70dd8 100644
--- a/game/data/configs/shops.json
+++ b/game/data/configs/shops.json
@@ -1112,7 +1112,7 @@
     "currency": "995",
     "general_store": "false",
     "id": "126",
-    "title": "Pickaxe-is-mine",
+    "title": "Pickaxe-Is-Mine",
     "stock": "{1265,10,100}-{1269,10,100}-{1273,10,100}-{1271,10,100}-{1275,10,100}"
   },
   {
diff --git a/game/server.jar b/game/server.jar
index 6df90d4..1245d2c 100644
Binary files a/game/server.jar and b/game/server.jar differ