diff --git a/server-data/resources/[esx]/es_extended/server/commands.lua b/server-data/resources/[esx]/es_extended/server/commands.lua
index 3c9bfbe16..63cfa3def 100644
--- a/server-data/resources/[esx]/es_extended/server/commands.lua
+++ b/server-data/resources/[esx]/es_extended/server/commands.lua
@@ -1,319 +1,402 @@
-ESX.RegisterCommand('setcoords', 'admin', function(xPlayer, args, _)
-    xPlayer.setCoords({ x = args.x, y = args.y, z = args.z })
+ESX.RegisterCommand({'setcoords', 'tp'}, 'admin', function(xPlayer, args)
+	xPlayer.setCoords({ x = args.x, y = args.y, z = args.z })
 end, false, {
-    help = _U('command_setcoords'),
-    validate = true,
-    arguments = {
-        { name = 'x', help = _U('command_setcoords_x'), type = 'number' },
-        { name = 'y', help = _U('command_setcoords_y'), type = 'number' },
-        { name = 'z', help = _U('command_setcoords_z'), type = 'number' }
-    }
+	help = _U('command_setcoords'),
+	validate = true,
+	arguments = {
+		{ name = 'x', help = _U('command_setcoords_x'), type = 'coordinate' },
+		{ name = 'y', help = _U('command_setcoords_y'), type = 'coordinate' },
+		{ name = 'z', help = _U('command_setcoords_z'), type = 'coordinate' }
+	}
 })
 
-ESX.RegisterCommand('setjob', 'admin', function(_, args, showError)
-	if ESX.DoesJobExist(args.job, args.grade) then
-		args.playerId.setJob(args.job, args.grade)
-	else
-		showError(_U('command_setjob_invalid'))
+ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
+	if not ESX.DoesJobExist(args.job, args.grade) then
+		return showError(_U('command_setjob_invalid'))
 	end
-end, true, {help = _U('command_setjob'), validate = true, arguments = {
-	{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'},
-	{name = 'job', help = _U('command_setjob_job'), type = 'string'},
-	{name = 'grade', help = _U('command_setjob_grade'), type = 'number'}
-}})
-
-ESX.RegisterCommand('car', 'admin', function(xPlayer, args, _)
-	local GameBuild = tonumber(GetConvar("sv_enforceGameBuild", 2802))
-	if not args.car then args.car = GameBuild >= 2802 and "draugur" or "prototipo" end
-	local upgrades = Config.MaxAdminVehicles and {
-		plate = "BPT EMP",
+	args.playerId.setJob(args.job, args.grade)
+end, true, {
+	help = _U('command_setjob'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
+		{ name = 'job',      help = _U('command_setjob_job'),      type = 'string' },
+		{ name = 'grade',    help = _U('command_setjob_grade'),    type = 'number' }
+	}
+})
+
+local upgrades = Config.SpawnVehMaxUpgrades and
+	{
+		plate = "ADMINCAR",
 		modEngine = 3,
 		modBrakes = 2,
 		modTransmission = 2,
 		modSuspension = 3,
 		modArmor = true,
-		windowTint = 1,
+		windowTint = 1
 	} or {}
-	local coords = xPlayer.getCoords(true)
-	local PlayerPed = GetPlayerPed(xPlayer.source)
-	ESX.OneSync.SpawnVehicle(args.car, coords - vector3(0,0, 0.9), GetEntityHeading(PlayerPed), upgrades, function(networkId)
-		local vehicle = NetworkGetEntityFromNetworkId(networkId)
-		Wait(250)
-		TaskWarpPedIntoVehicle(PlayerPed, vehicle, -1)
+
+ESX.RegisterCommand('car', 'admin', function(xPlayer, args, showError)
+	if not xPlayer then
+		return showError('[^1ERROR^7] The xPlayer value is nil')
+	end
+
+	local playerPed = GetPlayerPed(xPlayer.source)
+	local playerCoords = GetEntityCoords(playerPed)
+	local playerHeading = GetEntityHeading(playerPed)
+	local playerVehicle = GetVehiclePedIsIn(playerPed)
+
+	if not args.car or type(args.car) ~= 'string' then
+		args.car = 'adder'
+	end
+
+	if playerVehicle then
+		DeleteEntity(playerVehicle)
+	end
+
+	ESX.OneSync.SpawnVehicle(args.car, playerCoords, playerHeading, upgrades, function(networkId)
+		if networkId then
+			local vehicle = NetworkGetEntityFromNetworkId(networkId)
+			for _ = 1, 20 do
+				Wait(0)
+				SetPedIntoVehicle(playerPed, vehicle, -1)
+
+				if GetVehiclePedIsIn(playerPed, false) == vehicle then
+					break
+				end
+			end
+			if GetVehiclePedIsIn(playerPed, false) ~= vehicle then
+				showError('[^1ERROR^7] The player could not be seated in the vehicle')
+			end
+		end
 	end)
-end, false, {help = _U('command_car'), validate = false, arguments = {
-	{name = 'car',validate = false, help = _U('command_car_car'), type = 'string'}
-}})
+end, false, {
+	help = _U('command_car'),
+	validate = false,
+	arguments = {
+		{ name = 'car', validate = false, help = _U('command_car_car'), type = 'string' }
+	}
+})
 
-ESX.RegisterCommand({'cardel', 'dv'}, 'admin', function(xPlayer, args, _)
+ESX.RegisterCommand({ 'cardel', 'dv' }, 'admin', function(xPlayer, args)
 	local PedVehicle = GetVehiclePedIsIn(GetPlayerPed(xPlayer.source), false)
 	if DoesEntityExist(PedVehicle) then
 		DeleteEntity(PedVehicle)
 	end
-	local Vehicles = ESX.OneSync.GetVehiclesInArea(GetEntityCoords(GetPlayerPed(xPlayer.source)), tonumber(args.radius) or 5.0)
-	for i=1, #Vehicles do
+	local Vehicles = ESX.OneSync.GetVehiclesInArea(GetEntityCoords(GetPlayerPed(xPlayer.source)),
+		tonumber(args.radius) or 5.0)
+	for i = 1, #Vehicles do
 		local Vehicle = NetworkGetEntityFromNetworkId(Vehicles[i])
 		if DoesEntityExist(Vehicle) then
 			DeleteEntity(Vehicle)
 		end
 	end
-end, false, {help = _U('command_cardel'), validate = false, arguments = {
-	{name = 'radius',validate = false, help = _U('command_cardel_radius'), type = 'number'}
-}})
-
-ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError)
-	xPlayer.triggerEvent("esx:repairPedVehicle")
-end, false, {help = _U('command_repair'), validate = false})
-
-ESX.RegisterCommand('setaccountmoney', 'admin', function(_, args, showError)
-    if args.playerId.getAccount(args.account) then
-        args.playerId.setAccountMoney(args.account, args.amount, "Government Grant")
-    else
-        showError(_U('command_giveaccountmoney_invalid'))
-    end
+end, false, {
+	help = _U('command_cardel'),
+	validate = false,
+	arguments = {
+		{ name = 'radius', validate = false, help = _U('command_cardel_radius'), type = 'number' }
+	}
+})
+
+ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showError)
+    local xTarget = args.playerId
+	local ped = GetPlayerPed(xTarget.source)
+	local pedVehicle = GetVehiclePedIsIn(ped, false)
+	if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then
+		showError(_U('not_in_vehicle'))
+		return
+	end
+	xTarget.triggerEvent("esx:repairPedVehicle")
+	xPlayer.showNotification(_U('command_repair_success'), true, false, 140)
+	if xPlayer.source ~= xTarget.source then
+		xTarget.showNotification(_U('command_repair_success_target'), true, false, 140)
+	end
 end, true, {
-    help = _U('command_setaccountmoney'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'),          type = 'player' },
-        { name = 'account',  help = _U('command_giveaccountmoney_account'), type = 'string' },
-        { name = 'amount',   help = _U('command_setaccountmoney_amount'),   type = 'number' }
-    }
+	help = _U('command_repair'),
+	validate = false,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
-ESX.RegisterCommand('giveaccountmoney', 'admin', function(_, args, showError)
-    if args.playerId.getAccount(args.account) then
-        args.playerId.addAccountMoney(args.account, args.amount, "Government Grant")
-    else
-        showError(_U('command_giveaccountmoney_invalid'))
-    end
+ESX.RegisterCommand('setaccountmoney', 'admin', function(xPlayer, args, showError)
+	if not args.playerId.getAccount(args.account) then
+		return showError(_U('command_giveaccountmoney_invalid'))
+	end
+	args.playerId.setAccountMoney(args.account, args.amount, "Government Grant")
+end, true, {
+	help = _U('command_setaccountmoney'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'),          type = 'player' },
+		{ name = 'account',  help = _U('command_giveaccountmoney_account'), type = 'string' },
+		{ name = 'amount',   help = _U('command_setaccountmoney_amount'),   type = 'number' }
+	}
+})
+
+ESX.RegisterCommand('giveaccountmoney', 'admin', function(xPlayer, args, showError)
+	if not args.playerId.getAccount(args.account) then
+		return showError(_U('command_giveaccountmoney_invalid'))
+	end
+	args.playerId.addAccountMoney(args.account, args.amount, "Government Grant")
+end, true, {
+	help = _U('command_giveaccountmoney'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'),          type = 'player' },
+		{ name = 'account',  help = _U('command_giveaccountmoney_account'), type = 'string' },
+		{ name = 'amount',   help = _U('command_giveaccountmoney_amount'),  type = 'number' }
+	}
+})
+
+ESX.RegisterCommand('removeaccountmoney', 'admin', function(xPlayer, args, showError)
+	if not args.playerId.getAccount(args.account) then
+		return showError(_U('command_removeaccountmoney_invalid'))
+	end
+	args.playerId.removeAccountMoney(args.account, args.amount, "Government Tax")
 end, true, {
-    help = _U('command_giveaccountmoney'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'),          type = 'player' },
-        { name = 'account',  help = _U('command_giveaccountmoney_account'), type = 'string' },
-        { name = 'amount',   help = _U('command_giveaccountmoney_amount'),  type = 'number' }
-    }
+	help = _U('command_removeaccountmoney'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'),            type = 'player' },
+		{ name = 'account',  help = _U('command_removeaccountmoney_account'), type = 'string' },
+		{ name = 'amount',   help = _U('command_removeaccountmoney_amount'),  type = 'number' }
+	}
 })
 
 if not Config.OxInventory then
-    ESX.RegisterCommand('giveitem', 'admin', function(_, args, _)
-        args.playerId.addInventoryItem(args.item, args.count)
-    end, true, {
-        help = _U('command_giveitem'),
-        validate = true,
-        arguments = {
-            { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
-            { name = 'item',     help = _U('command_giveitem_item'),   type = 'item' },
-            { name = 'count',    help = _U('command_giveitem_count'),  type = 'number' }
-        }
-    })
-
-    ESX.RegisterCommand('giveweapon', 'admin', function(_, args, showError)
-        if args.playerId.hasWeapon(args.weapon) then
-            showError(_U('command_giveweapon_hasalready'))
-        else
-            args.playerId.addWeapon(args.weapon, args.ammo)
-        end
-    end, true, {
-        help = _U('command_giveweapon'),
-        validate = true,
-        arguments = {
-            { name = 'playerId', help = _U('commandgeneric_playerid'),   type = 'player' },
-            { name = 'weapon',   help = _U('command_giveweapon_weapon'), type = 'weapon' },
-            { name = 'ammo',     help = _U('command_giveweapon_ammo'),   type = 'number' }
-        }
-    })
-
-    ESX.RegisterCommand('giveammo', 'admin', function(_, args, showError)
-        if args.playerId.hasWeapon(args.weapon) then
-            args.playerId.addWeaponAmmo(args.weapon, args.ammo)
-        else
-            showError(_U("command_giveammo_noweapon_found"))
-        end
-    end, true, {
-        help = _U('command_giveweapon'),
-        validate = false,
-        arguments = {
-            { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
-            { name = 'weapon',   help = _U('command_giveammo_weapon'), type = 'weapon' },
-            { name = 'ammo',     help = _U('command_giveammo_ammo'),   type = 'number' }
-        }
-    })
-
-    ESX.RegisterCommand('giveweaponcomponent', 'admin', function(_, args, showError)
-        if args.playerId.hasWeapon(args.weaponName) then
-            local component = ESX.GetWeaponComponent(args.weaponName, args.componentName)
-
-            if component then
-                if args.playerId.hasWeaponComponent(args.weaponName, args.componentName) then
-                    showError(_U('command_giveweaponcomponent_hasalready'))
-                else
-                    args.playerId.addWeaponComponent(args.weaponName, args.componentName)
-                end
-            else
-                showError(_U('command_giveweaponcomponent_invalid'))
-            end
-        else
-            showError(_U('command_giveweaponcomponent_missingweapon'))
-        end
-    end, true, {
-        help = _U('command_giveweaponcomponent'),
-        validate = true,
-        arguments = {
-            { name = 'playerId',      help = _U('commandgeneric_playerid'),               type = 'player' },
-            { name = 'weaponName',    help = _U('command_giveweapon_weapon'),             type = 'weapon' },
-            { name = 'componentName', help = _U('command_giveweaponcomponent_component'), type = 'string' }
-        }
-    })
+	ESX.RegisterCommand('giveitem', 'admin', function(xPlayer, args)
+		args.playerId.addInventoryItem(args.item, args.count)
+	end, true, {
+		help = _U('command_giveitem'),
+		validate = true,
+		arguments = {
+			{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
+			{ name = 'item',     help = _U('command_giveitem_item'),   type = 'item' },
+			{ name = 'count',    help = _U('command_giveitem_count'),  type = 'number' }
+		}
+	})
+
+	ESX.RegisterCommand('giveweapon', 'admin', function(xPlayer, args, showError)
+		if args.playerId.hasWeapon(args.weapon) then
+			return showError(_U('command_giveweapon_hasalready'))
+		end
+		args.playerId.addWeapon(args.weapon, args.ammo)
+	end, true, {
+		help = _U('command_giveweapon'),
+		validate = true,
+		arguments = {
+			{ name = 'playerId', help = _U('commandgeneric_playerid'),   type = 'player' },
+			{ name = 'weapon',   help = _U('command_giveweapon_weapon'), type = 'weapon' },
+			{ name = 'ammo',     help = _U('command_giveweapon_ammo'),   type = 'number' }
+		}
+	})
+
+	ESX.RegisterCommand('giveammo', 'admin', function(xPlayer, args, showError)
+		if not args.playerId.hasWeapon(args.weapon) then
+			return showError(_U("command_giveammo_noweapon_found"))
+		end
+		args.playerId.addWeaponAmmo(args.weapon, args.ammo)
+	end, true, {
+		help = _U('command_giveweapon'),
+		validate = false,
+		arguments = {
+			{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
+			{ name = 'weapon',   help = _U('command_giveammo_weapon'), type = 'weapon' },
+			{ name = 'ammo',     help = _U('command_giveammo_ammo'),   type = 'number' }
+		}
+	})
+
+	ESX.RegisterCommand('giveweaponcomponent', 'admin', function(xPlayer, args, showError)
+		if args.playerId.hasWeapon(args.weaponName) then
+			local component = ESX.GetWeaponComponent(args.weaponName, args.componentName)
+
+			if component then
+				if args.playerId.hasWeaponComponent(args.weaponName, args.componentName) then
+					showError(_U('command_giveweaponcomponent_hasalready'))
+				else
+					args.playerId.addWeaponComponent(args.weaponName, args.componentName)
+				end
+			else
+				showError(_U('command_giveweaponcomponent_invalid'))
+			end
+		else
+			showError(_U('command_giveweaponcomponent_missingweapon'))
+		end
+	end, true, {
+		help = _U('command_giveweaponcomponent'),
+		validate = true,
+		arguments = {
+			{ name = 'playerId',      help = _U('commandgeneric_playerid'),               type = 'player' },
+			{ name = 'weaponName',    help = _U('command_giveweapon_weapon'),             type = 'weapon' },
+			{ name = 'componentName', help = _U('command_giveweaponcomponent_component'), type = 'string' }
+		}
+	})
 end
 
-ESX.RegisterCommand({ 'clear', 'cls' }, 'user', function(xPlayer, _, _)
-    xPlayer.triggerEvent('chat:clear')
+ESX.RegisterCommand({ 'clear', 'cls' }, 'user', function(xPlayer)
+	xPlayer.triggerEvent('chat:clear')
 end, false, { help = _U('command_clear') })
 
-ESX.RegisterCommand({ 'clearall', 'clsall' }, 'admin', function(_, _, _)
-    TriggerClientEvent('chat:clear', -1)
+ESX.RegisterCommand({ 'clearall', 'clsall' }, 'admin', function(xPlayer)
+	TriggerClientEvent('chat:clear', -1)
 end, true, { help = _U('command_clearall') })
 
-ESX.RegisterCommand("refreshjobs", "admin", function(_, _, _)
-    ESX.RefreshJobs()
-end, true, { help = _U("command_refreshjobs") })
+ESX.RegisterCommand("refreshjobs", 'admin', function()
+	ESX.RefreshJobs()
+end, true, { help = _U('command_clearall') })
 
 if not Config.OxInventory then
-    ESX.RegisterCommand('clearinventory', 'admin', function(_, args, _)
-        for _, v in ipairs(args.playerId.inventory) do
-            if v.count > 0 then
-                args.playerId.setInventoryItem(v.name, 0)
-            end
-        end
-        TriggerEvent('esx:playerInventoryCleared', args.playerId)
-    end, true, {
-        help = _U('command_clearinventory'),
-        validate = true,
-        arguments = {
-            { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-        }
-    })
-
-    ESX.RegisterCommand('clearloadout', 'admin', function(_, args, _)
-        for i = #args.playerId.loadout, 1, -1 do
-            args.playerId.removeWeapon(args.playerId.loadout[i].name)
-        end
-        TriggerEvent('esx:playerLoadoutCleared', args.playerId)
-    end, true, {
-        help = _U('command_clearloadout'),
-        validate = true,
-        arguments = {
-            { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-        }
-    })
-end
+	ESX.RegisterCommand('clearinventory', 'admin', function(xPlayer, args)
+		for _, v in ipairs(args.playerId.inventory) do
+			if v.count > 0 then
+				args.playerId.setInventoryItem(v.name, 0)
+			end
+		end
+		TriggerEvent('esx:playerInventoryCleared', args.playerId)
+	end, true, {
+		help = _U('command_clearinventory'),
+		validate = true,
+		arguments = {
+			{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+		}
+	})
 
-ESX.RegisterCommand("setgroup", "admin", function(xPlayer, args, _)
-    if not args.playerId then args.playerId = xPlayer.source end
+	ESX.RegisterCommand('clearloadout', 'admin', function(xPlayer, args)
+		for i = #args.playerId.loadout, 1, -1 do
+			args.playerId.removeWeapon(args.playerId.loadout[i].name)
+		end
+		TriggerEvent('esx:playerLoadoutCleared', args.playerId)
+	end, true, {
+		help = _U('command_clearloadout'),
+		validate = true,
+		arguments = {
+			{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+		}
+	})
+end
 
-    args.playerId.setGroup(args.group)
+ESX.RegisterCommand('setgroup', 'admin', function(xPlayer, args)
+	if not args.playerId then args.playerId = xPlayer.source end
+	if args.group == "superadmin" then
+		args.group = "admin"
+		print("[^3WARNING^7] ^5Superadmin^7 detected, setting group to ^5admin^7")
+	end
+	args.playerId.setGroup(args.group)
 end, true, {
-    help = _U("command_setgroup"),
-    validate = true,
-    arguments = {
-        { name = "playerId", help = _U("commandgeneric_playerid"), type = "player" },
-        { name = "group",    help = _U("command_setgroup_group"),  type = "string" },
-    }
+	help = _U('command_setgroup'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' },
+		{ name = 'group',    help = _U('command_setgroup_group'),  type = 'string' },
+	}
 })
 
-ESX.RegisterCommand('save', 'admin', function(_, args, _)
-    Core.SavePlayer(args.playerId)
-    print("[^2Info^0] Saved Player - ^5" .. args.playerId.source .. "^0")
+ESX.RegisterCommand('save', 'admin', function(_, args)
+	Core.SavePlayer(args.playerId)
+	print(('[^2Info^0] Saved Player - ^5%s^0'):format(args.playerId.source))
 end, true, {
-    help = _U('command_save'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-    }
+	help = _U('command_save'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
-ESX.RegisterCommand('saveall', 'admin', function(_, _, _)
-    Core.SavePlayers()
+ESX.RegisterCommand('saveall', 'admin', function()
+	Core.SavePlayers()
 end, true, { help = _U('command_saveall') })
 
 ESX.RegisterCommand('group', { "user", "admin" }, function(xPlayer, _, _)
-    print(xPlayer.getName() .. ", You are currently: ^5" .. xPlayer.getGroup() .. "^0")
+	print(('%s, you are currently: ^5%s^0'):format(xPlayer.getName(), xPlayer.getGroup()))
 end, true)
 
 ESX.RegisterCommand('job', { "user", "admin" }, function(xPlayer, _, _)
-    local data = ("%s, You are currently: ^5%s^0 - ^5%s^0 (^5%s-Duty^0)"):format(xPlayer.getName(), xPlayer.getJob().name, xPlayer.getJob().grade_label, xPlayer.getDuty() and "On" or "Off")
-    print(data)
+	print(('%s, your job is: ^5%s^0 - ^5%s^0'):format(xPlayer.getName(), xPlayer.getJob().name,
+		xPlayer.getJob().grade_label))
 end, true)
 
-ESX.RegisterCommand('info', { "user", "admin" }, function(xPlayer, _, _)
-    local job = xPlayer.getJob().name
-    print("^2ID : ^5" .. xPlayer.source .. " ^0| ^2Name:^5" .. xPlayer.getName() .. " ^0 | ^2Group:^5" ..
-    xPlayer.getGroup() .. "^0 | ^2Job:^5" .. job .. "^0")
+ESX.RegisterCommand('info', { "user", "admin" }, function(xPlayer)
+	local job = xPlayer.getJob().name
+	print(('^2ID: ^5%s^0 | ^2Name: ^5%s^0 | ^2Group: ^5%s^0 | ^2Job: ^5%s^0'):format(xPlayer.source, xPlayer.getName(),
+		xPlayer.getGroup(), job))
 end, true)
 
-ESX.RegisterCommand('coords', "admin", function(xPlayer, _, _)
-    local ped = GetPlayerPed(xPlayer.source)
-    local coords = GetEntityCoords(ped, false)
-    local heading = GetEntityHeading(ped)
-    print("Coords - Vector3: ^5" .. vector3(coords.x, coords.y, coords.z) .. "^0")
-    print("Coords - Vector4: ^5" .. vector4(coords.x, coords.y, coords.z, heading) .. "^0")
+ESX.RegisterCommand('coords', "admin", function(xPlayer)
+	local ped = GetPlayerPed(xPlayer.source)
+	local coords = GetEntityCoords(ped, false)
+	local heading = GetEntityHeading(ped)
+	print(('Coords - Vector3: ^5%s^0'):format(vector3(coords.x, coords.y, coords.z)))
+	print(('Coords - Vector4: ^5%s^0'):format(vector4(coords.x, coords.y, coords.z, heading)))
 end, true)
 
-ESX.RegisterCommand('tpm', "admin", function(xPlayer, _, _)
-    xPlayer.triggerEvent("esx:tpm")
+ESX.RegisterCommand('tpm', "admin", function(xPlayer)
+	xPlayer.triggerEvent("esx:tpm")
 end, true)
 
-ESX.RegisterCommand('goto', "admin", function(xPlayer, args, _)
-    local targetCoords = args.playerId.getCoords()
-    xPlayer.setCoords(targetCoords)
+ESX.RegisterCommand('goto', "admin", function(xPlayer, args)
+	local targetCoords = args.playerId.getCoords()
+	xPlayer.setCoords(targetCoords)
 end, true, {
-    help = _U('command_goto'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-    }
+	help = _U('command_goto'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
 ESX.RegisterCommand('bring', "admin", function(xPlayer, args)
-    local playerCoords = xPlayer.getCoords()
-    args.playerId.setCoords(playerCoords)
+	local targetCoords = args.playerId.getCoords()
+	local playerCoords = xPlayer.getCoords()
+	args.playerId.setCoords(playerCoords)
+end, true, {
+	help = _U('command_bring'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
+})
+
+ESX.RegisterCommand('kill', "admin", function(xPlayer, args)
+	args.playerId.triggerEvent("esx:killPlayer")
 end, true, {
-    help = _U('command_bring'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-    }
+	help = _U('command_kill'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
-ESX.RegisterCommand('freeze', "admin", function(_, args, _)
-    args.playerId.triggerSafeEvent("esx:freezePlayer", { state = "freeze" })
+ESX.RegisterCommand('freeze', "admin", function(xPlayer, args)
+	args.playerId.triggerEvent('esx:freezePlayer', "freeze")
 end, true, {
-    help = _U('command_freeze'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-    }
+	help = _U('command_freeze'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
-ESX.RegisterCommand('unfreeze', "admin", function(_, args, _)
-    args.playerId.triggerSafeEvent("esx:freezePlayer", { state = "unfreeze" })
+ESX.RegisterCommand('unfreeze', "admin", function(xPlayer, args)
+	args.playerId.triggerEvent('esx:freezePlayer', "unfreeze")
 end, true, {
-    help = _U('command_unfreeze'),
-    validate = true,
-    arguments = {
-        { name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
-    }
+	help = _U('command_unfreeze'),
+	validate = true,
+	arguments = {
+		{ name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player' }
+	}
 })
 
+ESX.RegisterCommand("noclip", 'admin', function(xPlayer)
+	xPlayer.triggerEvent('esx:noclip')
+end, false)
+
 ESX.RegisterCommand('players', "admin", function()
     local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers
-    print("^5" .. #xPlayers .. " ^2online player(s)^0")
+	print(('^5%s^2 online player(s)^0'):format(#xPlayers))
     for i = 1, #(xPlayers) do
-     local xPlayer = xPlayers[i]
-     print("^1[ ^2ID : ^5" .. xPlayer.source .." ^0| ^2Name : ^5" .. xPlayer.getName() .. " ^0 | ^2Group : ^5" ..
-     xPlayer.getGroup() .. " ^0 | ^2Identifier : ^5" .. xPlayer.identifier .. "^1]^0\n")
+		local xPlayer = xPlayers[i]
+        print(('^1[^2ID: ^5%s^0 | ^2Name : ^5%s^0 | ^2Group : ^5%s^0 | ^2Identifier : ^5%s^1]^0\n'):format(xPlayer.source, xPlayer.getName(), xPlayer.getGroup(), xPlayer.identifier))     
     end
 end, true)
\ No newline at end of file