diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5464e9e..573200d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -21,6 +21,7 @@
         "heroinCooldown",
         "checkLoc",
         "getRandW",
-        "shroomsCooldown"
+        "shroomsCooldown",
+        "targets"
     ]
 }
\ No newline at end of file
diff --git a/client/TravellingMerchant.lua b/client/TravellingMerchant.lua
index a5d45bb..964954b 100644
--- a/client/TravellingMerchant.lua
+++ b/client/TravellingMerchant.lua
@@ -30,5 +30,6 @@ local function spawn()
             end
         }
     })
+    targets[#targets+1] = ped
 end
 spawn()
diff --git a/client/cocaine.lua b/client/cocaine.lua
index dd9f87a..d5b9d32 100644
--- a/client/cocaine.lua
+++ b/client/cocaine.lua
@@ -1,6 +1,5 @@
 local cuttingcoke = nil
 local baggingcoke = nil
-
 repeat Wait(100) until GlobalState.MDDrugsLocations.Cocaine ~= nil
 local locations = GlobalState.MDDrugsLocations.Cocaine
 
@@ -150,6 +149,7 @@ for k, v in pairs (locations.CuttingCoke) do
             end,
         }
     })
+	targets[#targets+1] = 'cutcoke'..k
 end
 
 for k, v in pairs (locations.BaggingCoke) do
@@ -169,6 +169,7 @@ for k, v in pairs (locations.BaggingCoke) do
             end
         }
     })
+	targets[#targets+1] = 'bagcoke'..k
 end
 
 for k, v in pairs (locations.cokeTele) do
@@ -184,6 +185,7 @@ for k, v in pairs (locations.cokeTele) do
             end
 		}
 	})
+	targets[#targets+1] = 'coke_tele'..k
 	Bridge.Target.AddBoxZone('coke_teleout'..k, v.outside, v.size, v.outside.w or 180.0,{
 		{
 			icon = Bridge.Language.Locale('coke.teleInIcon'),
@@ -196,6 +198,7 @@ for k, v in pairs (locations.cokeTele) do
             end
 		}
 	})
+	targets[#targets+1] = 'coke_teleout'..k
 end
 
 CreateThread(function()
diff --git a/client/cornerselling.lua b/client/cornerselling.lua
index d6e0a53..3b7b549 100644
--- a/client/cornerselling.lua
+++ b/client/cornerselling.lua
@@ -1,7 +1,6 @@
 local sell = false
 local inZone = false
 local buyers = {}
-
 local function walkAway(targ)
     FreezeEntityPosition(targ, false)
     ClearPedTasks(targ)
@@ -155,6 +154,7 @@ local function Cornersell()
                 end,
             }
         })
+        targets[#targets+1] = targ
     else
         Bridge.Anim.RequestDict("rcmme_tracey1")
         TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
@@ -188,6 +188,7 @@ local function Cornersell()
                 end
             }
         })
+        targets[#targets+1] = targ
     end
 end
 
diff --git a/client/crack.lua b/client/crack.lua
index bfce187..61c51af 100644
--- a/client/crack.lua
+++ b/client/crack.lua
@@ -21,6 +21,7 @@ for k, v in pairs (locations.makecrack) do
 			end
 		}
 	})
+	targets[#targets+1] = 'makeCrack'..k
 end
 
 for k, v in pairs (locations.bagcrack) do
@@ -39,4 +40,5 @@ for k, v in pairs (locations.bagcrack) do
 			end
 		}
 	})
+	targets[#targets+1] = 'bagCrack'..k
 end
\ No newline at end of file
diff --git a/client/deliveries.lua b/client/deliveries.lua
index 4fd2dc2..f84e5ad 100644
--- a/client/deliveries.lua
+++ b/client/deliveries.lua
@@ -50,6 +50,7 @@ local function SpawnDealer()
                 end,
             }
         })
+        targets[#targets+1] = dealer[k]
     end
 end
 
@@ -80,4 +81,5 @@ RegisterNetEvent('md-drugs:client:setLocation', function(data)
             end,
         }
     })
+    targets[#targets+1] = buyer
 end)
\ No newline at end of file
diff --git a/client/functions.lua b/client/functions.lua
index 1d0b955..8f1d013 100644
--- a/client/functions.lua
+++ b/client/functions.lua
@@ -327,4 +327,18 @@ function itemCheck(item)
         return false
     end
 	return true
