diff --git a/client/main.lua b/client/main.lua
index 2d9b5f9f..aa0ff237 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -34,7 +34,7 @@ function OpenAccessoryMenu()
 			{label = _U('helmet'), value = 'Helmet'},
 			{label = _U('ears'), value = 'Ears'},
 			{label = _U('mask'), value = 'Mask'},
-			{label = _U('glasses'), value = 'Glasses'},
+			{label = _U('glasses'), value = 'Glasses'}
 		}
 	}, function(data, menu)
 		menu.close()
@@ -91,7 +91,7 @@ function OpenShopMenu(accessory)
 			align = 'top-left',
 			elements = {
 				{label = _U('no'), value = 'no'},
-				{label = _U('yes', Config.Price), value = 'yes'}
+				{label = _U('yes', ESX.Math.GroupDigits(Config.Price)), value = 'yes'}
 			}
 		}, function(data, menu)
 			menu.close()
@@ -112,14 +112,14 @@ function OpenShopMenu(accessory)
 			end
 
 			if data.current.value == 'no' then
-				local player = GetPlayerPed(-1)
+				local player = PlayerPedId()
 				TriggerEvent('esx_skin:getLastSkin', function(skin)
 					TriggerEvent('skinchanger:loadSkin', skin)
 				end)
 				if accessory == "Ears" then
 					ClearPedProp(player, 2)
 				elseif accessory == "Mask" then
-					SetPedComponentVariation(player, 1, 0 ,0 ,2)
+					SetPedComponentVariation(player, 1, 0 ,0, 2)
 				elseif accessory == "Helmet" then
 					ClearPedProp(player, 0)
 				elseif accessory == "Glasses" then
