diff --git a/client/functions.lua b/client/functions.lua
index 87292a48..a15a7812 100644
--- a/client/functions.lua
+++ b/client/functions.lua
@@ -205,7 +205,7 @@ ESX.UI.Menu.Open = function(type, namespace, name, data, submit, cancel, change,
 	menu.setElement = function(i, key, val)
 		menu.data.elements[i][key] = val
 	end
-	
+
 	menu.setElements = function(newElements)
 		menu.data.elements = newElements
 	end
diff --git a/client/main.lua b/client/main.lua
index ac07a4fe..cbfe984d 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -1,4 +1,4 @@
-local isLoadoutLoaded, isPaused, isDead, isFirstSpawn, pickups = false, false, false, true, {}
+local isLoadoutLoaded, isPaused, isDead, pickups = false, false, false, {}
 
 Citizen.CreateThread(function()
 	while true do
diff --git a/locales/cs.lua b/locales/cs.lua
index 10c1d3a0..27963467 100644
--- a/locales/cs.lua
+++ b/locales/cs.lua
@@ -38,20 +38,20 @@ Locales['cs'] = {
   ['threw_pickup_prompt'] = 'stiskni ~y~E~s~ po zvednuti',
 
   -- Key mapping
-  ['keymap_showinventory'] = 'zobrazit inventar', 
+  ['keymap_showinventory'] = 'zobrazit inventar',
 
-  -- Salary related 
-  ['received_salary'] = 'obdrželi jste výplatu: ~g~$%s~s~', 
-  ['received_help'] = 'obdrželi jste sociální dávku: ~g~$%s~s~', 
-  ['company_nomoney'] = 'společnost u které jste zaměstananí nemá peníze na váš plat', 
-  ['received_paycheck'] = 'obdržena výplata', 
-  ['bank'] = 'bankovní účet', 
-  ['account_bank'] = 'banka', 
-  ['account_black_money'] = 'spinave penize', 
-  ['account_money'] = 'kapesne', 
+  -- Salary related
+  ['received_salary'] = 'obdrželi jste výplatu: ~g~$%s~s~',
+  ['received_help'] = 'obdrželi jste sociální dávku: ~g~$%s~s~',
+  ['company_nomoney'] = 'společnost u které jste zaměstananí nemá peníze na váš plat',
+  ['received_paycheck'] = 'obdržena výplata',
+  ['bank'] = 'bankovní účet',
+  ['account_bank'] = 'banka',
+  ['account_black_money'] = 'spinave penize',
+  ['account_money'] = 'kapesne',
 
-  ['act_imp'] = 'akce není možná', 
-  ['in_vehicle'] = 'nemůže nic dát osobě ve vozidle', 
+  ['act_imp'] = 'akce není možná',
+  ['in_vehicle'] = 'nemůže nic dát osobě ve vozidle',
 
   -- Commands
   ['command_car'] = 'spawn an vehicle',
@@ -102,71 +102,71 @@ Locales['cs'] = {
   ['commandgeneric_playerid'] = 'player id',
 
   -- Locale settings
-  ['locale_digit_grouping_symbol'] = ' ', 
-  ['locale_currency'] = '$%s', 
+  ['locale_digit_grouping_symbol'] = ' ',
+  ['locale_currency'] = '$%s',
 
-  -- Weapons 
-  ['weapon_knife'] = 'nuz', 
-  ['weapon_nightstick'] = 'policejni obusek', 
-  ['weapon_hammer'] = 'kladivo', 
-  ['weapon_bat'] = 'basseballka', 
-  ['weapon_golfclub'] = 'gollfova hul', 
-  ['weapon_crowbar'] = 'pacidlo', 
-  ['weapon_pistol'] = 'pistole', 
-  ['weapon_combatpistol'] = 'utocna pistole', 
-  ['weapon_appistol'] = 'ap pistole', 
-  ['weapon_pistol50'] = 'pistole .50', 
-  ['weapon_microsmg'] = 'micro smg', 
-  ['weapon_smg'] = 'smg', 
-  ['weapon_assaultsmg'] = 'utocne smg', 
-  ['weapon_assaultrifle'] = 'utocna puska', 
-  ['weapon_carbinerifle'] = 'carbine puska', 
-  ['weapon_advancedrifle'] = 'pokrocily puska', 
-  ['weapon_mg'] = 'mg', 
-  ['weapon_combatmg'] = 'utocne mg', 
-  ['weapon_pumpshotgun'] = 'pumpovana brokovnice', 
-  ['weapon_sawnoffshotgun'] = 'upilovana brokovnice', 
-  ['weapon_assaultshotgun'] = 'utocna brokovnice', 
-  ['weapon_bullpupshotgun'] = 'bullpup brokovnice', 
-  ['weapon_stungun'] = 'tazer', 
-  ['weapon_sniperrifle'] = 'sniperka', 
-  ['weapon_heavysniper'] = 'tezka sniperka', 
-  ['weapon_grenadelauncher'] = 'launcher granatu', 
-  ['weapon_rpg'] = 'raketomet', 
-  ['weapon_minigun'] = 'minigun', 
-  ['weapon_grenade'] = 'granat', 
-  ['weapon_stickybomb'] = 'lepkava bomba', 
-  ['weapon_smokegrenade'] = 'kourovy granat', 
-  ['weapon_bzgas'] = 'bz gas', 
-  ['weapon_molotov'] = 'molotov koktejl', 
-  ['weapon_fireextinguisher'] = 'hasicak', 
-  ['weapon_petrolcan'] = 'kanystr', 
-  ['weapon_ball'] = 'koule', 
-  ['weapon_snspistol'] = 'sns pistole', 
-  ['weapon_bottle'] = 'lahev', 
-  ['weapon_gusenberg'] = 'gusenberguv zametac', 
-  ['weapon_specialcarbine'] = 'specialni karabina', 
-  ['weapon_heavypistol'] = 'tezka pistole', 
-  ['weapon_bullpuprifle'] = 'bullpup puska', 
-  ['weapon_dagger'] = 'dyka', 
-  ['weapon_vintagepistol'] = 'velmi stara pistole', 
-  ['weapon_firework'] = 'ohnostroj', 
-  ['weapon_musket'] = 'musketa', 
-  ['weapon_heavyshotgun'] = 'tezka brokovnice', 
-  ['weapon_marksmanrifle'] = 'puska strelce', 
-  ['weapon_hominglauncher'] = 'navadeci launcher', 
-  ['weapon_proxmine'] = 'mina na blizko', 
-  ['weapon_snowball'] = 'snehova koule', 
-  ['weapon_flaregun'] = 'svetlice', 
-  ['weapon_combatpdw'] = 'utocne pdw', 
-  ['weapon_marksmanpistol'] = 'pistole strelce', 
-  ['weapon_knuckle'] = 'knuckledusters', 
-  ['weapon_hatchet'] = 'sekerka', 
-  ['weapon_railgun'] = 'vlakovy launcher', 
-  ['weapon_machete'] = 'maceta', 
-  ['weapon_machinepistol'] = 'kulomet', 
-  ['weapon_switchblade'] = 'vystrelovaci nuz', 
-  ['weapon_revolver'] = 'tezky revolver', 
+  -- Weapons
+  ['weapon_knife'] = 'nuz',
+  ['weapon_nightstick'] = 'policejni obusek',
+  ['weapon_hammer'] = 'kladivo',
+  ['weapon_bat'] = 'basseballka',
+  ['weapon_golfclub'] = 'gollfova hul',
+  ['weapon_crowbar'] = 'pacidlo',
+  ['weapon_pistol'] = 'pistole',
+  ['weapon_combatpistol'] = 'utocna pistole',
+  ['weapon_appistol'] = 'ap pistole',
+  ['weapon_pistol50'] = 'pistole .50',
+  ['weapon_microsmg'] = 'micro smg',
+  ['weapon_smg'] = 'smg',
+  ['weapon_assaultsmg'] = 'utocne smg',
+  ['weapon_assaultrifle'] = 'utocna puska',
+  ['weapon_carbinerifle'] = 'carbine puska',
+  ['weapon_advancedrifle'] = 'pokrocily puska',
+  ['weapon_mg'] = 'mg',
+  ['weapon_combatmg'] = 'utocne mg',
+  ['weapon_pumpshotgun'] = 'pumpovana brokovnice',
+  ['weapon_sawnoffshotgun'] = 'upilovana brokovnice',
+  ['weapon_assaultshotgun'] = 'utocna brokovnice',
+  ['weapon_bullpupshotgun'] = 'bullpup brokovnice',
+  ['weapon_stungun'] = 'tazer',
+  ['weapon_sniperrifle'] = 'sniperka',
+  ['weapon_heavysniper'] = 'tezka sniperka',
+  ['weapon_grenadelauncher'] = 'launcher granatu',
+  ['weapon_rpg'] = 'raketomet',
+  ['weapon_minigun'] = 'minigun',
+  ['weapon_grenade'] = 'granat',
+  ['weapon_stickybomb'] = 'lepkava bomba',
+  ['weapon_smokegrenade'] = 'kourovy granat',
+  ['weapon_bzgas'] = 'bz gas',
+  ['weapon_molotov'] = 'molotov koktejl',
+  ['weapon_fireextinguisher'] = 'hasicak',
+  ['weapon_petrolcan'] = 'kanystr',
+  ['weapon_ball'] = 'koule',
+  ['weapon_snspistol'] = 'sns pistole',
+  ['weapon_bottle'] = 'lahev',
+  ['weapon_gusenberg'] = 'gusenberguv zametac',
+  ['weapon_specialcarbine'] = 'specialni karabina',
+  ['weapon_heavypistol'] = 'tezka pistole',
+  ['weapon_bullpuprifle'] = 'bullpup puska',
+  ['weapon_dagger'] = 'dyka',
+  ['weapon_vintagepistol'] = 'velmi stara pistole',
+  ['weapon_firework'] = 'ohnostroj',
+  ['weapon_musket'] = 'musketa',
+  ['weapon_heavyshotgun'] = 'tezka brokovnice',
+  ['weapon_marksmanrifle'] = 'puska strelce',
+  ['weapon_hominglauncher'] = 'navadeci launcher',
+  ['weapon_proxmine'] = 'mina na blizko',
+  ['weapon_snowball'] = 'snehova koule',
+  ['weapon_flaregun'] = 'svetlice',
+  ['weapon_combatpdw'] = 'utocne pdw',
+  ['weapon_marksmanpistol'] = 'pistole strelce',
+  ['weapon_knuckle'] = 'knuckledusters',
+  ['weapon_hatchet'] = 'sekerka',
+  ['weapon_railgun'] = 'vlakovy launcher',
+  ['weapon_machete'] = 'maceta',
+  ['weapon_machinepistol'] = 'kulomet',
+  ['weapon_switchblade'] = 'vystrelovaci nuz',
+  ['weapon_revolver'] = 'tezky revolver',
   ['weapon_dbshotgun'] = 'dvouhlavnova brokovnice',
   ['weapon_compactrifle'] = 'kompaktni puska',
   ['weapon_autoshotgun'] = 'automaticka brokovnice',
@@ -176,7 +176,7 @@ Locales['cs'] = {
   ['weapon_pipebomb'] = 'dymkova bomba',
   ['weapon_poolcue'] = 'kulecnikove tago',
   ['weapon_wrench'] = 'klic na trubky',
-  ['weapon_flashlight'] = 'baterka', 
+  ['weapon_flashlight'] = 'baterka',
   ['gadget_parachute'] = 'padak',
   ['weapon_flare'] = 'svetlice',
   ['weapon_doubleaction'] = 'dvojhlavnovy revolver',
@@ -193,7 +193,7 @@ Locales['cs'] = {
   ['component_grip'] = 'rukojet',
   ['component_luxary_finish'] = 'luxusni vzhled zbrane',
 
-  -- Weapon Ammo 
+  -- Weapon Ammo
   ['ammo_rounds'] = 'naboj(e)',
   ['ammo_shells'] = 'patrona(y)',
   ['ammo_charge'] = 'naboj(e)',
diff --git a/locales/en.lua b/locales/en.lua
index a5ec7122..7dea0545 100644
--- a/locales/en.lua
+++ b/locales/en.lua
@@ -178,12 +178,12 @@ Locales['en'] = {
   ['weapon_wrench'] = 'pipe wrench',
   ['weapon_flashlight'] = 'flashlight',
   ['gadget_parachute'] = 'parachute',
-  ['weapon_flare'] = 'flare gun',
+  ['weapon_flare'] = 'flare',
   ['weapon_doubleaction'] = 'double-Action Revolver',
 
   -- Weapon Components
-  ['component_clip_default'] = 'default Grip',
-  ['component_clip_extended'] = 'extended Grip',
+  ['component_clip_default'] = 'default Clip',
+  ['component_clip_extended'] = 'extended Clip',
   ['component_clip_drum'] = 'drum Magazine',
   ['component_clip_box'] = 'box Magazine',
   ['component_flashlight'] = 'flashlight',
diff --git a/locales/fi.lua b/locales/fi.lua
index 034aebd3..e69271b8 100644
--- a/locales/fi.lua
+++ b/locales/fi.lua
@@ -182,8 +182,8 @@ Locales['fi'] = {
   ['weapon_doubleaction'] = 'double-Action Revolver',
 
   -- Weapon Components
-  ['component_clip_default'] = 'default Grip',
-  ['component_clip_extended'] = 'extended Grip',
+  ['component_clip_default'] = 'default Clip',
+  ['component_clip_extended'] = 'extended Clip',
   ['component_clip_drum'] = 'drum Magazine',
   ['component_clip_box'] = 'box Magazine',
   ['component_flashlight'] = 'flashlight',
diff --git a/locales/sc.lua b/locales/sc.lua
index 050637e2..cfe39ae2 100644
--- a/locales/sc.lua
+++ b/locales/sc.lua
@@ -49,7 +49,7 @@ Locales['sc'] = {
   ['account_bank'] = '银行',
   ['account_black_money'] = '黑钱',
   ['account_money'] = '现金',
-  
+
   ['act_imp'] = '操作失败',
   ['in_vehicle'] = '请离开载具',
 
diff --git a/locales/sv.lua b/locales/sv.lua
index 5cb32c29..25c682f0 100644
--- a/locales/sv.lua
+++ b/locales/sv.lua
@@ -178,7 +178,7 @@ Locales['sv'] = {
   ['weapon_wrench'] = 'skiftnyckel',
   ['weapon_flashlight'] = 'ficklampa',
   ['gadget_parachute'] = 'fallskärm',
-  ['weapon_flare'] = 'signalpistol',
+  ['weapon_flare'] = 'blossa',
   ['weapon_doubleaction'] = 'double-Action Revolver',
 
   -- Weapon Components
diff --git a/locales/tc.lua b/locales/tc.lua
index c0b1e31c..9e31c8db 100644
--- a/locales/tc.lua
+++ b/locales/tc.lua
@@ -49,7 +49,7 @@ Locales['tc'] = {
   ['account_bank'] = '銀行',
   ['account_black_money'] = '黑錢',
   ['account_money'] = '現金',
-  
+
   ['act_imp'] = '操作失敗',
   ['in_vehicle'] = '請離開載具',