-end
\ No newline at end of file
+end
+
+AddEventHandler('onResourceStop', function(resourceName)
+	if GetCurrentResourceName() ~= resourceName then return end
+	for k, v in pairs (targets) do
+		if type(v) == 'number' then
+			Bridge.Target.RemoveLocalEntity(v)
+			if DoesEntityExist(v) then
+				DeleteEntity(v)
+			end
+		else
+			Bridge.Target.RemoveZone(v)
+		end
+	end
+end)
\ No newline at end of file
diff --git a/client/heroin.lua b/client/heroin.lua
index a67647c..94c44b0 100644
--- a/client/heroin.lua
+++ b/client/heroin.lua
@@ -59,6 +59,7 @@ local function createLabKit(coord, head)
             return false
         end
     }})
+    targets[#targets+1] = heroinlabkit
 end
 
 for k, v in pairs (locations.dryplant) do
@@ -75,6 +76,7 @@ for k, v in pairs (locations.dryplant) do
             end
         }
     })
+    targets[#targets+1] = 'dryHeroin'..k
 end
 
 for k, v in pairs (locations.cutheroinone) do
@@ -92,6 +94,7 @@ for k, v in pairs (locations.cutheroinone) do
             end
         }
     })
+    targets[#targets+1] = 'cutHeroin'..k
 end
 
 local peds = {}
@@ -115,6 +118,7 @@ for k, v in pairs (locations.buyKit) do
 			end
         }
     })
+    targets[#targets+1] = peds[k]
 end
 
 
@@ -147,4 +151,5 @@ for k, v in pairs (locations.fillneedle) do
             end
         }
     })
+    targets[#targets+1] = 'fillNeedle'..k
 end
\ No newline at end of file
diff --git a/client/lean.lua b/client/lean.lua
index 175ec92..28646bb 100644
--- a/client/lean.lua
+++ b/client/lean.lua
@@ -61,6 +61,7 @@ local function SpawnCarPedChase(loc)
 				end
 			}
 		})
+		targets[#targets+1] = leanCar
 	else
 		DeleteEntity(driver)
 		DeleteEntity(pilot2)
@@ -85,6 +86,7 @@ for k, v in pairs (location.SyrupVendor) do
 			end
 		},
 	})
+	targets[#targets+1] = leanPeds[k]
 end
 
 local function concat(tbl)
diff --git a/client/lsd.lua b/client/lsd.lua
index a27f38d..e7dc402 100644
--- a/client/lsd.lua
+++ b/client/lsd.lua
@@ -84,6 +84,7 @@ local function createLabKit(coord, head)
         }
     }
     Bridge.Target.AddLocalEntity(labkit, options)
+    targets[#targets+1] = labkit
 end
 
 for k, v in pairs (locations.lysergicacid) do 
@@ -102,6 +103,7 @@ for k, v in pairs (locations.lysergicacid) do
             end
         }
     })
+    targets[#targets+1] = 'lysergicacid'..k
 end
 
 for k, v in pairs (locations.diethylamide) do 
@@ -120,6 +122,7 @@ for k, v in pairs (locations.diethylamide) do
             end
         }
     })
+    targets[#targets+1] = 'diethylamide'..k
 end
 
 for k, v in pairs (locations.gettabs) do
@@ -136,6 +139,7 @@ for k, v in pairs (locations.gettabs) do
             end
         }
     })
+    targets[#targets+1] = 'gettabs'..k
 end
 
 local seller = {}
@@ -161,6 +165,7 @@ for k, v in pairs (locations.buyLSDkit) do
             end
         }
     })
+    targets[#targets+1] = seller[k]
 end
 
 Bridge.Callback.Register("md-drugs:client:setlsdlabkit", function()
diff --git a/client/mescaline.lua b/client/mescaline.lua
index 2a566f0..c6bcdfe 100644
--- a/client/mescaline.lua
+++ b/client/mescaline.lua
@@ -31,6 +31,7 @@ for k, v in pairs (locations.DryOutMescaline) do
 			end
 		}
 	})
+	targets[#targets+1] = 'dryoutMesc'..k
 end
 
 RegisterNetEvent("md-drugs:client:takemescaline", function()
diff --git a/client/meth.lua b/client/meth.lua
index 06bd3dd..6414f8f 100644
--- a/client/meth.lua
+++ b/client/meth.lua
@@ -81,6 +81,7 @@ for k, v in pairs (locations.MethHeist) do
 			end
 		}
 	})
