diff --git a/data/plugins/location/al-kharid/npcs.rb b/data/plugins/location/al-kharid/npcs.rb
index 9ec9d059..daa55d89 100644
--- a/data/plugins/location/al-kharid/npcs.rb
+++ b/data/plugins/location/al-kharid/npcs.rb
@@ -1,26 +1,53 @@
-
 # Generic npcs
 
 spawn_npc name: :man, x: 3276, y: 3186
+spawn_npc name: :man, x: 3282, y: 3197
+spawn_npc name: :man_3, x: 3301, y: 3200
+spawn_npc name: :man_3, x: 3300, y: 3208
+spawn_npc name: :man_2, x: 3297, y: 3196
+spawn_npc name: :man_16, x: 3294, y: 3204
+spawn_npc name: :spider_61, x: 3319, y: 3145
+spawn_npc name: :spider_61, x: 3319, y: 3140
+spawn_npc name: :spider_61, x: 3323, y: 3138
+spawn_npc name: :scorpion, x: 3282, y: 3149
+
+# Camels
+spawn_npc name: :cam_the_camel, x: 3295, y: 3232
+spawn_npc name: :elly_the_camel, x: 3312, y: 3210
+spawn_npc name: :camel, x: 3285, y: 3198
+spawn_npc name: :ollie_the_camel, x: 3291, y: 3209
+spawn_npc name: :al_the_camel, x: 3275, y: 3162
+
+# Quest npc
+spawn_npc name: :osman, x: 3286, y: 3180, face: :east
+spawn_npc name: :hassan, x: 3302, y: 3163
+spawn_npc name: :father_reen, x: 3272, y: 3158
+spawn_npc name: :man_663, x: 3297, y: 3287
+
+# Boarder guards
+
+spawn_npc name: 'border_guard', x: 3268, y: 3226, face: :north
+spawn_npc name: 'border_guard', x: 3267, y: 3226, face: :north
+spawn_npc name: 'border_guard', x: 3268, y: 3229, face: :south
+spawn_npc name: 'border_guard', x: 3267, y: 3229, face: :south
 
 # Palace guards
 
-spawn_npc name: 'Al-Kharid warrior', x: 3283, y: 3161
 spawn_npc name: 'Al-Kharid warrior', x: 3285, y: 3174
-spawn_npc name: 'Al-Kharid warrior', x: 3286, y: 3164
-spawn_npc name: 'Al-Kharid warrior', x: 3287, y: 3168
-spawn_npc name: 'Al-Kharid warrior', x: 3288, y: 3169
+spawn_npc name: 'Al-Kharid warrior', x: 3283, y: 3168
+spawn_npc name: 'Al-Kharid warrior', x: 3285, y: 3169
 spawn_npc name: 'Al-Kharid warrior', x: 3290, y: 3162
 spawn_npc name: 'Al-Kharid warrior', x: 3295, y: 3162
 spawn_npc name: 'Al-Kharid warrior', x: 3295, y: 3170
-spawn_npc name: 'Al-Kharid warrior', x: 3297, y: 3175
+spawn_npc name: 'Al-Kharid warrior', x: 3300, y: 3175
 spawn_npc name: 'Al-Kharid warrior', x: 3300, y: 3171
-spawn_npc name: 'Al-Kharid warrior', x: 3301, y: 3164
 spawn_npc name: 'Al-Kharid warrior', x: 3301, y: 3168
 
-spawn_npc name: :shantay_guard_838, x: 3301, y: 3120
-spawn_npc name: :shantay_guard,     x: 3304, y: 3119
-spawn_npc name: :shantay_guard_838, x: 3307, y: 3122
+# Shanty pass
+spawn_npc name: :shantay_guard, x: 3301, y: 3120
+spawn_npc name: :shantay_guard, x: 3302, y: 3126
+spawn_npc name: :shantay_guard, x: 3306, y: 3126
+spawn_npc name: :shantay_guard_838, x: 3303, y: 3118, face: :north
 
 # Mine
 
@@ -29,13 +56,14 @@ spawn_npc name: :scorpion, x: 3298, y: 3280
 spawn_npc name: :scorpion, x: 3299, y: 3299
 spawn_npc name: :scorpion, x: 3299, y: 3309
 spawn_npc name: :scorpion, x: 3300, y: 3287
+spawn_npc name: :scorpion, x: 3300, y: 3315
 spawn_npc name: :scorpion, x: 3301, y: 3305
+spawn_npc name: :scorpion, x: 3301, y: 3312
 
 # Functional npcs
 
 spawn_npc name: :gnome_pilot, x: 3279, y: 3213
 
-# TODO: are these the correct banker ids?
 spawn_npc name: :banker_496, x: 3267, y: 3164, face: :east
 spawn_npc name: :banker_497, x: 3267, y: 3166, face: :east
 spawn_npc name: :banker_496, x: 3267, y: 3167, face: :east
@@ -49,7 +77,13 @@ spawn_npc name: :shantay,    x: 3304, y: 3124
 spawn_npc name: :rug_merchant_2296,  x: 3311, y: 3109, face: :west
 spawn_npc name: :ranael,             x: 3315, y: 3163, face: :north
 
-# TODO: are these the correct shop staff ids?
 spawn_npc name: :shop_assistant_525, x: 3315, y: 3178, face: :north
 spawn_npc name: :shop_keeper_524,    x: 3315, y: 3180, face: :west
 spawn_npc name: :louie_legs,         x: 3316, y: 3175, face: :west
+spawn_npc name: :ellis, x: 3274, y: 3192
+spawn_npc name: :dommik, x: 3321, y: 3193
+
+spawn_npc name: :tool_leprechaun, x: 3319, y: 3204
+spawn_npc name: :ali_morrisane, x: 3304, y: 3211, face: :east
+spawn_npc name: :silk_trader, x: 3300, y: 3203
+spawn_npc name: :karim, x: 3273, y: 3180