@@ -188,7 +188,7 @@ end)
 Citizen.CreateThread(function()
 	while true do
 		Citizen.Wait(0)
-		local coords = GetEntityCoords(GetPlayerPed(-1))
+		local coords = GetEntityCoords(PlayerPedId())
 		for k,v in pairs(Config.Zones) do
 			for i = 1, #v.Pos, 1 do
 				if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then
@@ -203,12 +203,12 @@ end)
 Citizen.CreateThread(function()
 	while true do
 		Citizen.Wait(10)
-		local coords      = GetEntityCoords(GetPlayerPed(-1))
+		local coords      = GetEntityCoords(PlayerPedId())
 		local isInMarker  = false
 		local currentZone = nil
 		for k,v in pairs(Config.Zones) do
 			for i = 1, #v.Pos, 1 do
-				if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then
+				if GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x then
 					isInMarker  = true
 					currentZone = k
 				end
@@ -235,14 +235,12 @@ Citizen.CreateThread(function()
 		Citizen.Wait(10)
 		
 		if CurrentAction ~= nil then
-
 			ESX.ShowHelpNotification(CurrentActionMsg)
 
 			if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then
 				OpenShopMenu(CurrentActionData.accessory)
 				CurrentAction = nil
 			end
-
 		elseif CurrentAction == nil and not Config.EnableControls then
 			Citizen.Wait(500)
 		end
diff --git a/locales/en.lua b/locales/en.lua
index 2cb77f7d..0ea2f75f 100644
--- a/locales/en.lua
+++ b/locales/en.lua
@@ -1,19 +1,19 @@
 Locales ['en'] = {
-	['valid_purchase'] = 'validate this purchase?',
-	['yes'] = 'yes (<span style="color: green;">$%s</span>)',
-	['no'] = 'no',
-	['helmet'] = 'helmet / Hat',
-	['glasses'] = 'glasses',
-	['mask'] = 'mask',
-	['ears'] = 'ears accessories',
-	['shop'] = '%s shop',
-	['set_unset'] = 'put on / Take off',
-	['not_enough_money'] = 'you do not have enough money',
-	['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu',
-	['accessories_blip'] = 'accessories',
-	['no_ears'] = 'you do not have ears accessories',
-	['no_glasses'] = 'you do not have glasses',
-	['no_helmet'] = 'you do not have a helmet',
-	['no_mask'] = 'you do not have a mask',
-	['you_paid'] = 'you paid ~g~$%s~s~',
+  ['valid_purchase'] = 'validate this purchase?',
+  ['yes'] = 'yes (<span style="color: green;">$%s</span>)',
+  ['no'] = 'no',
+  ['helmet'] = 'helmet / Hat',
+  ['glasses'] = 'glasses',
+  ['mask'] = 'mask',
+  ['ears'] = 'ears accessories',
+  ['shop'] = '%s shop',
+  ['set_unset'] = 'put on / Take off',
+  ['not_enough_money'] = 'you do not have enough money',
+  ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu',
+  ['accessories_blip'] = 'accessories',
+  ['no_ears'] = 'you do not have ears accessories',
+  ['no_glasses'] = 'you do not have glasses',
+  ['no_helmet'] = 'you do not have a helmet',
+  ['no_mask'] = 'you do not have a mask',
+  ['you_paid'] = 'you paid ~g~$%s~s~',
 }
diff --git a/locales/fi.lua b/locales/fi.lua
index 4b8748bc..d5c5cfe9 100644
--- a/locales/fi.lua
+++ b/locales/fi.lua
@@ -1,19 +1,19 @@
 Locales ['fi'] = {
-	['valid_purchase'] = 'varmista ostos?',
-	['yes'] = 'kyllä (<span style="color: green;">$%s</span>)',
-	['no'] = 'ei',
-	['helmet'] = 'kypärä / Hattu',
-	['glasses'] = 'lasit',
-	['mask'] = 'maskit',
-	['ears'] = 'korva asusteet',
-	['shop'] = '%s asustekauppa',
-	['set_unset'] = 'laita päälle / Ota pois',
-	['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa',
-	['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu',
-	['accessories_blip'] = 'asusteet',
-	['no_ears'] = 'sinulla ei ole korva asusteita',
-	['no_glasses'] = 'sinulla ei ole laseja',
-	['no_helmet'] = 'sinulla ei ole kypäriä',
-	['no_mask'] = 'sinulla ei ole maskeja',
-	['you_paid'] = 'sinä maksoit ~g~$%s~s~',
+  ['valid_purchase'] = 'varmista ostos?',
+  ['yes'] = 'kyllä (<span style="color: green;">$%s</span>)',
+  ['no'] = 'ei',
+  ['helmet'] = 'kypärä / Hattu',
+  ['glasses'] = 'lasit',
+  ['mask'] = 'maskit',
+  ['ears'] = 'korva asusteet',
+  ['shop'] = '%s asustekauppa',
+  ['set_unset'] = 'laita päälle / Ota pois',
+  ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa',
+  ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu',
+  ['accessories_blip'] = 'asusteet',
+  ['no_ears'] = 'sinulla ei ole korva asusteita',
+  ['no_glasses'] = 'sinulla ei ole laseja',
+  ['no_helmet'] = 'sinulla ei ole kypäriä',
+  ['no_mask'] = 'sinulla ei ole maskeja',
+  ['you_paid'] = 'sinä maksoit ~g~$%s~s~',
 }
diff --git a/locales/fr.lua b/locales/fr.lua
index c6a02037..4e324f2c 100644
--- a/locales/fr.lua
+++ b/locales/fr.lua
@@ -1,19 +1,19 @@
 Locales ['fr'] = {
-	['valid_purchase'] = 'valider cet achat?',
-	['yes'] = 'oui (<span style="color: green;">$%s</span>)',
-	['no'] = 'non',
-	['helmet'] = 'casque / Chapeau',
-	['glasses'] = 'lunettes',
-	['mask'] = 'masque',
-	['ears'] = 'accessoires d\'oreilles',
-	['shop'] = '%s magasin de',
-	['set_unset'] = 'mettre / Enlever',
-	['not_enough_money'] = 'vous n\'avez pas assez d\'argent',
-	['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu',
-	['accessories_blip'] = 'accessoires',
-	['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles',
-	['no_glasses'] = 'vous n\'avez pas de lunettes',
-	['no_helmet'] = 'vous n\'avez pas de casque / chapeau',
-	['no_mask'] = 'vous n\'avez pas de masque',
-	['you_paid'] = 'vous avez payé ~g~$%s~s~',
+  ['valid_purchase'] = 'valider cet achat?',
+  ['yes'] = 'oui (<span style="color: green;">$%s</span>)',
+  ['no'] = 'non',
+  ['helmet'] = 'casque / Chapeau',
+  ['glasses'] = 'lunettes',
+  ['mask'] = 'masque',
+  ['ears'] = 'accessoires d\'oreilles',
+  ['shop'] = '%s magasin de',
+  ['set_unset'] = 'mettre / Enlever',
+  ['not_enough_money'] = 'vous n\'avez pas assez d\'argent',
+  ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu',
+  ['accessories_blip'] = 'accessoires',
+  ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles',
+  ['no_glasses'] = 'vous n\'avez pas de lunettes',
+  ['no_helmet'] = 'vous n\'avez pas de casque / chapeau',
+  ['no_mask'] = 'vous n\'avez pas de masque',
+  ['you_paid'] = 'vous avez payé ~g~$%s~s~',
 }
diff --git a/locales/sv.lua b/locales/sv.lua
index 54f99179..7d033564 100644
--- a/locales/sv.lua
+++ b/locales/sv.lua
@@ -1,19 +1,19 @@
 Locales ['sv'] = {
-	['valid_purchase'] = 'bekräfta köp?',
-	['yes'] = 'ja (<span style="color: green;">%s SEK</span>)',
-	['no'] = 'nej',
-	['helmet'] = 'hjälm / hat',
-	['glasses'] = 'glasögon',
-	['mask'] = 'ansiktsmask',
-	['ears'] = 'örontillbehör',
-	['shop'] = '%s affär',
-	['set_unset'] = 'ta på / av',
-	['not_enough_money'] = 'du har inte råd!',
-	['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.',
-	['accessories_blip'] = 'extrautröstning',
-	['no_ears'] = 'du har inga öron tillbehör',
-	['no_glasses'] = 'du har inga glasögon',
-	['no_helmet'] = 'du har ingen hjälm',
-	['no_mask'] = 'du har inte någon mask',
-	['you_paid'] = 'du har betalat ~g~%s SEK~s~',
+  ['valid_purchase'] = 'bekräfta köp?',
+  ['yes'] = 'ja (<span style="color: green;">%s SEK</span>)',
+  ['no'] = 'nej',
+  ['helmet'] = 'hjälm / hat',
+  ['glasses'] = 'glasögon',
+  ['mask'] = 'ansiktsmask',
+  ['ears'] = 'örontillbehör',
+  ['shop'] = '%s affär',
+  ['set_unset'] = 'ta på / av',
+  ['not_enough_money'] = 'du har inte råd!',
+  ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.',
+  ['accessories_blip'] = 'extrautröstning',
+  ['no_ears'] = 'du har inga öron tillbehör',
+  ['no_glasses'] = 'du har inga glasögon',
+  ['no_helmet'] = 'du har ingen hjälm',
+  ['no_mask'] = 'du har inte någon mask',
+  ['you_paid'] = 'du har betalat ~g~%s SEK~s~',
 }
diff --git a/server/main.lua b/server/main.lua
index 6c674ae2..83d1d255 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -7,7 +7,7 @@ AddEventHandler('esx_accessories:pay', function()
 	local xPlayer = ESX.GetPlayerFromId(source)
 
 	xPlayer.removeMoney(Config.Price)
-	TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Price))
+	TriggerClientEvent('esx:showNotification', source, _U('you_paid', ESX.Math.GroupDigits(Config.Price)))
 end)
 
 RegisterServerEvent('esx_accessories:save')