+	targets[#targets+1] = peds[k]
 end
 
 ---- start animation shit
@@ -289,6 +290,7 @@ local function smash(coords, offset, rotation, buckets, k)
 				end,
 			}
 		})
+		targets[#targets+1] = bucket
 	end
 end
 
@@ -333,6 +335,7 @@ for k, v in pairs (locations.CookMeth) do
 		  	end,
 		},
 	})
+	targets[#targets+1] = 'cookMeth'..k
 end
 
 for k, v in pairs (locations.MethDials) do
@@ -350,6 +353,7 @@ for k, v in pairs (locations.MethDials) do
 			end
 		}
 	})
+	targets[#targets+1] = 'adjustMethDials'..k
 end
 
 for k, v in pairs (locations.MethSmash) do
@@ -367,6 +371,7 @@ for k, v in pairs (locations.MethSmash) do
 			end
 		}
 	})
+	targets[#targets+1] = 'smashMeth'..k
 end
 
 for k, v in pairs (locations.MethTele) do
@@ -394,6 +399,8 @@ for k, v in pairs (locations.MethTele) do
             end
 		}
 	})
+	targets[#targets+1] = 'meth_tele'..k
+	targets[#targets+1] = 'meth_teleout'..k
 end
 
 RegisterCommand('offset', function()
@@ -417,6 +424,7 @@ for k, v in pairs (locations.MethEph) do
 			end
 		}
 	})
+	targets[#targets+1] = 'stealMethEph'..k
 end
 for k, v in pairs (locations.MethAce) do
 	Bridge.Target.AddBoxZone('stealMethAce'..k, v.loc, v.size, v.loc.w or 180.0, {
@@ -432,7 +440,7 @@ for k, v in pairs (locations.MethAce) do
 			end
 		}
 	})
-
+	targets[#targets+1] = 'stealMethAce'..k
 end
 
 CreateThread(function()
diff --git a/client/oxyruns.lua b/client/oxyruns.lua
index 64934a8..b5c9414 100644
--- a/client/oxyruns.lua
+++ b/client/oxyruns.lua
@@ -44,6 +44,7 @@ local function getRoute()
 			end
 		}
 	})
+	targets[#targets+1] = oxybuyer
 end
 
 for k, v in pairs(locations.OxyPayForTruck) do
@@ -96,5 +97,5 @@ for k, v in pairs(locations.OxyPayForTruck) do
 			end
 		}
 	})
-
+	targets[#targets+1] = 'oxyTruckPur' ..k
 end
diff --git a/client/plantSpawns.lua b/client/plantSpawns.lua
index 8bd7bdd..70a3c52 100644
--- a/client/plantSpawns.lua
+++ b/client/plantSpawns.lua
@@ -66,6 +66,7 @@ for k, v in pairs (DrugPlants) do
                     end
                 }
             })
+            targets[#targets+1] = v.plantTbl[loc]
         end
     end)
 
@@ -90,6 +91,7 @@ for k, v in pairs (DrugPlants) do
                         end
                     }
                 })
+                targets[#targets+1] = v.plantTbl[key]
             end
         end
     end)
diff --git a/client/weed.lua b/client/weed.lua
index 3a069d4..f401ca4 100644
--- a/client/weed.lua
+++ b/client/weed.lua
@@ -34,6 +34,7 @@ for k, v in pairs (locations.WeedDry) do
 			end
 		}
 	})
+	targets[#targets+1] = 'weed_dry'..k
 end
 
 for k, v in pairs (locations.WeedTele) do
@@ -46,6 +47,7 @@ for k, v in pairs (locations.WeedTele) do
 			end
 		}
 	})
+	targets[#targets+1] = 'weed_tele'..k
 	Bridge.Target.AddBoxZone('weed_teleout'..k, v.outside, v.size, v.rot or 180.0, {
 		{
 			icon = Bridge.Language.Locale('weed.teleportInIcon'),
@@ -55,6 +57,7 @@ for k, v in pairs (locations.WeedTele) do
 			end
 		}
 	})
+	targets[#targets+1] = 'weed_teleout'..k
 end
 
 CreateThread(function()
@@ -155,6 +158,7 @@ for k, v in pairs (locations.WeedSalesman) do
 			end
 		}
 	})
