diff --git a/config.lua b/config.lua
index 6180e830..aac0ae8e 100644
--- a/config.lua
+++ b/config.lua
@@ -46,6 +46,6 @@ Config.Zones = {
     Pos   = { x = -44.630, y = -1080.738, z = 25.683 },
     Size  = { x = 3.0, y = 3.0, z = 1.0 },
     Type  = 1,
-  }
+  },
 
 }
diff --git a/server/main.lua b/server/main.lua
index 9fb3e8fd..95b907e5 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -8,143 +8,121 @@ TriggerEvent('esx_phone:registerNumber', 'cardealer', _U('dealer_customers'), fa
 TriggerEvent('esx_society:registerSociety', 'cardealer', _U('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'})
 
 function RemoveOwnedVehicle (plate)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM owned_vehicles',
-    {},
-    function (result)
-      for i=1, #result, 1 do
-        local vehicleProps = json.decode(result[i].vehicle)
-
-        if vehicleProps.plate == plate then
-          MySQL.Async.execute(
-            'DELETE FROM owned_vehicles WHERE id = @id',
-            { ['@id'] = result[i].id }
-          )
-        end
-      end
-    end
-  )
+	MySQL.Async.execute('DELETE FROM owned_vehicles WHERE plate = @plate',
+	{
+		['@plate'] = plate
+	})
 end
 
 AddEventHandler('onMySQLReady', function ()
-  Categories       = MySQL.Sync.fetchAll('SELECT * FROM vehicle_categories')
-  local vehicles   = MySQL.Sync.fetchAll('SELECT * FROM vehicles')
+	Categories     = MySQL.Sync.fetchAll('SELECT * FROM vehicle_categories')
+	local vehicles = MySQL.Sync.fetchAll('SELECT * FROM vehicles')
 
-  for i=1, #vehicles, 1 do
-    local vehicle = vehicles[i]
+	for i=1, #vehicles, 1 do
+		local vehicle = vehicles[i]
 
-    for j=1, #Categories, 1 do
-      if Categories[j].name == vehicle.category then
-        vehicle.categoryLabel = Categories[j].label
-      end
-    end
+		for j=1, #Categories, 1 do
+			if Categories[j].name == vehicle.category then
+				vehicle.categoryLabel = Categories[j].label
+				break --todo confirm
+			end
+		end
 
-    table.insert(Vehicles, vehicle)
-  end
+		table.insert(Vehicles, vehicle)
+	end
 end)
 
 RegisterServerEvent('esx_vehicleshop:setVehicleOwned')
 AddEventHandler('esx_vehicleshop:setVehicleOwned', function (vehicleProps)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(source)
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
 
-  MySQL.Async.execute(
-    'INSERT INTO owned_vehicles (vehicle, owner) VALUES (@vehicle, @owner)',
-    {
-      ['@vehicle'] = json.encode(vehicleProps),
-      ['@owner']   = xPlayer.identifier,
-    },
-    function (rowsChanged)
-      TriggerClientEvent('esx:showNotification', _source, _U('vehicle_belongs', vehicleProps.plate))
-    end
-  )
+	MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle) VALUES (@owner, @plate, @vehicle)',
+	{
+		['@owner']   = xPlayer.identifier,
+		['@plate']   = vehicleProps.plate,
+		['@vehicle'] = json.encode(vehicleProps)
+	},
+	function (rowsChanged)
+		TriggerClientEvent('esx:showNotification', _source, _U('vehicle_belongs', vehicleProps.plate))
+	end)
 end)
 
 RegisterServerEvent('esx_vehicleshop:setVehicleOwnedPlayerId')
 AddEventHandler('esx_vehicleshop:setVehicleOwnedPlayerId', function (playerId, vehicleProps)
-  local xPlayer = ESX.GetPlayerFromId(playerId)
+	local xPlayer = ESX.GetPlayerFromId(playerId)
 
-  MySQL.Async.execute(
-    'INSERT INTO owned_vehicles (vehicle, owner) VALUES (@vehicle, @owner)',
-    {
-      ['@vehicle'] = json.encode(vehicleProps),
-      ['@owner']   = xPlayer.identifier,
-    },
-    function (rowsChanged)
-      TriggerClientEvent('esx:showNotification', playerId, _U('vehicle_belongs', vehicleProps.plate))
-    end
-  )
+	MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle) VALUES (@owner, @plate, @vehicle)',
+	{
+		['@owner']   = xPlayer.identifier,
+		['@plate']   = vehicleProps.plate,
+		['@vehicle'] = json.encode(vehicleProps)
+	},
+	function (rowsChanged)
+		TriggerClientEvent('esx:showNotification', playerId, _U('vehicle_belongs', vehicleProps.plate))
+	end) 
 end)
 
 RegisterServerEvent('esx_vehicleshop:setVehicleOwnedSociety')
 AddEventHandler('esx_vehicleshop:setVehicleOwnedSociety', function (society, vehicleProps)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(source)
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
 
-  MySQL.Async.execute(
-    'INSERT INTO owned_vehicles (vehicle, owner) VALUES (@vehicle, @owner)',
-    {
-      ['@vehicle'] = json.encode(vehicleProps),
-      ['@owner']   = 'society:' .. society,
-    },
-    function (rowsChanged)
+	MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle) VALUES (@owner, @plate, @vehicle)',
+	{
+		['@owner']   = 'society:' .. society,
+		['@plate']   = vehicleProps.plate,
+		['@vehicle'] = json.encode(vehicleProps),
+	},
+	function (rowsChanged)
 
-    end
-  )
+	end)
 end)
 
 RegisterServerEvent('esx_vehicleshop:sellVehicle')
 AddEventHandler('esx_vehicleshop:sellVehicle', function (vehicle)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM cardealer_vehicles WHERE vehicle = @vehicle LIMIT 1',
-    { ['@vehicle'] = vehicle },
-    function (result)
-      local id    = result[1].id
-      local price = result[1].price
+	MySQL.Async.fetchAll('SELECT * FROM cardealer_vehicles WHERE vehicle = @vehicle LIMIT 1', {
+		['@vehicle'] = vehicle
+	}, function (result)
+		local id = result[1].id
 
-      MySQL.Async.execute(
-        'DELETE FROM cardealer_vehicles WHERE id = @id',
-        { ['@id'] = id }
-      )
-    end
-  )
+		MySQL.Async.execute('DELETE FROM cardealer_vehicles WHERE id = @id', {
+			['@id'] = id
+		})
+	end)
 end)
 
 RegisterServerEvent('esx_vehicleshop:rentVehicle')
 AddEventHandler('esx_vehicleshop:rentVehicle', function (vehicle, plate, playerName, basePrice, rentPrice, target)
-  local xPlayer = ESX.GetPlayerFromId(target)
+	local xPlayer = ESX.GetPlayerFromId(target)
 
-  MySQL.Async.fetchAll(
-    'SELECT * FROM cardealer_vehicles WHERE vehicle = @vehicle LIMIT 1',
-    { ['@vehicle'] = vehicle },
-    function (result)
-      local id     = result[1].id
-      local price  = result[1].price
-      local owner  = xPlayer.identifier
+	MySQL.Async.fetchAll('SELECT * FROM cardealer_vehicles WHERE vehicle = @vehicle LIMIT 1', {
+		['@vehicle'] = vehicle
+	}, function (result)
+		local id    = result[1].id
+		local price = result[1].price
+		local owner = xPlayer.identifier
 
-      MySQL.Async.execute(
-        'DELETE FROM cardealer_vehicles WHERE id = @id',
-        { ['@id'] = id }
-      )
+		MySQL.Async.execute('DELETE FROM cardealer_vehicles WHERE id = @id', {
+			['@id'] = id
+		})
 
-      MySQL.Async.execute(
-        'INSERT INTO rented_vehicles (vehicle, plate, player_name, base_price, rent_price, owner) VALUES (@vehicle, @plate, @player_name, @base_price, @rent_price, @owner)',
-        {
-          ['@vehicle']     = vehicle,
-          ['@plate']       = plate,
-          ['@player_name'] = playerName,
-          ['@base_price']  = basePrice,
-          ['@rent_price']  = rentPrice,
-          ['@owner']       = owner,
-        }
-      )
-    end
-  )
+		MySQL.Async.execute('INSERT INTO rented_vehicles (vehicle, plate, player_name, base_price, rent_price, owner) VALUES (@vehicle, @plate, @player_name, @base_price, @rent_price, @owner)',
+		{
+			['@vehicle']     = vehicle,
+			['@plate']       = plate,
+			['@player_name'] = playerName,
+			['@base_price']  = basePrice,
+			['@rent_price']  = rentPrice,
+			['@owner']       = owner,
+		})
+	end)
 end)
 
