diff --git a/[esx]/esx_skin/config.lua b/[esx]/esx_skin/config.lua
index b75d40e9..d4b4415d 100644
--- a/[esx]/esx_skin/config.lua
+++ b/[esx]/esx_skin/config.lua
@@ -3,5 +3,8 @@ Config = {}
 Config.Locale = 'en'
 
 Config.BackpackWeight = {
-	[40] = 16, [41] = 20, [44] = 25, [45] = 23
+	[40] = 16, 
+	[41] = 20, 
+	[44] = 25, 
+	[45] = 23
 }
diff --git a/[esx_addons]/esx_accessories/config.lua b/[esx_addons]/esx_accessories/config.lua
index 1a65f153..af28d26c 100644
--- a/[esx_addons]/esx_accessories/config.lua
+++ b/[esx_addons]/esx_accessories/config.lua
@@ -15,24 +15,24 @@ Config.Type   = 1
 -- If you have esx_clothesshop you should not fill this
 -- more than it's already filled.
 Config.ShopsBlips = {
-	Ears = {
-		Pos = nil,
-		Blip = nil
-	},
+	-- Ears = {
+	-- 	Pos = nil,
+	-- 	Blip = nil
+	-- },
 	Mask = {
 		Pos = { 
 			vector3(-1338.1, -1278.2, 3.8),
 		},
 		Blip = {sprite = 362, color = 2}
 	},
-	Helmet = {
-		Pos = nil,
-		Blip = nil
-	},
-	Glasses = {
-		Pos = nil,
-		Blip = nil
-	}
+	-- Helmet = {
+	-- 	Pos = nil,
+	-- 	Blip = nil
+	-- },
+	-- Glasses = {
+	-- 	Pos = nil,
+	-- 	Blip = nil
+	-- }
 }
 
 Config.Zones = {
diff --git a/[esx_addons]/esx_atm/client/main.lua b/[esx_addons]/esx_atm/client/main.lua
index fa1f2aee..eb5653e3 100644
--- a/[esx_addons]/esx_atm/client/main.lua
+++ b/[esx_addons]/esx_atm/client/main.lua
@@ -51,7 +51,8 @@ Citizen.CreateThread(function()
 		isInATMMarker = false
 
 		for k,v in pairs(Config.ATMLocations) do
-			if #(coords - v) < 1.0 then
+			local Pos = vector3(v.x,v.y,v.z)
+			if #(coords - Pos) < 1.0 then
 
 				isInATMMarker, canSleep = true, false
 				break
@@ -105,7 +106,7 @@ Citizen.CreateThread(function()
 			end
 
 		else
-			Citizen.Wait(500)
+			Citizen.Wait(700)
 		end
 	end
 end)
diff --git a/[esx_addons]/esx_dmvschool/client/main.lua b/[esx_addons]/esx_dmvschool/client/main.lua
index 7eb6e56a..536fddd0 100644
--- a/[esx_addons]/esx_dmvschool/client/main.lua
+++ b/[esx_addons]/esx_dmvschool/client/main.lua
@@ -51,7 +51,8 @@ function StopTheoryTest(success)
 end
 
 function StartDriveTest(type)
-	ESX.Game.SpawnVehicle(Config.VehicleModels[type], Config.Zones.VehicleSpawnPoint.Pos, Config.Zones.VehicleSpawnPoint.Pos.h, function(vehicle)
+	local pos = vector3(VehicleSpawnPoint.Pos.x, VehicleSpawnPoint.Pos.y,VehicleSpawnPoint.Pos.z)
+	ESX.Game.SpawnVehicle(Config.VehicleModels[type], pos, Config.Zones.VehicleSpawnPoint.Pos.h, function(vehicle)
 		CurrentTest       = 'drive'
 		CurrentTestType   = type
 		CurrentCheckPoint = 0
@@ -220,7 +221,8 @@ Citizen.CreateThread(function()
 		local coords = GetEntityCoords(PlayerPedId())
 
 		for k,v in pairs(Config.Zones) do
-			if(v.Type ~= -1 and #(coords - v.Pos) < Config.DrawDistance) then
+			local Pos = Vector3(v.Pos.x, v.Pos.y, v.Pos.z)
+			if(v.Type ~= -1 and #(coords - Pos) < Config.DrawDistance) then
 				DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false)
 			end
 		end
@@ -238,7 +240,8 @@ Citizen.CreateThread(function()
 		local currentZone = nil
 
 		for k,v in pairs(Config.Zones) do
-			if(#(coords - v.Pos) < v.Size.x) then
+			local Pos = Vector3(v.Pos.x, v.Pos.y, v.Pos.z)
+			if(#(coords - Pos) < v.Size.x) then
 				isInMarker  = true
 				currentZone = k
 			end
@@ -335,6 +338,7 @@ Citizen.CreateThread(function()
 					LastCheckPoint = CurrentCheckPoint
 				end
             
+				local Pos = vector3(Config.CheckPoints[nextCheckPoint].Pos.x,Config.CheckPoints[nextCheckPoint].Pos.y,Config.CheckPoints[nextCheckPoint].Pos.z)
 				local distance = #(coords - Config.CheckPoints[nextCheckPoint].Pos)
             
 				if distance <= 100.0 then
diff --git a/[esx_addons]/esx_drugs/client/weed.lua b/[esx_addons]/esx_drugs/client/weed.lua
index 4147d79a..6ada7fb2 100644
--- a/[esx_addons]/esx_drugs/client/weed.lua
+++ b/[esx_addons]/esx_drugs/client/weed.lua
@@ -4,7 +4,7 @@ local isPickingUp, isProcessing = false, false
 
 Citizen.CreateThread(function()
 	while true do
-		Citizen.Wait(500)
+		Citizen.Wait(700)
 		local coords = GetEntityCoords(PlayerPedId())
 
 		if #(coords - Config.CircleZones.WeedField.coords) < 50 then
@@ -15,7 +15,7 @@ end)
 
 Citizen.CreateThread(function()
 	while true do
-		Citizen.Wait(0)
+		local wait = 1000
 		local playerPed = PlayerPedId()
 		local coords = GetEntityCoords(playerPed)
 
@@ -41,8 +41,9 @@ Citizen.CreateThread(function()
 				end
 			end
 		else
-			Citizen.Wait(500)
+			wait = 2
 		end
+	Citizen.Wait(wait)
 	end
 end)
 
diff --git a/[esx_addons]/esx_jobs/config.lua b/[esx_addons]/esx_jobs/config.lua
index a91fe606..6d9e143e 100644
--- a/[esx_addons]/esx_jobs/config.lua
+++ b/[esx_addons]/esx_jobs/config.lua
@@ -8,7 +8,7 @@ Config.MaxCaution = 10000 -- the max caution allowed
 Config.PublicZones = {
 
 	EnterBuilding = {
-		Pos   = { x = -118.21, y = -607.14, z = 35.28 },
+		Pos   = vector3(-118.21, -607.14, 35.28),
 		Size  = {x = 3.0, y = 3.0, z = 0.2},
 		Color = {r = 204, g = 204, b = 0},
 		Marker= 1,
@@ -16,11 +16,11 @@ Config.PublicZones = {
 		Name  = _U('reporter_name'),
 		Type  = "teleport",
 		Hint  = _U('public_enter'),
-		Teleport = { x = -139.09, y = -620.74, z = 167.82 }
+		Teleport = vector3(-139.09,-620.74, 167.82)
 	},
 
 	ExitBuilding = {
-		Pos   = { x = -139.45, y = -617.32, z = 167.82 },
+		Pos   = vector3( -139.45, -617.32, 167.82),
 		Size  = {x = 3.0, y = 3.0, z = 0.2},
 		Color = {r = 204, g = 204, b = 0},
 		Marker= 1,
@@ -28,7 +28,7 @@ Config.PublicZones = {
 		Name  = _U('reporter_name'),
 		Type  = "teleport",
 		Hint  = _U('public_leave'),
-		Teleport = { x = -113.07, y = -604.93, z = 35.28 },
+		Teleport = vector3(-113.07, -604.93, 35.28 ),
 	}
 
 }
diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua
index 12216874..86c5edcf 100644
--- a/[esx_addons]/esx_property/client/main.lua
+++ b/[esx_addons]/esx_property/client/main.lua
@@ -784,7 +784,8 @@ Citizen.CreateThread(function()
 
 			-- Entering
 			if property.entering and not property.disabled then
-				local distance = #(coords - property.entering)
+				local Pos = vector3(property.entering.x, property.entering.y, property.entering.z)
+				local distance = #(coords - Pos)
 
 				if distance < Config.DrawDistance then
 					DrawMarker(Config.MarkerType, property.entering.x, property.entering.y, property.entering.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, nil, nil, false)
@@ -803,7 +804,8 @@ Citizen.CreateThread(function()
 
 			-- Exit
 			if property.exit and not property.disabled then
-				local distance = #(coords - property.exit)
+				local Pos = vector3(property.exit.x, property.exit.y, property.exit.z)
+				local distance = #(coords - Pos)
 
 				if distance < Config.DrawDistance then
 					DrawMarker(Config.MarkerType, property.exit.x, property.exit.y, property.exit.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, nil, nil, false)
@@ -819,7 +821,8 @@ Citizen.CreateThread(function()
 
 			-- Room menu
 			if property.roomMenu and hasChest and not property.disabled then
-				local distance = #(coords - property.roomMenu)
+				local Pos = vector3(property.disabled.x, property.disabled.y, property.disabled.z)
+				local distance = #(coords - Pos)
 
 				if distance < Config.DrawDistance then
 					DrawMarker(Config.MarkerType, property.roomMenu.x, property.roomMenu.y, property.roomMenu.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.RoomMenuMarkerColor.r, Config.RoomMenuMarkerColor.g, Config.RoomMenuMarkerColor.b, 100, false, true, 2, false, nil, nil, false)
diff --git a/[esx_addons]/esx_realestateagentjob/config.lua b/[esx_addons]/esx_realestateagentjob/config.lua
index 33a9b9ba..928a71a8 100644
--- a/[esx_addons]/esx_realestateagentjob/config.lua
+++ b/[esx_addons]/esx_realestateagentjob/config.lua
@@ -5,31 +5,31 @@ Config.Locale       = 'en'
 
 Config.Zones = {
 	OfficeEnter = {
-		Pos   = { x = -199.151, y = -575.000, z = 39.489 },
+		Pos   = vector3( -199.151, -575.000,  39.489 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
 		Type  = 1
 	},
 
 	OfficeExit = {
-		Pos   = { x = -141.226, y = -614.166, z = 167.820 },
+		Pos   = vector3( -141.226, -614.166,  167.820 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
 		Type  = 1
 	},
 
 	OfficeInside = {
-		Pos   = { x = -140.969, y = -616.785, z = 167.820 },
+		Pos   = vector3( -140.969, -616.785,  167.820 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
 		Type  = -1
 	},
 
 	OfficeOutside = {
-		Pos   = { x = -202.238, y = -578.193, z = 39.500 },
+		Pos   = vector3( -202.238, -578.193,  39.500 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
 		Type  = -1
 	},
 
 	OfficeActions = {
-		Pos   = { x = -124.786, y = -641.486, z = 167.820 },
+		Pos   = vector3( -124.786, -641.486,  167.820 ),
 		Size  = { x = 1.5, y = 1.5, z = 1.0 },
 		Type  = -1
 	}