+	targets[#targets+1] = ped
 end
 
 local props = {}
@@ -193,6 +197,7 @@ for locationKey, locationData in pairs (locations.MakeButter) do
 				end
 			}
 		})
+		targets[#targets+1] = props[#props]
 	end
 end
 for locationKey, locationData in pairs (locations.MakeOil) do
@@ -229,5 +234,6 @@ for locationKey, locationData in pairs (locations.MakeOil) do
 				end
 			}
 		})
+		targets[#targets+1] = props[#props]
 	end
 end
\ No newline at end of file
diff --git a/client/whippit.lua b/client/whippit.lua
index 34a1788..544b8af 100644
--- a/client/whippit.lua
+++ b/client/whippit.lua
@@ -75,7 +75,8 @@ local function spawnShops()
                    })
                end
            },
-       })
+        })
+        targets[#targets+1] = ped
     end
 end
 
diff --git a/client/wholesale.lua b/client/wholesale.lua
index 23b6ce3..f83b342 100644
--- a/client/wholesale.lua
+++ b/client/wholesale.lua
@@ -80,6 +80,7 @@ RegisterNetEvent("md-drugs:client:GetLocation", function(wholesaleData)
                 end
             }
         })
+        targets[#targets+1] = ped
     end,
     function(point, data)
         Bridge.Point.Remove('md-drugs:wholesaleZone'.. Bridge.Framework.GetPlayerIdentifier())
diff --git a/client/xtc.lua b/client/xtc.lua
index 5566e04..8778204 100644
--- a/client/xtc.lua
+++ b/client/xtc.lua
@@ -72,6 +72,7 @@ Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData)
           },
       }
     Bridge.Target.AddLocalEntity(press, options)
+    targets[#targets+1] = press
     return coords
 end)
 
@@ -90,6 +91,7 @@ for k, v in pairs(locations.mdp2p) do
             end
         }
     })
+    targets[#targets+1] = 'mdp2p'..k
 end
 for k, v in pairs(locations.isosafrole) do
     Bridge.Target.AddBoxZone('isosafrole'..k, v.loc, v.size, v.rot or 180.0, {
@@ -106,6 +108,7 @@ for k, v in pairs(locations.isosafrole) do
             end
         }
     })
+    targets[#targets+1] = 'isosafrole'..k
 end
 
 for k, v in pairs(locations.rawxtcloc) do
@@ -123,6 +126,7 @@ for k, v in pairs(locations.rawxtcloc) do
             end
         }
     })
+    targets[#targets+1] = 'xtcraw'..k
 end
 
 for k, v in pairs(locations.xtcpress) do
@@ -175,6 +179,7 @@ for k, v in pairs(locations.xtcpress) do
              canInteract = function() return handleGang(v.gang) end
         }
     })
+    targets[#targets+1] = ped
 end
 
 for k, v in pairs (locations.stamp) do
@@ -212,4 +217,5 @@ for k, v in pairs (locations.stamp) do
             canInteract = function() return handleGang(v.gang) end
         }
     })
+    targets[#targets+1] = 'xtcstamp'..k
 end
diff --git a/clientRun.lua b/clientRun.lua
index e88b1a4..32bb2be 100644
--- a/clientRun.lua
+++ b/clientRun.lua
@@ -24,4 +24,4 @@ for scriptName, toggle in pairs(Config.Drugs) do
     if not toggle then goto continue end
     loadFile('client/' .. scriptName .. '.lua')
     ::continue::
-end
\ No newline at end of file
+end
diff --git a/server/functions.lua b/server/functions.lua
index c7efad8..4e3f63c 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -88,7 +88,7 @@ local function handleFresh(source)
         heroin = 0,
         dealerrep = 0,
         cornerselling = { 
-            price = Config.CornerSellLevell[1].price,
+            price = Config.CornerSellLevel[1].price,
             rep = 0,
             label = Config.CornerSellLevel[1].label,
             level = 1
diff --git a/shared/config.lua b/shared/config.lua
index 0ea076a..7dee476 100644
--- a/shared/config.lua
+++ b/shared/config.lua
@@ -1,5 +1,5 @@
 Config = {} --Ignore.
-
+targets = {}
 
 Bridge = exports.community_bridge:Bridge()