+-- unused?
 RegisterServerEvent('esx_vehicleshop:setVehicleForAllPlayers')
 AddEventHandler('esx_vehicleshop:setVehicleForAllPlayers', function (props, x, y, z, radius)
-  TriggerClientEvent('esx_vehicleshop:setVehicle', -1, props, x, y, z, radius)
+	TriggerClientEvent('esx_vehicleshop:setVehicle', -1, props, x, y, z, radius)
 end)
 
 RegisterServerEvent('esx_vehicleshop:getStockItem')
@@ -192,234 +170,189 @@ AddEventHandler('esx_vehicleshop:putStockItems', function (itemName, count)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getCategories', function (source, cb)
-  cb(Categories)
+	cb(Categories)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getVehicles', function (source, cb)
-  cb(Vehicles)
+	cb(Vehicles)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:buyVehicle', function (source, cb, vehicleModel)
-  local xPlayer     = ESX.GetPlayerFromId(source)
-  local vehicleData = nil
+	local xPlayer     = ESX.GetPlayerFromId(source)
+	local vehicleData = nil
 
-  for i=1, #Vehicles, 1 do
-    if Vehicles[i].model == vehicleModel then
-      vehicleData = Vehicles[i]
-      break
-    end
-  end
+	for i=1, #Vehicles, 1 do
+		if Vehicles[i].model == vehicleModel then
+			vehicleData = Vehicles[i]
+			break
+		end
+	end
 
-  if xPlayer.get('money') >= vehicleData.price then
-    xPlayer.removeMoney(vehicleData.price)
-    cb(true)
-  else
-    cb(false)
-  end
+	if xPlayer.getMoney() >= vehicleData.price then
+		xPlayer.removeMoney(vehicleData.price)
+		cb(true)
+	else
+		cb(false)
+	end
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:buyVehicleSociety', function (source, cb, society, vehicleModel)
-  local vehicleData = nil
+	local vehicleData = nil
 
-  for i=1, #Vehicles, 1 do
-    if Vehicles[i].model == vehicleModel then
-      vehicleData = Vehicles[i]
-      break
-    end
-  end
+	for i=1, #Vehicles, 1 do
+		if Vehicles[i].model == vehicleModel then
+			vehicleData = Vehicles[i]
+			break
+		end
+	end
 
-  TriggerEvent('esx_addonaccount:getSharedAccount', 'society_' .. society, function (account)
-    if account.money >= vehicleData.price then
+	TriggerEvent('esx_addonaccount:getSharedAccount', 'society_' .. society, function (account)
+		if account.money >= vehicleData.price then
 
-      account.removeMoney(vehicleData.price)
+			account.removeMoney(vehicleData.price)
+			MySQL.Async.execute('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (@vehicle, @price)',
+			{
+				['@vehicle'] = vehicleData.model,
+				['@price']   = vehicleData.price,
+			})
 
-      MySQL.Async.execute(
-        'INSERT INTO cardealer_vehicles (vehicle, price) VALUES (@vehicle, @price)',
-        {
-          ['@vehicle'] = vehicleData.model,
-          ['@price']   = vehicleData.price,
-        }
-      )
-
-      cb(true)
-    else
-      cb(false)
-    end
-  end)
+			cb(true)
+		else
+			cb(false)
+		end
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getPersonnalVehicles', function (source, cb)
-  local xPlayer = ESX.GetPlayerFromId(source)
+	local xPlayer = ESX.GetPlayerFromId(source)
 
-  MySQL.Async.fetchAll(
-    'SELECT * FROM owned_vehicles WHERE owner = @owner',
-    { ['@owner'] = xPlayer.identifier },
-    function (result)
-      local vehicles = {}
+	MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner', {
+		['@owner'] = xPlayer.identifier
+	}, function (result)
+		local vehicles = {}
 
-      for i=1, #result, 1 do
-        local vehicleData = json.decode(result[i].vehicle)
-        table.insert(vehicles, vehicleData)
-      end
+		for i=1, #result, 1 do
+			local vehicleData = json.decode(result[i].vehicle)
+			table.insert(vehicles, vehicleData)
+		end
 
-      cb(vehicles)
-    end
-  )
+		cb(vehicles)
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getCommercialVehicles', function (source, cb)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM cardealer_vehicles ORDER BY vehicle ASC',
-    {},
-    function (result)
-      local vehicles = {}
+	MySQL.Async.fetchAll('SELECT * FROM cardealer_vehicles ORDER BY vehicle ASC', {}, function (result)
+		local vehicles = {}
 
-      for i=1, #result, 1 do
-        table.insert(vehicles, {
-          name  = result[i].vehicle,
-          price = result[i].price
-        })
-      end
+		for i=1, #result, 1 do
+			table.insert(vehicles, {
+				name  = result[i].vehicle,
+				price = result[i].price
+			})
+		end
 
-      cb(vehicles)
-    end
-  )
+		cb(vehicles)
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getRentedVehicles', function (source, cb)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM rented_vehicles ORDER BY player_name ASC',
-    {},
-    function (result)
-      local vehicles = {}
+	MySQL.Async.fetchAll('SELECT * FROM rented_vehicles ORDER BY player_name ASC', {}, function (result)
+		local vehicles = {}
 
-      for i=1, #result, 1 do
-        table.insert(vehicles, {
-          name       = result[i].vehicle,
-          plate      = result[i].plate,
-          playerName = result[i].player_name
-        })
-      end
+		for i=1, #result, 1 do
+			table.insert(vehicles, {
+				name       = result[i].vehicle,
+				plate      = result[i].plate,
+				playerName = result[i].player_name
+			})
+		end
 
-      cb(vehicles)
-    end
-  )
+		cb(vehicles)
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:giveBackVehicle', function (source, cb, plate)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM rented_vehicles WHERE plate = @plate LIMIT 1',
-    { ['@plate'] = plate },
-    function (result)
-      if #result > 0 then
-        local id        = result[1].id
-        local vehicle   = result[1].vehicle
-        local plate     = result[1].plate
-        local basePrice = result[1].base_price
+	MySQL.Async.fetchAll('SELECT * FROM rented_vehicles WHERE plate = @plate', {
+		['@plate'] = plate
+	}, function (result)
+		if result[1] ~= nil then
+			local vehicle   = result[1].vehicle
+			local basePrice = result[1].base_price
 
-        MySQL.Async.execute(
-          'INSERT INTO cardealer_vehicles (vehicle, price) VALUES (@vehicle, @price)',
-          {
-            ['@vehicle'] = vehicle,
-            ['@price']   = basePrice,
-          }
-        )
+			MySQL.Async.execute('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (@vehicle, @price)',
+			{
+				['@vehicle'] = vehicle,
+				['@price']   = basePrice
+			})
 
-        MySQL.Async.execute(
-          'DELETE FROM rented_vehicles WHERE id = @id',
-          { ['@id'] = id }
-        )
+			MySQL.Async.execute('DELETE FROM rented_vehicles WHERE plate = @plate',{
+				['@plate'] = plate
+			})
 
-        RemoveOwnedVehicle(plate)
-
-        cb(true)
-      else
-        cb(false)
-      end
-    end
-  )
+			RemoveOwnedVehicle(plate)
+			cb(true)
+		else
+			cb(false)
+		end
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:resellVehicle', function (source, cb, plate, price)
-  MySQL.Async.fetchAll(
-    'SELECT * FROM rented_vehicles WHERE plate = @plate LIMIT 1',
-    { ['@plate'] = plate },
-    function (result)
-      if #result > 0 then
-        cb(false)
-      else
-        local xPlayer = ESX.GetPlayerFromId(source)
+	MySQL.Async.fetchAll('SELECT * FROM rented_vehicles WHERE plate = @plate', {
+		['@plate'] = plate
+	}, function (result)
+		if result[1] ~= nil then -- is it a rented vehicle?
+			cb(false) -- it is, don't let the player sell it since he doesn't own it
+		else
+			local xPlayer = ESX.GetPlayerFromId(source)
 
-        MySQL.Async.fetchAll(
-          'SELECT * FROM owned_vehicles WHERE owner = @owner',
-          { ['@owner'] = xPlayer.identifier },
-          function (result)
-            local found = false
+			MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND @plate = plate',
+			{
+				['@owner'] = xPlayer.identifier,
+				['@plate'] = plate
+			}, function (result)
 
-            for i=1, #result, 1 do
-              local vehicleProps = json.decode(result[i].vehicle)
-
-              if vehicleProps.plate == plate then
-                found = true
-                break
-              end
-            end
-
-            if found then
-              xPlayer.addMoney(price)
-              RemoveOwnedVehicle(plate)
-
-              cb(true)
-            else
-              if xPlayer.job.grade_name == 'boss' then
-                MySQL.Async.fetchAll(
-                  'SELECT * FROM owned_vehicles WHERE owner = @owner',
-                  { ['@owner'] = 'society:' .. xPlayer.job.name },
-                  function (result)
-                    local found = false
-
-                    for i=1, #result, 1 do
-                      local vehicleProps = json.decode(result[i].vehicle)
-
-                      if vehicleProps.plate == plate then
-                        found = true
-                        break
-                      end
-                    end
-
-                    if found then
-                      xPlayer.addMoney(price)
-                      RemoveOwnedVehicle(plate)
-
-                      cb(true)
-                    else
-                      cb(false)
-                    end
-                  end
-                )
-              else
-                cb(false)
-              end
-            end
-          end
-        )
-      end
-    end
-  )
+				-- does the owner match?
+				if result[1] ~= nil then
+					xPlayer.addMoney(price)
+					RemoveOwnedVehicle(plate)
+					cb(true)
+				else
+					if xPlayer.job.grade_name == 'boss' then
+						MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND @plate = plate',
+						{
+							['@owner'] = 'society:' .. xPlayer.job.name,
+							['@plate'] = plate
+						}, function (result)
+							if result[1] ~= nil then
+								xPlayer.addMoney(price)
+								RemoveOwnedVehicle(plate)
+								cb(true)
+							else
+								cb(false)
+							end
+						end)
+					else
+						cb(false)
+					end
+				end
+			end)
+		end
+	end)
 end)
 
 
 ESX.RegisterServerCallback('esx_vehicleshop:getStockItems', function (source, cb)
-  TriggerEvent('esx_addoninventory:getSharedInventory', 'society_cardealer', function(inventory)
-    cb(inventory.items)
-  end)
+	TriggerEvent('esx_addoninventory:getSharedInventory', 'society_cardealer', function(inventory)
+		cb(inventory.items)
+	end)
 end)
 
 ESX.RegisterServerCallback('esx_vehicleshop:getPlayerInventory', function (source, cb)
-  local xPlayer = ESX.GetPlayerFromId(source)
-  local items   = xPlayer.inventory
+	local xPlayer = ESX.GetPlayerFromId(source)
+	local items   = xPlayer.inventory
 
-  cb({ items = items })
+	cb({ items = items })
 end)
 
 if Config.EnablePvCommand then
@@ -428,20 +361,17 @@ if Config.EnablePvCommand then
 	end, {help = _U('leaving')})
 end
 
-function PayRent()
-	MySQL.Async.fetchAll(
-	'SELECT * FROM rented_vehicles', {},
-	function (result)
+function PayRent(d, h, m)
+	MySQL.Async.fetchAll('SELECT * FROM rented_vehicles', {}, function (result)
 		for i=1, #result, 1 do
 			local xPlayer = ESX.GetPlayerFromIdentifier(result[i].owner)
 
 			-- message player if connected
 			if xPlayer ~= nil then
-				xPlayer.removeBank(result[i].rent_price)
+				xPlayer.removeAccountMoney('bank', result[i].rent_price)
 				TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_rental', result[i].rent_price))
 			else -- pay rent either way
-				MySQL.Sync.execute(
-				'UPDATE users SET bank = bank - @bank WHERE identifier = @identifier',
+				MySQL.Sync.execute('UPDATE users SET bank = bank - @bank WHERE identifier = @identifier',
 				{
 					['@bank']       = result[i].rent_price,
 					['@identifier'] = result[i].owner