diff --git a/README.md b/README.md
index 5bcd5b0..9658e5c 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Compatibility is quite high:
 - Almost all SA-MP **scripting functions** and **callbacks** are
   implemented.
 - **Database** functions (`db_*`) are implemented.
-- SA-MP server **plugins** work unmodified.
+- SA-MP server **plugins** work unmodified, if they don't use memory hacking.
 - SA-MP style **rcon** commands are available from the server console
   and the ingame console.
 
@@ -83,6 +83,9 @@ features:
 - You can **load plugins dynamically**, while the server is running.
   Use the `loadplugin` console command for this.
 
+- There is no hard-coded max filterscript count, the **number of
+  running filterscripts is unlimited**.
+
 ## Installation
 
 *amx* consists of a binary server module (.dll/.so) and a Lua resource.
@@ -203,7 +206,7 @@ Information about this is lined out below.
 
   The meta.xml files of gamemodes and filterscripts are slightly
   different. Two resources, amx-test and amx-fs-test, are included
-  with the *amx* download as examples. Most times you can simply
+  in the *amx* repository as examples. Most times you can simply
   copy-paste these to a new resource and adjust the names in it.
 
 - To specify what **filterscripts to autostart** when *amx* loads,
@@ -224,10 +227,10 @@ Information about this is lined out below.
   plugins to start, separated by spaces. For example:
 
   ```xml
-  <setting name="plugins" value="irc sampmysql"/>
+  <setting name="plugins" value="irc mysql"/>
   ```
 
-  This will load irc.dll and sampmysql.dll on Windows, or .so on
+  This will load irc.dll and mysql.dll on Windows, or .so on
   Linux.
 
 - jbeta's mapcycler resource (shipped with the MTA server) is used for
@@ -675,12 +678,18 @@ Even though *amx* offers a high level of compatibility, not everything
 is perfect. Below is a list of limitations that may or may not be
 addressed in later versions of *amx* and Multi Theft Auto.
 
+- The following scripting functions will require certain resources
+  installed to have effect when called: DisableInteriorEnterExits
+  (disable enex markers implemented by "interiors" resource,
+  otherwise they are always disabled), SendDeathMessage (invoke
+  graphical death messages from "killmessages" resource).
+
 - The following scripting functions are currently not implemented and
-  will have no effect when called: DisableInteriorEnterExits,
-  EnableStuntBonusForAll, EnableStuntBonusForPlayer, EnableTirePopping
-  (tire popping is always on), PlayerPlaySound, SendDeathMessage (use
-  the "killmessages" resource on your server instead for graphical
-  death messages), SetNameTagDrawDistance, TextDrawSetProportional.
+  will have no effect when called: DisableRemoteVehicleCollisions,
+  EnablePlayerCameraTarget, EnableStuntBonusForAll,
+  EnableStuntBonusForPlayer, EnableTirePopping (tire popping is
+  always on), EnableVehicleFriendlyFire, SetObjectNoCameraCol,
+  SetPlayerShopName, TextDrawSetProportional, TextDrawSetSelectable.
 
 ## Credits
 
diff --git a/amx-test/pawno/include/a_amx.inc b/amx-test/pawno/include/a_amx.inc
index 445eef6..5bda332 100644
--- a/amx-test/pawno/include/a_amx.inc
+++ b/amx-test/pawno/include/a_amx.inc
@@ -34,13 +34,22 @@ forward OnPlayerKeyUp(playerid, key);
 // World
 native Float:GetGameSpeed();
 native SetGameSpeed(Float:speed);
+native Float:GetRainLevel();
+native SetRainLevel(Float:level);
+native ResetRainLevel();
 native GetSkyGradient(&topRed, &topGreen, &topBlue, &bottomRed, &bottomGreen, &bottomBlue);
 native SetSkyGradient(topRed = 0, topGreen = 0, topBlue = 0, bottomRed = 0, bottomGreen = 0, bottomBlue = 0);
 native ResetSkyGradient();
+native Float:GetFogDistance();
+native SetFogDistance(Float:distance);
+native ResetFogDistance();
 native GetCloudsEnabled();
 native SetCloudsEnabled(bool:enable);
+native SetWeatherBlended(weatherid);
 native GetInteriorSoundsEnabled();
 native SetInteriorSoundsEnabled(bool:enable);
+native GetOcclusionsEnabled();
+native SetOcclusionsEnabled(bool:enable);
 native IsGarageOpen(garageid);
 native SetGarageOpen(garageid, bool:open);
 native IsGlitchEnabled(const name[]);
@@ -51,6 +60,7 @@ native Float:GetAircraftMaxHeight();
 native SetAircraftMaxHeight(Float:height);
 native Float:GetJetpackMaxHeight();
 native SetJetpackMaxHeight(Float:height);
+native GetWeaponSlot(weaponid);
 native GetFPSLimit();
 native SetFPSLimit(fps);
 native GetRandomPlayer();
@@ -127,6 +137,8 @@ native IsPlayerHeadless(playerid);
 native SetPlayerHeadless(playerid, bool:headless);
 native GetPlayerBlurLevel(playerid);
 native SetPlayerBlurLevel(playerid, level);
+native IsPlayerMapForced(playerid);
+native ForcePlayerMap(playerid, bool:forceOn);
 native FadePlayerCamera(playerid, bool:fadeIn, Float:timeToFade = 1.0, red = 0, green = 0, blue = 0);
 native SetPlayerControlState(playerid, const control[], bool:controlState);
 native IsPlayerCursorShowing(playerid);
@@ -241,7 +253,7 @@ native SetBotAlpha(botid, alpha);
 
 // Scoreboard
 native AddScoreBoardColumn(const column[]);
-native SetPlayerScoreBoardData(playerid, const column[], const data[]);
+native SetPlayerScoreBoardData(playerid, const column[], const value[]);
 native RemoveScoreBoardColumn(const column[]);
 
 // Player Data
diff --git a/amx/client/client.lua b/amx/client/client.lua
index 78aa72a..a1207b5 100644
--- a/amx/client/client.lua
+++ b/amx/client/client.lua
@@ -51,13 +51,6 @@ addEventHandler('onClientResourceStart', resourceRoot,
 	false
 )
 
-addEventHandler('onClientResourceStop', resourceRoot,
-	function()
-		TogglePlayerClock(false, true)
-	end,
-	false
-)
-
 function enableDebug()
 	local state = not isDebugViewActive()
 	setDebugViewActive(state)
@@ -139,7 +132,7 @@ function startClassSelection(classInfo)
 		g_ClassSelectionInfo.selectedclass = 0
 	end
 	g_ClassSelectionInfo.gui = {
-		img = guiCreateStaticImage(35, screenHeight - 410, 205, 236, 'client/logo_small.png', false),
+		img = guiCreateStaticImage(35, screenHeight - 410, 205, 236, 'images/logo_small.png', false),
 		btnLeft = guiCreateButton(screenWidth / 2 - 145 - 70, screenHeight - 100, 140, 20, '<<<', false),
 		btnRight = guiCreateButton(screenWidth / 2 - 70, screenHeight - 100, 140, 20, '>>>', false),
 		btnSpawn = guiCreateButton(screenWidth / 2 + 145 - 70, screenHeight - 100, 140, 20, 'Spawn', false)
@@ -216,6 +209,7 @@ end
 addEventHandler('onClientResourceStop', resourceRoot,
 	function()
 		destroyClassSelGUI()
+		TogglePlayerClock(true)
 		removeEventHandler('onClientRender', root, renderTextDraws)
 		removeEventHandler('onClientRender', root, renderMenu)
 	end
@@ -275,10 +269,9 @@ function pickupOnInteriorChangeLoop()
 end
 
 local function clientPlayerPickupHit(thePickup, matchingDimension)
-	if source ~= localPlayer then return end
 	triggerServerEvent('OnPlayerPickUpPickup_Ev', localPlayer, thePickup)
 end
-addEventHandler('onClientPlayerPickupHit', root, clientPlayerPickupHit)
+addEventHandler('onClientPlayerPickupHit', localPlayer, clientPlayerPickupHit)
 -----------------------------
 -- Interior related
 
@@ -310,7 +303,7 @@ ca.maxZ = math.rad(89)
 ca.minZ = math.rad(-45)
 
 function removeCamAttachHandler()
-	outputConsole('removeCamAttachHandler was called')
+	--outputConsole('removeCamAttachHandler was called')
 	if (ca.active == 1) then
 		outputConsole('Destroying cam attach handler...')
 		ca.active = 0
@@ -372,7 +365,7 @@ function cursorMouseMoveHandler(curX, curY, absX, absY)
 end
 
 function AttachCameraToObject(camObj)
-	outputConsole('AttachCameraToObject was called')
+	--outputConsole('AttachCameraToObject was called')
 
 	if not isElement(camObj) then
 		return
@@ -386,7 +379,7 @@ function AttachCameraToObject(camObj)
 end
 
 function AttachCameraToPlayerObject(camobjID)
-	outputConsole('AttachCameraToPlayerObject was called')
+	--outputConsole('AttachCameraToPlayerObject was called')
 
 	if not isElement(g_PlayerObjects[camobjID]) then
 		return
@@ -406,7 +399,7 @@ sm.moov = 0
 sm.objCamPos, sm.objLookAt = nil, nil
 
 function removeInterpCamHandler()
-	outputConsole('removeInterpCamHandler was called')
+	--outputConsole('removeInterpCamHandler was called')
 	if (sm.moov == 1) then
 		outputConsole('Destroying cam handler...')
 		sm.moov = 0
@@ -550,15 +543,16 @@ function StopPlayerObject(objID)
 	stopObject(obj)
 end
 -----------------------------
--- Audio
+-- Audio & SFX
 
 local pAudioStreamSound = nil -- SA-MP can only do one stream at a time anyway
 function PlayAudioStreamForPlayer(url, posX, posY, posZ, distance, usepos)
 	--outputConsole(string.format("PlayAudioStreamForPlayer called with args %s %f %f %f %f %d", url, posX, posY, posZ, distance, usepos))
-	if pAudioStreamSound ~= nil then -- If there's one already playing, stop it
+	if pAudioStreamSound and isElement(pAudioStreamSound) then -- If there's one already playing, stop it
 		--outputConsole("PlayAudioStreamForPlayer is stopping an audio stream")
-		StopAudioStreamForPlayer()
+		stopSound(pAudioStreamSound)
 	end
+
 	if not usepos then
 		--outputConsole(string.format("PlayAudioStreamForPlayer now playing non-3d sound %s", url))
 		pAudioStreamSound = playSound(url)
@@ -567,15 +561,52 @@ function PlayAudioStreamForPlayer(url, posX, posY, posZ, distance, usepos)
 		pAudioStreamSound = playSound3D(url, posX, posY, posZ)
 		setSoundMaxDistance(pAudioStreamSound, distance)
 	end
-	if pAudioStreamSound ~= nil then
+
+	if pAudioStreamSound and isElement(pAudioStreamSound) then
 		setSoundVolume(pAudioStreamSound, 1.0)
 	end
 end
 
 function StopAudioStreamForPlayer()
-	if pAudioStreamSound == nil then return end
+	if not pAudioStreamSound then return end
+	if not isElement(pAudioStreamSound) then return end
+
 	stopSound(pAudioStreamSound)
 end
+
+local sfxSound = nil
+function PlayerPlaySound(soundid, posX, posY, posZ)
+	if sfxSound and isElement(sfxSound) then
+		stopSound(sfxSound)
+	end
+
+	-- only 'script' container supported
+	if not getSFXStatus('script') then return end
+
+	for bankId = 1, #SFX_Offset do
+		local bank = SFX_Offset[bankId]
+		local first = bank.first
+		local last = bank.last or first
+
+		if soundid >= first and soundid <= last then
+			local bankIdx = bankId - 1
+			local audioEvent = soundid - first
+
+			if posX ~= 0.0 or posY ~= 0.0 or posZ ~= 0.0 then
+				--outputConsole(string.format("PlayerPlaySound now playing 3d sound %d (bank %d)", audioEvent, bankIdx))
+				sfxSound = playSFX3D('script', bankIdx, audioEvent, posX, posY, posZ)
+			else
+				--outputConsole(string.format("PlayerPlaySound now playing non-3d sound %d (bank %d)", audioEvent, bankIdx))
+				sfxSound = playSFX('script', bankIdx, audioEvent)
+			end
+			break
+		end
+	end
+
+	if sfxSound and isElement(sfxSound) then
+		setSoundVolume(sfxSound, 1.0)
+	end
+end
 -----------------------------
 -- Checkpoints
 
@@ -791,14 +822,17 @@ addEventHandler('onClientElementStreamOut', root,
 local function clientVehicleDamage(attacker, weapon, loss, x, y, z, tire)
 	if not isElement(source) then return end
 
-	local driver = getVehicleOccupant(source)
+	-- get the driver from either players or peds
+	local occupants = getVehicleOccupants(source)
+	local driver = occupants and occupants[0] -- seat 0
+
 	if not driver then
-		-- Block any damage for unoccupied vehicles like SA-MP does
+		-- block any damage for unoccupied vehicles like SA-MP does
 		return cancelEvent()
 	end
 
 	if driver ~= localPlayer then return end
-	triggerServerEvent('OnVehicleDamageStatusUpdate_Ev', localPlayer, source)
+	serverAMXEvent('OnVehicleDamageStatusUpdate', getElemID(source), g_PlayerID)
 end
 addEventHandler('onClientVehicleDamage', root, clientVehicleDamage)
 
@@ -1212,12 +1246,9 @@ function renderTextLabels()
 			local pX, pY, pZ, _, _, _ = getCameraMatrix() --getElementPosition(localPlayer)
 			local dist = getDistanceBetweenPoints3D(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z)
 			local vw = getElementDimension(localPlayer)
-			local LOS = isLineOfSightClear(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z, true, false, false)
 
 			if screenX and dist <= textlabel.dist and (vw == textlabel.vw or textlabel.vw == -1) then -- Because player textlabels don't have VW's, since we're processing both here
-				if not textlabel.los then
-					dxDrawText(textlabel.text, screenX, screenY, screenX, screenY, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1.0, 'default-bold', 'center', 'top', false, false, false, true)
-				elseif LOS then
+				if not textlabel.los or isLineOfSightClear(pX, pY, pZ, textlabel.X, textlabel.Y, textlabel.Z, true, false, false) then
 					dxDrawText(textlabel.text, screenX, screenY, screenX, screenY, tocolor(textlabel.color.r, textlabel.color.g, textlabel.color.b, textlabel.color.a), 1.0, 'default-bold', 'center', 'top', false, false, false, true)
 				end
 			end
@@ -1422,7 +1453,7 @@ function ShowMenuForPlayer(menuID)
 	if not prevMenu then
 		g_CurrentMenu.alpha = 0
 
-		g_CurrentMenu.closebtn = guiCreateStaticImage(g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, closebtnSide, closebtnSide, 'client/closebtn.png', false, nil)
+		g_CurrentMenu.closebtn = guiCreateStaticImage(g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, closebtnSide, closebtnSide, 'images/closebtn.png', false, nil)
 		guiSetAlpha(g_CurrentMenu.closebtn, 0)
 		addEventHandler('onClientMouseEnter', g_CurrentMenu.closebtn,
 			function()
@@ -1432,7 +1463,7 @@ function ShowMenuForPlayer(menuID)
 			false
 		)
 
-		g_CurrentMenu.closebtnhover = guiCreateStaticImage(g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, closebtnSide, closebtnSide, 'client/closebtn_hover.png', false, nil)
+		g_CurrentMenu.closebtnhover = guiCreateStaticImage(g_CurrentMenu.x + g_CurrentMenu.width - closebtnSide, g_CurrentMenu.y, closebtnSide, closebtnSide, 'images/closebtn_hover.png', false, nil)
 		guiSetVisible(g_CurrentMenu.closebtnhover, false)
 		guiSetAlpha(g_CurrentMenu.closebtnhover, .75)
 		addEventHandler('onClientMouseLeave', g_CurrentMenu.closebtnhover,
@@ -1446,6 +1477,7 @@ function ShowMenuForPlayer(menuID)
 		addEventHandler('onClientGUIClick', g_CurrentMenu.closebtnhover,
 			function()
 				if not g_CurrentMenu.anim then
+					playSoundFrontEnd(2)
 					HideMenuForPlayer()
 				end
 			end,
@@ -1530,8 +1562,8 @@ function closeMenu()
 end
 
 function exitMenu()
-	closeMenu()
 	serverAMXEvent('OnPlayerExitedMenu', g_PlayerID)
+	closeMenu()
 end
 
 function renderMenu()
@@ -1606,14 +1638,18 @@ function menuClickHandler(button, state, clickX, clickY)
 
 	local selectedRow = math.floor((clickY - g_CurrentMenu.y - MENU_TOP_PADDING) / MENU_ITEM_HEIGHT)
 	if not (g_CurrentMenu.disabledrows and table.find(g_CurrentMenu.disabledrows, selectedRow)) then
+		playSoundFrontEnd(1)
 		serverAMXEvent('OnPlayerSelectedMenuRow', g_PlayerID, selectedRow)
 		closeMenu()
+	else
+		playSoundFrontEnd(4)
 	end
 end
 
 function OnKeyPress(key, keyState)
 	if (keyState == 'down') then
-		exitMenu()
+		playSoundFrontEnd(2)
+		HideMenuForPlayer()
 	end
 end
 -----------------------------
@@ -1623,9 +1659,31 @@ function SetPlayerPosFindZ(x, y, z)
 	setElementPosition(localPlayer, x, y, getGroundPosition(x, y, z) + 1)
 end
 
+local function clientPlayerDamage(attacker, weapon, bodypart, loss)
+	local issuer = attacker
+
+	if issuer then
+		if getElementType(issuer) == 'vehicle' then
+			issuer = getVehicleOccupant(issuer)
+		end
+		if issuer == source then
+			issuer = nil
+		end
+	end
+
+	if issuer == localPlayer then -- give damage
+		triggerServerEvent('OnPlayerDamage_Ev', issuer, source, true, loss, weapon, bodypart)
+	end
+
+	if source == localPlayer then -- take damage
+		if issuer and getElementType(issuer) ~= 'player' then issuer = nil end
+		triggerServerEvent('OnPlayerDamage_Ev', source, issuer, false, loss, weapon, bodypart)
+	end
+end
+addEventHandler('onClientPlayerDamage', root, clientPlayerDamage)
+
 local function clientPlayerWeaponFire(weapon, ammo, ammoInClip, hitX, hitY, hitZ, hitElement, startX, startY, startZ)
 	if weapon < 22 or (weapon > 34 and weapon ~= 38) then return end
-	if source ~= localPlayer then return end
 
 	local hitId, hitType = 65535, 0
 	local offsetX, offsetY, offsetZ = hitX, hitY, hitZ
@@ -1659,17 +1717,24 @@ local function clientPlayerWeaponFire(weapon, ammo, ammoInClip, hitX, hitY, hitZ
 
 	triggerServerEvent('OnPlayerWeaponShot_Ev', localPlayer, weapon, hitType, hitId, startX, startY, startZ, hitX, hitY, hitZ, offsetX, offsetY, offsetZ)
 end
-addEventHandler('onClientPlayerWeaponFire', root, clientPlayerWeaponFire)
+addEventHandler('onClientPlayerWeaponFire', localPlayer, clientPlayerWeaponFire)
 
 local function clientPedDamage(attacker, weapon, bodypart, loss)
 	if getElementType(source) == 'ped' and getElementData(source, 'ActorPed') then
 		local issuer = attacker
+
 		if issuer and getElementType(issuer) == 'vehicle' then
-			issuer = getVehicleOccupant(issuer)
+			local driver = getVehicleOccupant(issuer)
+
+			if driver and getElementType(driver) == 'player' then
+				issuer = driver
+			else
+				issuer = nil
+			end
 		end
 
 		if issuer == localPlayer and not getElementData(source, 'Invulnerable') then
-			triggerServerEvent('OnPlayerGiveDamageActor_Ev', localPlayer, source, loss, weapon, bodypart)
+			triggerServerEvent('OnPlayerGiveDamageActor_Ev', issuer, source, loss, weapon, bodypart)
 		end
 
 		-- Actor damage controlled by the server in any case
@@ -1680,7 +1745,7 @@ addEventHandler('onClientPedDamage', root, clientPedDamage)
 
 function enableWeaponSyncing(enable)
 	if enable and not g_WeaponSyncTimer then
-		g_WeaponSyncTimer = setTimer(sendWeapons, 1000, 0)
+		g_WeaponSyncTimer = setTimer(sendWeapons, 500, 0)
 	elseif not enable and g_WeaponSyncTimer then
 		killTimer(g_WeaponSyncTimer)
 		g_WeaponSyncTimer = nil
@@ -1930,7 +1995,7 @@ function OnListDialogButton1Click(button, state)
 	if button == 'left' then
 		local row, column = guiGridListGetSelectedItem(listGrid)
 		local text = guiGridListGetItemText(listGrid, row, column)
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), listDialog, 1, row, text)
+		serverAMXEvent('OnDialogResponse', g_PlayerID, listDialog, 1, row, text)
 		guiSetVisible(listWindow, false)
 		showCursor(false)
 		listDialog = nil
@@ -1942,7 +2007,7 @@ function OnListDialogButton2Click(button, state)
 	if button == 'left' then
 		local row, column = guiGridListGetSelectedItem(listGrid)
 		local text = guiGridListGetItemText(listGrid, row, column)
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), listDialog, 0, row, text)
+		serverAMXEvent('OnDialogResponse', g_PlayerID, listDialog, 0, row, text)
 		guiSetVisible(listWindow, false)
 		showCursor(false)
 		listDialog = nil
@@ -1952,7 +2017,7 @@ end
 
 function OnInputDialogButton1Click(button, state)
 	if button == 'left' then
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), inputDialog, 1, 0, guiGetText(inputEdit))
+		serverAMXEvent('OnDialogResponse', g_PlayerID, inputDialog, 1, 0, guiGetText(inputEdit))
 		guiSetVisible(inputWindow, false)
 		showCursor(false)
 		inputDialog = nil
@@ -1961,7 +2026,7 @@ end
 
 function OnInputDialogButton2Click(button, state)
 	if button == 'left' then
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), inputDialog, 0, 0, guiGetText(inputEdit))
+		serverAMXEvent('OnDialogResponse', g_PlayerID, inputDialog, 0, 0, guiGetText(inputEdit))
 		guiSetVisible(inputWindow, false)
 		showCursor(false)
 		inputDialog = nil
@@ -1970,7 +2035,7 @@ end
 
 function OnMessageDialogButton1Click(button, state)
 	if button == 'left' then
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), msgDialog, 1, 0, '')
+		serverAMXEvent('OnDialogResponse', g_PlayerID, msgDialog, 1, 0, '')
 		guiSetVisible(msgWindow, false)
 		showCursor(false)
 		msgDialog = nil
@@ -1979,7 +2044,7 @@ end
 
 function OnMessageDialogButton2Click(button, state)
 	if button == 'left' then
-		serverAMXEvent('OnDialogResponse', getElemID(localPlayer), msgDialog, 0, 0, '')
+		serverAMXEvent('OnDialogResponse', g_PlayerID, msgDialog, 0, 0, '')
 		guiSetVisible(msgWindow, false)
 		showCursor(false)
 		msgDialog = nil
@@ -2146,6 +2211,6 @@ end
 -- depends on scoreboard resource
 local function clientPlayerScoreboardClick(selected, cX, cY, clickedColumn)
 	if getElementType(source) ~= 'player' then return end
-	serverAMXEvent('OnPlayerClickPlayer', getElemID(localPlayer), getElemID(source), 0)
+	serverAMXEvent('OnPlayerClickPlayer', g_PlayerID, getElemID(source), 0)
 end
 addEventHandler('onClientPlayerScoreboardClick', root, clientPlayerScoreboardClick)
diff --git a/amx/client/map_waypoint.lua b/amx/client/map_waypoint.lua
new file mode 100644
index 0000000..2030bc1
--- /dev/null
+++ b/amx/client/map_waypoint.lua
@@ -0,0 +1,61 @@
+local targetBlipIcon = 41
+local targetBlip
+
+local screenSize = Vector2(guiGetScreenSize())
+local wasLMBPressed, wasRMBPressed = false, false
+local wasMapOpened = false
+
+local function handleMapTargetBlip()
+	if not isPlayerMapVisible() then
+		if wasMapOpened then
+			showCursor(false, false)
+			wasLMBPressed, wasRMBPressed = false, false
+			wasMapOpened = false
+		end
+		return
+	end
+
+	if not isCursorShowing() then
+		showCursor(true, false)
+	end
+
+	local isLMBPressed = getKeyState('mouse1')
+	if isLMBPressed and isLMBPressed ~= wasLMBPressed then
+		local cursorPos, mapMin, mapMax = Vector2(getCursorPosition())
+		cursorPos.x, cursorPos.y = cursorPos.x * screenSize.x, cursorPos.y * screenSize.y
+
+		do
+			local mx, my, Mx, My = getPlayerMapBoundingBox()
+			mapMin = Vector2(mx, my)
+			mapMax = Vector2(Mx, My)
+		end
+
+		if cursorPos.x >= mapMin.x and cursorPos.y >= mapMin.y and cursorPos.x <= mapMax.x and cursorPos.y <= mapMax.y then
+			local relPos = Vector2((cursorPos.x - mapMin.x) / (mapMax.x - mapMin.x), (cursorPos.y - mapMin.y) / (mapMax.y - mapMin.y))
+			local worldPlanePos = Vector2(6000 * (relPos.x - 0.5), 3000 - (relPos.y * 6000))
+			local worldPos = Vector3(worldPlanePos.x, worldPlanePos.y, getGroundPosition(worldPlanePos.x, worldPlanePos.y, 3000))
+
+			triggerServerEvent('OnPlayerClickMap_Ev', localPlayer, worldPos.x, worldPos.y, worldPos.z)
+			playSoundFrontEnd(1)
+
+			if not targetBlip then
+				targetBlip = createBlip(worldPos, targetBlipIcon)
+			else
+				setElementPosition(targetBlip, worldPos)
+			end
+		end
+	end
+
+	local isRMBPressed = getKeyState('mouse2')
+	if targetBlip then
+		if isRMBPressed and isRMBPressed ~= wasRMBPressed then
+			playSoundFrontEnd(2)
+			destroyElement(targetBlip)
+			targetBlip = nil
+		end
+	end
+
+	wasLMBPressed, wasRMBPressed = isLMBPressed, isRMBPressed
+	wasMapOpened = true
+end
+addEventHandler('onClientRender', root, handleMapTargetBlip)
diff --git a/amx/client/samp_nametags.lua b/amx/client/samp_nametags.lua
index 1ebbd93..b607599 100644
--- a/amx/client/samp_nametags.lua
+++ b/amx/client/samp_nametags.lua
@@ -1,3 +1,8 @@
+local showNameTags = true
+local nameTagsRadius = 70
+local nameTagsLOS = true
+local nameTagShowing = {}
+
 local font = 'arial' -- default font
 
 HealthBarBorderVertices =
@@ -24,24 +29,17 @@ HealthBarInnerVertices =
 	{ x = 0, y = 0, z = 0, c = tocolor(185, 34, 40, 255) }
 }
 
-function applyColorAlpha(color, alpha)
-	if color < 0 then
-		color = 0x100000000 + color
+function drawNameTag(position, nameText, r, g, b, health, armor, distance)
+	if not r or not g or not b then
+		r = 255
+		g = 255
+		b = 255
 	end
-	local rgb = color % 0x1000000
-	local a = (color - rgb) / 0x1000000 * alpha
-	a = a - a % 1
-	return rgb + a * 0x1000000
-end
 
-function drawNameTag(position, nameText, health, armor, distance)
 	position.z = (distance * 0.025) + position.z + 0.3
 
 	local screenCoordsX, screenCoordsY = getScreenFromWorldPosition(position.x, position.y, position.z)
-
-	if not screenCoordsX then
-		return
-	end
+	if not screenCoordsX then return end
 
 	local rect = {left = screenCoordsX, top = screenCoordsY, right = screenCoordsX + 1, bottom = screenCoordsY + 1}
 	local textSizeX, textSizeY = dxGetTextSize(nameText, 0, 1, 1, font)
@@ -87,7 +85,7 @@ function drawNameTag(position, nameText, health, armor, distance)
 
 	dxDrawText(
 		nameText, rect.left, rect.top, rect.right, rect.bottom,
-		tocolor(255, 255, 255, 255), 1, 1,
+		tocolor(r, g, b, 255), 1, 1,
 
 		font, 'left', 'top', false, false,
 		false, false, false,
@@ -195,19 +193,62 @@ end
 
 addEventHandler('onClientRender', root,
 	function()
+		if not showNameTags then return end
 		local playerPosX, playerPosY, playerPosZ = getElementPosition(localPlayer)
+
 		for k, player in pairs(getElementsByType('player')) do
 			if player ~= localPlayer and isElementOnScreen(player) then
-				--local fPosX, fPosY, fPosZ = getElementPosition(player)
-				local fPosX, fPosY, fPosZ = getPedBonePosition(player, 8)
-				local distance = getDistanceBetweenPoints3D(playerPosX, playerPosY, playerPosZ, fPosX, fPosY, fPosZ)
-				if distance < 45 then
-					local cx, cy, cz = getCameraMatrix(localPlayer)
-					if isLineOfSightClear(cx, cy, cz, fPosX, fPosY, fPosZ, true, true, false, true, true, false, false) then
-						drawNameTag({x = fPosX, y = fPosY, z = fPosZ}, getPlayerName(player) .. ' (' .. getElemID(player) .. ')', getElementHealth(player), getPedArmor(player), distance)
+				if nameTagShowing[player] ~= false then
+					--local fPosX, fPosY, fPosZ = getElementPosition(player)
+					local fPosX, fPosY, fPosZ = getPedBonePosition(player, 8)
+					local distance = getDistanceBetweenPoints3D(playerPosX, playerPosY, playerPosZ, fPosX, fPosY, fPosZ)
+
+					if distance < nameTagsRadius then
+						local cx, cy, cz = getCameraMatrix()
+
+						if not nameTagsLOS or isLineOfSightClear(cx, cy, cz, fPosX, fPosY, fPosZ, true, false, false, true, true, false, false) then
+							local r, g, b = getPlayerNametagColor(player)
+							drawNameTag({x = fPosX, y = fPosY, z = fPosZ}, getPlayerName(player) .. ' (' .. getElemID(player) .. ')', r, g, b, getElementHealth(player), getPedArmor(player), distance)
+						end
+					end
+				end
+			end
+		end
+
+		for k, bot in pairs(getElementsByType('ped')) do
+			if isElementOnScreen(bot) then
+				if getElementData(bot, 'ShowNameTag') then
+					--local fPosX, fPosY, fPosZ = getElementPosition(bot)
+					local fPosX, fPosY, fPosZ = getPedBonePosition(bot, 8)
+					local distance = getDistanceBetweenPoints3D(playerPosX, playerPosY, playerPosZ, fPosX, fPosY, fPosZ)
+
+					if distance < nameTagsRadius then
+						local cx, cy, cz = getCameraMatrix()
+
+						if not nameTagsLOS or isLineOfSightClear(cx, cy, cz, fPosX, fPosY, fPosZ, true, false, false, true, true, false, false) then
+							local botName = getElementData(bot, 'BotName') or 'Bot'
+							drawNameTag({x = fPosX, y = fPosY, z = fPosZ}, botName .. ' (' .. getElemID(bot) .. ')', 255, 255, 255, getElementHealth(bot), getPedArmor(bot), distance)
+						end
 					end
 				end
 			end
 		end
 	end
 )
+
+function updateNameTagGlobals(settings)
+	if settings.status ~= nil then
+		showNameTags = settings.status
+	end
+	if settings.radius ~= nil then
+		nameTagsRadius = settings.radius
+	end
+	if settings.los ~= nil then
+		nameTagsLOS = settings.los
+	end
+end
+
+-- ShowPlayerNameTagForPlayer
+function updateNameTagShowing(playerToShow, show)
+	nameTagShowing[playerToShow] = show
+end
diff --git a/amx/client/closebtn.png b/amx/images/closebtn.png
similarity index 100%
rename from amx/client/closebtn.png
rename to amx/images/closebtn.png
diff --git a/amx/client/closebtn_hover.png b/amx/images/closebtn_hover.png
similarity index 100%
rename from amx/client/closebtn_hover.png
rename to amx/images/closebtn_hover.png
diff --git a/amx/client/logo_small.png b/amx/images/logo_small.png
similarity index 100%
rename from amx/client/logo_small.png
rename to amx/images/logo_small.png
diff --git a/amx/meta.xml b/amx/meta.xml
index 35e33e1..200e446 100644
--- a/amx/meta.xml
+++ b/amx/meta.xml
@@ -5,6 +5,7 @@
     <script src="server/defines.lua" type="server" />
     <script src="shared/anim_define.lua" type="shared" />
     <script src="shared/ped_anim.lua" type="shared" />
+    <script src="shared/sound_offset.lua" type="shared" />
     <script src="shared/vehicle_info.lua" type="shared" />
     <script src="server/util.lua" type="server" />
     <script src="server/_triggerqueue.lua" type="server" />
@@ -30,6 +31,7 @@
     <script src="client/mouselook.lua" type="client" />
     <script src="client/client.lua" type="client" />
     <script src="client/samp_nametags.lua" type="client" />
+    <script src="client/map_waypoint.lua" type="client" />
     <script src="client/garages.lua" type="client" />
 
     <!-- 
@@ -43,12 +45,11 @@
     <script src="shared/attach_func.lua" type="client" />
     <script src="client/bone_pos_rot.lua" type="client" />
 
-    <file src="client/logo_small.png" />
-    <file src="client/closebtn.png" />
-    <file src="client/closebtn_hover.png" />
+    <file src="images/logo_small.png" />
+    <file src="images/closebtn.png" />
+    <file src="images/closebtn_hover.png" />
 
     <aclrequest>
-
         <right name="general.ModifyOtherObjects" access="true"></right>
         <right name="function.fetchRemote" access="true"></right>
         <right name="function.startResource" access="true"></right>
diff --git a/amx/server/amx.lua b/amx/server/amx.lua
index 51493dd..637abb4 100644
--- a/amx/server/amx.lua
+++ b/amx/server/amx.lua
@@ -23,9 +23,12 @@ function initGameModeGlobals()
 	g_Teams = setmetatable({}, { __index = function(t, k) t[k] = createTeam('Team ' .. (k + 1)) return t[k] end })
 	g_PlayerMarkersMode = 1
 	g_PlayerMarkerRadius = false
-	g_ShowZoneNames = true
+	g_ShowZoneNames = false
 	g_GlobalChatRadius = false
 	g_UseCJWalk = false
+	g_ShowNameTags = true
+	g_NameTagsRadius = 70
+	g_NameTagsLOS = true
 end
 
 addEventHandler('onResourceStart', resourceRoot,
diff --git a/amx/server/defines.lua b/amx/server/defines.lua
index cf0ab2b..ff12562 100644
--- a/amx/server/defines.lua
+++ b/amx/server/defines.lua
@@ -200,6 +200,7 @@ PLAYER_STATE_SPAWNED = 8
 PLAYER_STATE_SPECTATING = 9
 
 SPECIAL_ACTION_NONE = 0
+SPECIAL_ACTION_DUCK = 1
 SPECIAL_ACTION_USEJETPACK = 2
 SPECIAL_ACTION_DANCE1 = 5
 SPECIAL_ACTION_DANCE2 = 6
@@ -207,19 +208,29 @@ SPECIAL_ACTION_DANCE3 = 7
 SPECIAL_ACTION_DANCE4 = 8
 SPECIAL_ACTION_HANDSUP = 10
 SPECIAL_ACTION_USECELLPHONE = 11
-SPECIAL_ACTION_SITTING = 12
 SPECIAL_ACTION_STOPUSECELLPHONE = 13
+SPECIAL_ACTION_DRINK_BEER = 20
+SPECIAL_ACTION_SMOKE_CIGGY = 21
+SPECIAL_ACTION_DRINK_WINE = 22
+SPECIAL_ACTION_DRINK_SPRUNK = 23
+SPECIAL_ACTION_CARRY = 25
+SPECIAL_ACTION_PISSING = 68
 
 g_SpecialActions = {
 	[SPECIAL_ACTION_NONE] = { false },
-	[SPECIAL_ACTION_DANCE1] = { 'dancing', 'dnce_m_a' },
-	[SPECIAL_ACTION_DANCE2] = { 'dancing', 'dnce_m_b' },
-	[SPECIAL_ACTION_DANCE3] = { 'dancing', 'dnce_m_c' },
-	[SPECIAL_ACTION_DANCE4] = { 'dancing', 'dnce_m_d' },
-	[SPECIAL_ACTION_HANDSUP] = { 'ped', 'handsup', -1, false, false },
-	[SPECIAL_ACTION_USECELLPHONE] = { 'ped', 'phone_talk' },
-	[SPECIAL_ACTION_SITTING] = { 'attractors', 'stepsit_loop' },
-	[SPECIAL_ACTION_STOPUSECELLPHONE] = { 'ped', 'phone_out', -1, false, false }
+	[SPECIAL_ACTION_DANCE1] = { 'wop', 'dance_loop', -1, true, false, false, false, 250, false },
+	[SPECIAL_ACTION_DANCE2] = { 'gfunk', 'dance_loop', -1, true, false, false, false, 250, false },
+	[SPECIAL_ACTION_DANCE3] = { 'runningman', 'dance_loop', -1, true, false, false, false, 250, false },
+	[SPECIAL_ACTION_DANCE4] = { 'strip', 'str_loop_b', -1, true, false, false, false, 250, false },
+	[SPECIAL_ACTION_HANDSUP] = { 'ped', 'handsup', -1, false, false, false, true, 250, false },
+	[SPECIAL_ACTION_USECELLPHONE] = { 'ped', 'phone_in', -1, false, true, false, true, 250, true },
+	[SPECIAL_ACTION_STOPUSECELLPHONE] = { 'ped', 'phone_out', -1, false, true, false, false, 250, true },
+	[SPECIAL_ACTION_DRINK_BEER] = { 'bar', 'dnk_stndm_loop', -1, false, true, false, false, 250, true },
+	[SPECIAL_ACTION_SMOKE_CIGGY] = { 'gangs', 'smkcig_prtl', -1, false, true, false, false, 250, true },
+	[SPECIAL_ACTION_DRINK_WINE] = { 'bar', 'dnk_stndm_loop', -1, false, true, false, false, 250, true },
+	[SPECIAL_ACTION_DRINK_SPRUNK] = { 'bar', 'dnk_stndm_loop', -1, false, true, false, false, 250, true },
+	[SPECIAL_ACTION_CARRY] = { 'carry', 'crry_prtial', -1, true, true, false, false, 250, true },
+	[SPECIAL_ACTION_PISSING] = { 'paulnmac', 'piss_loop', -1, true, false, false, false, 250, false },
 }
 
 PLAYER_VARTYPE_NONE = 0
diff --git a/amx/server/events.lua b/amx/server/events.lua
index a18062b..2b4d6ba 100644
--- a/amx/server/events.lua
+++ b/amx/server/events.lua
@@ -28,7 +28,12 @@ function gameModeInit(player)
 	setElementData(player, 'Score', 0)
 	toggleAllControls(player, false, true, false)
 	clientCall(player, 'showIntroScene')
-	clientCall(player, 'TogglePlayerClock', false, false)
+	clientCall(player, 'TogglePlayerClock', false)
+	clientCall(player, 'updateNameTagGlobals', {
+		status = g_ShowNameTags,
+		radius = g_NameTagsRadius,
+		los = g_NameTagsLOS
+	})
 	g_Players[playerID].pvars = {}
 	g_Players[playerID].streamedActors = {}
 	g_Players[playerID].streamedVehicles = {}
@@ -41,6 +46,7 @@ function gameModeInit(player)
 	g_Players[playerID].conntick = getTickCount()
 	g_Players[playerID].viewingintro = true
 	g_Players[playerID].state = PLAYER_STATE_NONE
+	g_Players[playerID].doingclasssel = nil
 
 	fadeCamera(player, true)
 	setTimer(
@@ -48,7 +54,12 @@ function gameModeInit(player)
 			if not isElement(player) or getElementType(player) ~= 'player' then
 				return
 			end
-			g_Players[playerID].doingclasssel = false
+
+			-- Don't draw the class selection UI if we're not initializing
+			if g_Players[playerID].state ~= PLAYER_STATE_NONE then
+				return
+			end
+
 			if procCallOnAll('OnPlayerRequestClass', playerID, 0) then
 				putPlayerInClassSelection(player)
 			else
@@ -75,7 +86,7 @@ function joinHandler(player)
 
 	-- Keybinds
 	bindKey(player, 'F4', 'down', 'changeclass')
-	bindKey(player, 'enter_exit', 'down', removePedJetPack)
+	bindKey(player, 'enter_exit', 'down', resetSpecialAction)
 	g_Players[playerID].keys = {}
 	local function bindControls(player, t)
 		for samp, mta in pairs(t) do
@@ -185,6 +196,7 @@ function putPlayerInClassSelection(player)
 		return
 	end
 
+	setElementFrozen(player, true)
 	toggleAllControls(player, false, true, false)
 	g_Players[playerID].viewingintro = nil
 	g_Players[playerID].doingclasssel = true
@@ -197,6 +209,8 @@ function putPlayerInClassSelection(player)
 		killTimer(g_Players[playerID].updatetimer)
 		g_Players[playerID].updatetimer = nil
 	end
+	addPedClothes(player, 'vest', 'vest', 0)
+	setPlayerHudComponentVisible(player, 'area_name', false)
 	clientCall(player, 'startClassSelection', g_PlayerClasses)
 	bindKey(player, 'arrow_l', 'down', requestClass, -1)
 	bindKey(player, 'arrow_r', 'down', requestClass, 1)
@@ -211,6 +225,11 @@ function requestClass(player, btn, state, dir)
 	end
 	local playerID = getElemID(player)
 	local data = g_Players[playerID]
+	if dir > 0 then
+		playSoundFrontEnd(player, 6)
+	elseif dir < 0 then
+		playSoundFrontEnd(player, 14)
+	end
 	data.selectedclass = data.selectedclass + dir
 	if data.selectedclass > #g_PlayerClasses then
 		data.selectedclass = 0
@@ -265,6 +284,7 @@ function spawnPlayerBySelectedClass(player, x, y, z, r)
 		end
 	end
 	clientCall(player, 'destroyClassSelGUI')
+	setPlayerHudComponentVisible(player, 'area_name', g_ShowZoneNames)
 	if playerdata.blip then
 		setElementVisibleTo(playerdata.blip, root, true)
 	end
@@ -274,32 +294,45 @@ addEventHandler('onPlayerSpawn', root,
 	function()
 		local playerID = getElemID(source)
 		local playerdata = g_Players[playerID]
+
 		local spawninfo = playerdata.spawninfo or (g_PlayerClasses and g_PlayerClasses[playerdata.selectedclass])
 		if not spawninfo or playerdata.doingclasssel then
 			return
 		end
-		toggleAllControls(source, true)
-		setElementCollisionsEnabled(source, true)
-		procCallOnAll('OnPlayerSpawn', playerID)
+
 		setPlayerState(source, PLAYER_STATE_SPAWNED)
+		handlePlayerSpawn(source)
+	end
+)
 
-		-- wanna see CJ in a white singlet?
-		addPedClothes(source, 'vest', 'vest', 0)
+function handlePlayerSpawn(player)
+	local playerID = getElemID(player)
+	local playerdata = g_Players[playerID]
 
-		if not g_UseCJWalk then
-			local skin = getElementModel(source)
-			setPedWalkingStyle(source, WalkingStyle[skin] or 0)
-		end
+	setElementFrozen(player, false)
+	toggleAllControls(player, true)
+	setElementAlpha(player, 255)
+	setElementCollisionsEnabled(player, true)
 
-		if g_Players[playerID].updatetimer then
-			killTimer(g_Players[playerID].updatetimer)
-		end
-		g_Players[playerID].updatetimer = setTimer(procCallOnAll, 100, 0, 'OnPlayerUpdate', playerID)
+	procCallOnAll('OnPlayerSpawn', playerID)
+	setPlayerState(player, PLAYER_STATE_ONFOOT)
+
+	-- wanna see CJ in a white singlet?
+	addPedClothes(player, 'vest', 'vest', 0)
 
-		playerdata.vehicle = nil
-		playerdata.specialaction = SPECIAL_ACTION_NONE
+	if not g_UseCJWalk then
+		local skin = getElementModel(player)
+		setPedWalkingStyle(player, WalkingStyle[skin] or 0)
 	end
-)
+
+	if g_Players[playerID].updatetimer then
+		killTimer(g_Players[playerID].updatetimer)
+	end
+	g_Players[playerID].updatetimer = setTimer(procCallOnAll, 100, 0, 'OnPlayerUpdate', playerID)
+
+	playerdata.vehicle = nil
+	playerdata.specialaction = SPECIAL_ACTION_NONE
+end
 
 addEventHandler('onPlayerChat', root,
 	function(msg, type)
@@ -327,29 +360,20 @@ addEventHandler('onPlayerChat', root,
 	end
 )
 
-addEventHandler('onPlayerDamage', root,
-	function(attacker, weapon, body, loss)
-		local playerId = getElemID(source)
-		local attackerId = INVALID_PLAYER_ID
+addEvent('OnPlayerDamage_Ev', true)
+addEventHandler('OnPlayerDamage_Ev', root,
+	function(opponent, givetake, loss, weapon, body)
+		local playerId, attackerId = getElemID(source), getElemID(opponent)
 
-		if attacker ~= source and isElement(attacker) then
-			if getElementType(attacker) == 'player' then
-				attackerId = getElemID(attacker)
-			elseif getElementType(attacker) == 'vehicle' then
-				local driver = getVehicleOccupant(attacker)
-				if driver and getElementType(driver) == 'player' then
-					attackerId = getElemID(driver)
-				end
-			end
-		end
-
-		if attackerId ~= INVALID_PLAYER_ID then
-			setTimer(procCallOnAll, 10, 1, 'OnPlayerGiveDamage', attackerId, playerId, float2cell(loss), weapon, body)
+		if givetake then
+			if not opponent then return end
+			setTimer(procCallOnAll, 1, 1, 'OnPlayerGiveDamage', playerId, attackerId, float2cell(loss), weapon, body)
+			-- This needs to be just a bit delayed to arrive after OnPlayerWeaponShot
+		else
+			if not opponent then attackerId = INVALID_PLAYER_ID end
+			setTimer(procCallOnAll, 1, 1, 'OnPlayerTakeDamage', playerId, attackerId, float2cell(loss), weapon, body)
 			-- This needs to be just a bit delayed to arrive after OnPlayerWeaponShot
 		end
-
-		setTimer(procCallOnAll, 10, 1, 'OnPlayerTakeDamage', playerId, attackerId, float2cell(loss), weapon, body)
-		-- This needs to be just a bit delayed to arrive after OnPlayerWeaponShot
 	end
 )
 
@@ -365,19 +389,23 @@ addEventHandler('onPlayerWasted', root,
 		if g_Players[playerID].doingclasssel then
 			return
 		end
+
 		local killerID = INVALID_PLAYER_ID
 		if killer ~= source and isElement(killer) then
 			if getElementType(killer) == 'player' then
 				killerID = getElemID(killer)
 			elseif getElementType(killer) == 'vehicle' then
 				local driver = getVehicleOccupant(killer)
+
 				if driver and getElementType(driver) == 'player' then
 					killerID = getElemID(driver)
 				end
 			end
 		end
+
 		setPlayerState(source, PLAYER_STATE_WASTED)
 		procCallOnAll('OnPlayerDeath', playerID, killerID, weapon)
+
 		if g_Players[playerID].returntoclasssel then
 			g_Players[playerID].returntoclasssel = nil
 			--setTimer(putPlayerInClassSelection, 3000, 1, source)
@@ -455,9 +483,13 @@ addEventHandler('onResourceStart', resourceRoot,
 function checkAndUpdatePlayerStates()
 	for i, data in pairs(g_Players) do
 		local state = getPlayerState(data.elem)
-		if (state == PLAYER_STATE_DRIVER or state == PLAYER_STATE_PASSENGER) or 
-			(state == PLAYER_STATE_SPAWNED or state == PLAYER_STATE_NONE) then
+		if state == PLAYER_STATE_SPAWNED or state == PLAYER_STATE_NONE then
+			if not data.doingclasssel and not data.viewingintro then
+				handlePlayerSpawn(data.elem)
+			end
+		elseif state == PLAYER_STATE_DRIVER or state == PLAYER_STATE_PASSENGER then
 			if not isPedInVehicle(data.elem) then
+				setCameraTarget(data.elem, data.elem)
 				setPlayerState(data.elem, PLAYER_STATE_ONFOOT)
 				setElementCollisionsEnabled(data.elem, true)
 				setElementAlpha(data.elem, 255)
@@ -480,22 +512,23 @@ function respawnStaticVehicle(vehicle)
 	if not isElement(vehicle) then
 		return false
 	end
+
 	local vehID = getElemID(vehicle)
 	if not g_Vehicles[vehID] then
 		return false
 	end
+
 	if isTimer(g_Vehicles[vehID].respawntimer) then
 		killTimer(g_Vehicles[vehID].respawntimer)
 	end
-	local numPassengers = tonumber(getVehicleMaxPassengers(vehicle)) or 0
-	for seat = 0, numPassengers do
-		local player = getVehicleOccupant(vehicle, seat)
-		if player then
-			removePedFromVehicle(player)
-		end
+
+	for seat, player in pairs(getVehicleOccupants(vehicle)) do
+		removePedFromVehicle(player)
 	end
+
 	g_Vehicles[vehID].respawntimer = nil
 	g_Vehicles[vehID].vehicleIsAlive = true
+
 	local spawninfo = g_Vehicles[vehID].spawninfo
 	setTimer(
 		function()
@@ -509,17 +542,18 @@ end
 addEventHandler('onVehicleEnter', root,
 	function(player, seat, jacked)
 		local vehID = getElemID(source)
+
 		if isPed(player) then
 			local botID = getElemID(player)
 			g_Bots[botID].vehicle = source
 			setBotState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
-			return
+		else
+			local playerID = getElemID(player)
+			g_Players[playerID].vehicle = source
+			setPlayerState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
+			g_Players[playerID].specialaction = SPECIAL_ACTION_NONE
 		end
 
-		local playerID = getElemID(player)
-		g_Players[playerID].vehicle = source
-		setPlayerState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
-
 		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
 			killTimer(g_Vehicles[vehID].respawntimer)
 			g_Vehicles[vehID].respawntimer = nil
@@ -548,44 +582,34 @@ addEventHandler('onVehicleStartEnter', root,
 		if isPed(player) then
 			local botID = getElemID(player)
 			procCallOnAll('OnBotEnterVehicle', botID, vehID, seat ~= 0 and 1 or 0)
-			return
+		else
+			local playerID = getElemID(player)
+			procCallOnAll('OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
 		end
-
-		local playerID = getElemID(player)
-		procCallOnAll('OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
 	end
 )
 
 addEventHandler('onVehicleExit', root,
 	function(player, seat, jacker)
 		local vehID = getElemID(source)
+
 		if isPed(player) then
 			local botID = getElemID(player)
 			g_Bots[botID].vehicle = nil
 			setBotState(player, PLAYER_STATE_ONFOOT)
-
-			if g_RCVehicles[getElementModel(source)] then
-				setElementCollisionsEnabled(player, true)
-				setElementAlpha(player, 255)
-			end
-			return
+		else
+			local playerID = getElemID(player)
+			g_Players[playerID].vehicle = nil
+			setPlayerState(player, PLAYER_STATE_ONFOOT)
 		end
 
-		local playerID = getElemID(player)
-		g_Players[playerID].vehicle = nil
-		setPlayerState(player, PLAYER_STATE_ONFOOT)
-
 		if g_RCVehicles[getElementModel(source)] then
 			setElementCollisionsEnabled(player, true)
 			setElementAlpha(player, 255)
 		end
 
-		local numPassengers = tonumber(getVehicleMaxPassengers(source)) or 0
-		for i = 0, numPassengers do
-			if getVehicleOccupant(source, i) then
-				return
-			end
-		end
+		local _, occupant = next(getVehicleOccupants(source))
+		if occupant then return end
 
 		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
 			killTimer(g_Vehicles[vehID].respawntimer)
@@ -610,21 +634,20 @@ addEventHandler('onVehicleStartExit', root,
 		if isPed(player) then
 			local botID = getElemID(player)
 			procCallOnAll('OnBotExitVehicle', botID, vehID)
-			return
+		else
+			local playerID = getElemID(player)
+			procCallOnAll('OnPlayerExitVehicle', playerID, vehID)
 		end
-
-		local playerID = getElemID(player)
-		procCallOnAll('OnPlayerExitVehicle', playerID, vehID)
 	end
 )
 
 addEventHandler('onVehicleExplode', root,
-	function()
+	function(withExplosion, player)
 		local vehID = getElemID(source)
 
 		-- So the OnVehicleDeath event only gets called once
 		if g_Vehicles[vehID] and g_Vehicles[vehID].vehicleIsAlive then
-			procCallOnAll('OnVehicleDeath', vehID, getElemID(client))
+			procCallOnAll('OnVehicleDeath', vehID, getElemID(player))
 
 			if g_Vehicles[vehID].respawntimer then
 				killTimer(g_Vehicles[vehID].respawntimer)
@@ -637,18 +660,11 @@ addEventHandler('onVehicleExplode', root,
 	end
 )
 
-addEvent('OnVehicleDamageStatusUpdate_Ev', true)
-addEventHandler('OnVehicleDamageStatusUpdate_Ev', root,
-	function(vehicle)
-		local vehID = getElemID(vehicle)
-		if not vehID then return end
-
-		procCallOnAll('OnVehicleDamageStatusUpdate', vehID, getElemID(client))
-	end
-)
-
 local _getPedOccupiedVehicle = getPedOccupiedVehicle
 function getPedOccupiedVehicle(player)
+	if not player then
+		return false
+	end
 	if getElementType(player) ~= 'player' then
 		return _getPedOccupiedVehicle(player)
 	end
@@ -658,8 +674,11 @@ end
 
 local _removePedFromVehicle = removePedFromVehicle
 function removePedFromVehicle(player)
+	if not player then
+		return false
+	end
 	local playerdata = g_Players[getElemID(player)]
-	if not playerdata.vehicle then
+	if getElementType(player) ~= 'player' or not playerdata.vehicle then
 		return _removePedFromVehicle(player)
 	end
 	playerdata.vehicle = nil
@@ -705,17 +724,20 @@ addEventHandler('onPedWasted', root,
 	function(totalAmmo, killer, killerWeapon, bodypart)
 		if isPed(source) ~= true then return end
 		if getElementData(source, 'ActorPed') then return end
+
 		local killerID = INVALID_PLAYER_ID
 		if isElement(killer) then
 			if getElementType(killer) == 'player' then
 				killerID = getElemID(killer)
 			elseif getElementType(killer) == 'vehicle' then
 				local driver = getVehicleOccupant(killer)
+
 				if driver and getElementType(driver) == 'player' then
 					killerID = getElemID(driver)
 				end
 			end
 		end
+
 		setBotState(source, PLAYER_STATE_WASTED)
 		procCallOnAll('OnBotDeath', getElemID(source), killerID, killerWeapon, bodypart)
 	end
@@ -737,17 +759,17 @@ addEventHandler('OnPlayerWeaponShot_Ev', root,
 		playerData.shotVect.hY = hitY
 		playerData.shotVect.hZ = hitZ
 
-		procCallOnAll('OnPlayerWeaponShot', playerID, weapon, hitType, hitId, offsetX, offsetY, offsetZ)
+		procCallOnAll('OnPlayerWeaponShot', playerID, weapon, hitType, hitId, float2cell(offsetX), float2cell(offsetY), float2cell(offsetZ))
 	end
 )
 
 addEvent('OnPlayerGiveDamageActor_Ev', true)
 addEventHandler('OnPlayerGiveDamageActor_Ev', root,
 	function(actor, loss, weapon, bodypart)
-		if not actor or getElementData(actor, 'Invulnerable') then return end
-
 		local playerID, actorID = getElemID(source), getElemID(actor)
-		setTimer(procCallOnAll, 10, 1, 'OnPlayerGiveDamageActor', playerID, actorID, float2cell(loss), weapon, bodypart)
+		if not actorID then return end
+
+		setTimer(procCallOnAll, 1, 1, 'OnPlayerGiveDamageActor', playerID, actorID, float2cell(loss), weapon, bodypart)
 		-- This needs to be just a bit delayed to arrive after OnPlayerWeaponShot
 	end
 )
@@ -755,7 +777,10 @@ addEventHandler('OnPlayerGiveDamageActor_Ev', root,
 addEvent('OnPlayerPickUpPickup_Ev', true)
 addEventHandler('OnPlayerPickUpPickup_Ev', root,
 	function(pickup)
-		procCallOnAll('OnPlayerPickUpPickup', getElemID(source), getElemID(pickup))
+		local playerID, pickupID = getElemID(source), getElemID(pickup)
+		if not pickupID then return end
+
+		procCallOnAll('OnPlayerPickUpPickup', playerID, pickupID)
 
 		local model = getElementModel(pickup)
 		if model == 370 then
@@ -765,6 +790,15 @@ addEventHandler('OnPlayerPickUpPickup_Ev', root,
 	end
 )
 
+addEvent('OnPlayerClickMap_Ev', true)
+addEventHandler('OnPlayerClickMap_Ev', root,
+	function(clickX, clickY, clickZ)
+		local playerID = getElemID(source)
+
+		procCallOnAll('OnPlayerClickMap', playerID, float2cell(clickX), float2cell(clickY), float2cell(clickZ))
+	end
+)
+
 addEventHandler('onConsole', root,
 	function(cmd)
 		cmd = '/' .. cmd:gsub('^([^%s]*)', g_CommandMapping)
@@ -778,22 +812,23 @@ addEventHandler('onPlayerClick', root,
 		local iButton, iState, elemID = nil, nil, nil
 		local playerID = getElemID(source)
 		if elem ~= nil then elemID = getElemID(elem) end
+
 		if mouseButton == 'left' then iButton = 0 end
 		if mouseButton == 'middle' then iButton = 1 end
 		if mouseButton == 'right' then iButton = 2 end
 		if buttonState == 'up' then iState = 0 end
 		if buttonState == 'down' then iState = 1 end
 
-		procCallOnAll('OnPlayerClickWorld', playerID, iButton, iState, worldPosX, worldPosY, worldPosZ)
+		procCallOnAll('OnPlayerClickWorld', playerID, iButton, iState, float2cell(worldPosX), float2cell(worldPosY), float2cell(worldPosZ))
 		if elem == nil then return end
 		if getElementType(elem) == 'player' then
-			procCallOnAll('OnPlayerClickWorldPlayer', playerID, iButton, iState, elemID, worldPosX, worldPosY, worldPosZ)
+			procCallOnAll('OnPlayerClickWorldPlayer', playerID, iButton, iState, elemID, float2cell(worldPosX), float2cell(worldPosY), float2cell(worldPosZ))
 		end
 		if getElementType(elem) == 'object' then
-			procCallOnAll('OnPlayerClickWorldObject', playerID, iButton, iState, elemID, worldPosX, worldPosY, worldPosZ)
+			procCallOnAll('OnPlayerClickWorldObject', playerID, iButton, iState, elemID, float2cell(worldPosX), float2cell(worldPosY), float2cell(worldPosZ))
 		end
 		if getElementType(elem) == 'vehicle' then
-			procCallOnAll('OnPlayerClickWorldVehicle', playerID, iButton, iState, elemID, worldPosX, worldPosY, worldPosZ)
+			procCallOnAll('OnPlayerClickWorldVehicle', playerID, iButton, iState, elemID, float2cell(worldPosX), float2cell(worldPosY), float2cell(worldPosZ))
 		end
 
 	end
@@ -849,3 +884,10 @@ addEventHandler('onAmxClientVehicleStream', root,
 		end
 	end
 )
+
+-- depends on killmessages resource
+local function playerKillMessage(killer, weapon, bodypart)
+	-- disable adding kill messages automatically
+	cancelEvent()
+end
+addEventHandler('onPlayerKillMessage', root, playerKillMessage)
diff --git a/amx/server/natives/a_mta.lua b/amx/server/natives/a_mta.lua
index df8da9c..156068e 100644
--- a/amx/server/natives/a_mta.lua
+++ b/amx/server/natives/a_mta.lua
@@ -144,6 +144,14 @@ function SetPlayerBlurLevel(amx, player, level)
 	return setPlayerBlurLevel(player, level)
 end
 
+function IsPlayerMapForced(amx, player)
+	return isPlayerMapForced(player)
+end
+
+function ForcePlayerMap(amx, player, forceOn)
+	return forcePlayerMap(player, forceOn)
+end
+
 function FadePlayerCamera(amx, player, fadeIn, timeToFade, red, green, blue)
 	return fadeCamera(player, fadeIn, timeToFade, red, green, blue)
 end
@@ -224,9 +232,10 @@ function GetBotState(amx, bot)
 end
 
 function PutBotInVehicle(amx, bot, vehicle, seat)
-	if not warpPedIntoVehicle(bot, vehicle, seat) then
+	if not bot then
 		return false
 	end
+	warpPedIntoVehicle(bot, vehicle, seat)
 	if g_RCVehicles[getElementModel(vehicle)] then
 		setPedWeaponSlot(bot, 0)
 		setElementCollisionsEnabled(bot, false)
@@ -685,6 +694,19 @@ function SetGameSpeed(amx, speed)
 	return setGameSpeed(speed)
 end
 
+function GetRainLevel(amx)
+	local rainLvl = getRainLevel() or 0
+	return float2cell(rainLvl)
+end
+
+function SetRainLevel(amx, level)
+	return setRainLevel(level)
+end
+
+function ResetRainLevel(amx)
+	return resetRainLevel()
+end
+
 function GetSkyGradient(amx, refTopRed, refTopGreen, refTopBlue, refBtmRed, refBtmGreen, refBtmBlue)
 	local topRed, topGreen, topBlue, btmRed, btmGreen, btmBlue = getSkyGradient()
 
@@ -706,6 +728,19 @@ function ResetSkyGradient(amx)
 	return resetSkyGradient()
 end
 
+function GetFogDistance(amx)
+	local fogDist = getFogDistance() or 0
+	return float2cell(fogDist)
+end
+
+function SetFogDistance(amx, distance)
+	return setFogDistance(distance)
+end
+
+function ResetFogDistance(amx)
+	return resetFogDistance()
+end
+
 function GetCloudsEnabled(amx)
 	return getCloudsEnabled()
 end
@@ -714,6 +749,10 @@ function SetCloudsEnabled(amx, enable)
 	return setCloudsEnabled(enable)
 end
 
+function SetWeatherBlended(amx, weather)
+	return setWeatherBlended(weather)
+end
+
 function GetInteriorSoundsEnabled(amx)
 	return getInteriorSoundsEnabled()
 end
@@ -722,6 +761,14 @@ function SetInteriorSoundsEnabled(amx, enable)
 	return setInteriorSoundsEnabled(enable)
 end
 
+function GetOcclusionsEnabled(amx)
+	return getOcclusionsEnabled()
+end
+
+function SetOcclusionsEnabled(amx, enable)
+	return setOcclusionsEnabled(enable)
+end
+
 function IsGarageOpen(amx, garage)
 	return isGarageOpen(garage)
 end
@@ -762,6 +809,10 @@ function SetJetpackMaxHeight(amx, height)
 	return setJetpackMaxHeight(height)
 end
 
+function GetWeaponSlot(amx, weapon)
+	return getSlotFromWeapon(weapon) or -1
+end
+
 function GetFPSLimit(amx)
 	return getFPSLimit()
 end
@@ -810,10 +861,10 @@ function AddScoreBoardColumn(amx, column)
 	return exports.scoreboard:scoreboardAddColumn(column)
 end
 
-function SetPlayerScoreBoardData(amx, player, column, data)
+function SetPlayerScoreBoardData(amx, player, column, value)
 	local scoreboard = getResourceFromName('scoreboard')
 	if getResourceState(scoreboard) ~= 'running' then return false end
-	return setElementData(player, column, data)
+	return setElementData(player, column, value)
 end
 
 function RemoveScoreBoardColumn(amx, column)
@@ -834,10 +885,6 @@ function RemoveEventHandler(amx, func)
 	g_Events[func] = nil
 end
 
-function AttachElementToElement(amx, elem, toelem, posX, posY, posZ, rotX, rotY, rotZ)
-	return attachElements(elem, toelem, posX, posY, posZ, rotX, rotY, rotZ)
-end
-
 function IsPluginLoaded(amx, pluginName)
 	return amxIsPluginLoaded(pluginName)
 end
\ No newline at end of file
diff --git a/amx/server/natives/a_players.lua b/amx/server/natives/a_players.lua
index 34c707e..c48edce 100644
--- a/amx/server/natives/a_players.lua
+++ b/amx/server/natives/a_players.lua
@@ -466,10 +466,10 @@ function EditAttachedObject(amx, player, index)
 end
 
 function CreatePlayerTextDraw(amx, player, x, y, text)
-	outputDebugString('CreatePlayerTextDraw called with args ' .. x .. ' ' .. y .. ' ' .. text)
+	--outputDebugString('CreatePlayerTextDraw called with args ' .. x .. ' ' .. y .. ' ' .. text)
 
 	if (not g_PlayerTextDraws[player]) then -- Create dimension if it doesn't exist
-		outputDebugString('Created dimension for g_PlayerTextDraws[player]')
+		--outputDebugString('Created dimension for g_PlayerTextDraws[player]')
 		g_PlayerTextDraws[player] = {}
 	end
 
@@ -508,7 +508,7 @@ function CreatePlayerTextDraw(amx, player, x, y, text)
 		}
 	)
 
-	outputDebugString('assigned id s->' .. serverTDId .. ' c->' .. clientTDId .. ' to g_PlayerTextDraws[player]')
+	--outputDebugString('assigned id s->' .. serverTDId .. ' c->' .. clientTDId .. ' to g_PlayerTextDraws[player]')
 	clientCall(player, 'TextDrawCreate', clientTDId, table.deshadowize(textdraw, true))
 	return serverTDId
 end
@@ -517,7 +517,7 @@ function PlayerTextDrawDestroy(amx, player, textdrawID)
 	if not IsPlayerTextDrawValid(player, textdrawID) then
 		return false
 	end
-	outputDebugString('Sending textdraw id s->' .. g_PlayerTextDraws[player][textdrawID].serverTDId .. ' c->' .. g_PlayerTextDraws[player][textdrawID].clientTDId .. ' for destruction')
+	--outputDebugString('Sending textdraw id s->' .. g_PlayerTextDraws[player][textdrawID].serverTDId .. ' c->' .. g_PlayerTextDraws[player][textdrawID].clientTDId .. ' for destruction')
 	clientCall(player, 'TextDrawDestroy', g_PlayerTextDraws[player][textdrawID].clientTDId)
 	g_PlayerTextDraws[player][textdrawID] = nil
 	return true
@@ -759,9 +759,10 @@ function SetPlayerChatBubble(amx, player, text, color, dist, exptime)
 end
 
 function PutPlayerInVehicle(amx, player, vehicle, seat)
-	if not warpPedIntoVehicle(player, vehicle, seat) then
+	if not player then
 		return false
 	end
+	warpPedIntoVehicle(player, vehicle, seat)
 	if g_RCVehicles[getElementModel(vehicle)] then
 		setPedWeaponSlot(player, 0)
 		setElementCollisionsEnabled(player, false)
@@ -806,12 +807,18 @@ function RemovePlayerFromVehicle(amx, player)
 end
 
 function TogglePlayerControllable(amx, player, enable)
+	if not enable then
+		local vehicle = getPedOccupiedVehicle(player)
+		if vehicle then setElementVelocity(vehicle, 0.0, 0.0, 0.0) end
+	end
+
+	setElementFrozen(player, not enable)
 	return toggleAllControls(player, enable, true, false)
 end
 
-function PlayerPlaySound(amx, player, soundID, x, y, z)
-	notImplemented('PlayerPlaySound')
-	return false
+function PlayerPlaySound(amx, player, soundID, posX, posY, posZ)
+	clientCall(player, 'PlayerPlaySound', soundID, posX, posY, posZ)
+	return true
 end
 
 function ApplyAnimation(amx, player, animlib, animname, fDelta, loop, lockx, locky, freeze, time, forcesync)
@@ -826,6 +833,7 @@ end
 
 function ClearAnimations(amx, player, forcesync)
 	removePedFromVehicle(player)
+	setPedWearingJetpack(player, false)
 	setPedAnimation(player, false)
 	g_Players[getElemID(player)].specialaction = SPECIAL_ACTION_NONE
 	return true
@@ -856,25 +864,50 @@ end
 function GetPlayerSpecialAction(amx, player)
 	if not player then
 		return SPECIAL_ACTION_NONE
+	elseif isPedDucked(player) then
+		return SPECIAL_ACTION_DUCK
 	elseif isPedWearingJetpack(player) then
 		return SPECIAL_ACTION_USEJETPACK
-	else
-		return g_Players[getElemID(player)].specialaction or SPECIAL_ACTION_NONE
 	end
+
+	local playerdata = g_Players[getElemID(player)]
+	return playerdata.specialaction or SPECIAL_ACTION_NONE
 end
 
 function SetPlayerSpecialAction(amx, player, actionID)
-	if not player then
-		return false
-	elseif actionID == SPECIAL_ACTION_NONE then
+	if not player then return false end
+	local playerdata = g_Players[getElemID(player)]
+
+	if actionID == SPECIAL_ACTION_NONE then
+		if playerdata.specialaction == SPECIAL_ACTION_USECELLPHONE then
+			-- stop using cellphone properly
+			actionID = SPECIAL_ACTION_STOPUSECELLPHONE
+			playerdata.specialaction = SPECIAL_ACTION_STOPUSECELLPHONE
+			return setPedAnimation(player, unpack(g_SpecialActions[actionID]))
+		end
 		setPedWearingJetpack(player, false)
-		setPedAnimation(player, false)
 	elseif actionID == SPECIAL_ACTION_USEJETPACK then
-		setPedWearingJetpack(player, true)
-	elseif g_SpecialActions[actionID] then
-		setPedAnimation(player, unpack(g_SpecialActions[actionID]))
+		return setPedWearingJetpack(player, true)
+	elseif actionID >= SPECIAL_ACTION_DANCE1 and actionID <= SPECIAL_ACTION_PISSING then
+		-- special actions won't be applied in vehicle
+		if isPedInVehicle(player) then return false end
+	end
+
+	-- won't stop using cellphone if there's no cellphone
+	if actionID == SPECIAL_ACTION_STOPUSECELLPHONE then
+		if playerdata.specialaction ~= SPECIAL_ACTION_USECELLPHONE then return false end
 	end
-	g_Players[getElemID(player)].specialaction = actionID
+
+	-- player should hold a drink in hands instead of any weapon
+	if actionID >= SPECIAL_ACTION_DRINK_BEER and actionID <= SPECIAL_ACTION_DRINK_SPRUNK then
+		setPedWeaponSlot(player, 0)
+	end
+
+	-- if special action cannot be set or it's invalid
+	if not g_SpecialActions[actionID] then return false end
+
+	setPedAnimation(player, unpack(g_SpecialActions[actionID]))
+	playerdata.specialaction = actionID
 	return true
 end
 
@@ -911,7 +944,7 @@ end
 -- SetPlayerMarkerForPlayer client
 
 function ShowPlayerNameTagForPlayer(amx, player, playerToShow, show)
-	clientCall(player, 'setPlayerNametagShowing', playerToShow, show)
+	clientCall(player, 'updateNameTagShowing', playerToShow, show)
 	return true
 end
 
@@ -968,10 +1001,23 @@ function GetPlayerCameraFrontVector(amx, player, refX, refY, refZ)
 	if not player then
 		return false
 	end
+
 	local x, y, z, lx, ly, lz = getCameraMatrix(player)
-	writeMemFloat(amx, refX, lx - x)
-	writeMemFloat(amx, refY, ly - y)
-	writeMemFloat(amx, refZ, lz - z)
+	local vx, vy, vz = 0.0, 0.0, 0.0
+
+	if x and lx then
+		vx = lx - x
+	end
+	if y and ly then
+		vy = ly - y
+	end
+	if z and lz then
+		vz = lz - z
+	end
+
+	writeMemFloat(amx, refX, vx)
+	writeMemFloat(amx, refY, vy)
+	writeMemFloat(amx, refZ, vz)
 	return true
 end
 
@@ -1078,28 +1124,34 @@ function EnableStuntBonusForPlayer(amx, player, enable)
 end
 
 function TogglePlayerSpectating(amx, player, enable)
+	local playerdata = g_Players[getElemID(player)]
 	if enable then
 		fadeCamera(player, true)
 		setCameraMatrix(player, 75.461357116699, 64.600051879883, 51.685581207275, 149.75857543945, 131.53228759766, 40.597320556641)
-		toggleAllControls(player, false, true, false) -- will be re-enabled in spawn event
+		-- controls, alpha, collisions and blip will be re-enabled on spawn
+		toggleAllControls(player, false, true, false)
 		setPedWeaponSlot(player, 0)
 		setElementAlpha(player, 0)
 		setElementCollisionsEnabled(player, false)
 		setPlayerHudComponentVisible(player, 'radar', false)
 		setPlayerState(player, PLAYER_STATE_SPECTATING)
+		if playerdata.blip then
+			setElementVisibleTo(playerdata.blip, root, false)
+		end
 	else
-		local playerdata = g_Players[getElemID(player)]
-		local spawninfo = playerdata.spawninfo or (g_PlayerClasses and g_PlayerClasses[playerdata.selectedclass])
 		if playerdata.returntoclasssel then
 			playerdata.returntoclasssel = nil
-			putPlayerInClassSelection(player)
+			if procCallOnAll('OnPlayerRequestClass', getElemID(player), 0) then
+				putPlayerInClassSelection(player)
+			else
+				outputDebugString('Not allowed to select a class', 1)
+			end
 		else
 			spawnPlayerBySelectedClass(player)
 			setPlayerHudComponentVisible(player, 'radar', true)
 		end
-		setPlayerState(player, PLAYER_STATE_NONE)
-		setElementAlpha(player, 255)
 		setCameraTarget(player, player)
+		setPlayerState(player, PLAYER_STATE_SPAWNED)
 		clientCall(player, 'setCameraTarget', player) -- Clear the one on the client as well, otherwise we can't go back to normal camera after spectating vehicles
 		-- In SA-MP calling TogglePlayerSpectating also unsets camera interpolation
 		clientCall(player, 'removeCamHandlers')
diff --git a/amx/server/natives/a_samp.lua b/amx/server/natives/a_samp.lua
index 2a01438..9479193 100644
--- a/amx/server/natives/a_samp.lua
+++ b/amx/server/natives/a_samp.lua
@@ -52,12 +52,45 @@ function SendPlayerMessageToPlayer(amx, playerTo, playerFrom, message)
 	return outputChatBox(getPlayerName(playerFrom) .. ' ' .. message, playerTo, 255, 255, 255, true)
 end
 
-function SendDeathMessage(amx, killer, victim, reason)
-	-- no implementation needed, killmessages resource shows kills already
+function SendDeathMessage(amx, killerID, victim, reason)
+	local killmessages = getResourceFromName('killmessages')
+	if not killmessages or getResourceState(killmessages) ~= 'running' then
+		return false
+	end
+
+	if isElement(victim) and getElementType(victim) == 'player' then
+		local killer = g_Players[killerID] and g_Players[killerID].elem or nil
+
+		local pR, pG, pB = getPlayerNametagColor(victim)
+		local kR, kG, kB = 255, 255, 255
+		if isElement(killer) then
+			kR, kG, kB = getPlayerNametagColor(killer)
+		end
+
+		triggerClientEvent(root, 'onClientPlayerKillMessage', victim, killer, reason, pR, pG, pB, kR, kG, kB)
+	end
+	return true
 end
 
-function SendDeathMessageToPlayer(amx, player, killer, victim, reason)
-	-- no implementation needed, killmessages resource shows kills already
+function SendDeathMessageToPlayer(amx, player, killerID, victim, reason)
+	local killmessages = getResourceFromName('killmessages')
+	if not killmessages or getResourceState(killmessages) ~= 'running' then
+		return false
+	end
+
+	if not player then return false end
+	if isElement(victim) and getElementType(victim) == 'player' then
+		local killer = g_Players[killerID] and g_Players[killerID].elem or nil
+
+		local pR, pG, pB = getPlayerNametagColor(victim)
+		local kR, kG, kB = 255, 255, 255
+		if isElement(killer) then
+			kR, kG, kB = getPlayerNametagColor(killer)
+		end
+
+		triggerClientEvent(player, 'onClientPlayerKillMessage', victim, killer, reason, pR, pG, pB, kR, kG, kB)
+	end
+	return true
 end
 
 function GameTextForAll(amx, str, time, style)
@@ -400,7 +433,8 @@ function DestroyPickup(amx, pickup)
 end
 
 function ShowNameTags(amx, show)
-	table.each(g_Players, 'elem', setPlayerNametagShowing, show)
+	g_ShowNameTags = show
+	clientCall(root, 'updateNameTagGlobals', {status = show})
 	return true
 end
 
@@ -413,10 +447,16 @@ function ShowPlayerMarkers(amx, mode)
 end
 
 function GameModeExit(amx)
-	if getResourceState(getResourceFromName('mapcycler')) == 'running' then
+	local mapcycler = getResourceFromName('mapcycler')
+	local votemanager = getResourceFromName('votemanager')
+
+	if getResourceState(mapcycler) == 'running' then
 		triggerEvent('onRoundFinished', getResourceRootElement(getThisResource()))
-	else
+	elseif getResourceState(votemanager) == 'running' then
 		exports.votemanager:voteMap(getThisResource())
+	else
+		local amx = getRunningGameMode(mode)
+		if amx then unloadAMX(amx) end
 	end
 	return true
 end
@@ -522,17 +562,25 @@ function UsePlayerPedAnims(amx)
 end
 
 function DisableInteriorEnterExits(amx)
-	notImplemented('DisableInteriorEnterExits')
+	-- interiors resource implements enex markers
+	local interiors = getResourceFromName('interiors')
+
+	-- as we want to disable it, stop this resource
+	if getResourceState(interiors) == 'running' then
+		stopResource(interiors)
+	end
 	return true
 end
 
 function DisableNameTagLOS(amx)
-	notImplemented('DisableNameTagLOS')
+	g_NameTagsLOS = false
+	clientCall(root, 'updateNameTagGlobals', {los = false})
 	return true
 end
 
 function SetNameTagDrawDistance(amx, distance)
-	notImplemented('SetNameTagDrawDistance')
+	g_NameTagsRadius = distance
+	clientCall(root, 'updateNameTagGlobals', {radius = distance})
 	return true
 end
 
@@ -780,7 +828,7 @@ function GetPlayerMenu(amx, player)
 end
 
 function TextDrawCreate(amx, x, y, text)
-	outputDebugString('TextDrawCreate called with args ' .. x .. ' ' .. y .. ' ' .. text)
+	--outputDebugString('TextDrawCreate called with args ' .. x .. ' ' .. y .. ' ' .. text)
 	local textdraw = { x = x, y = y, shadow = {align = 1, text = text, font = 1, lwidth = 0.5, lheight = 0.5} }
 	textdraw.clientTDId = #g_TextDraws + 1
 	local id = table.insert(g_TextDraws, textdraw)
diff --git a/amx/server/natives/a_vehicles.lua b/amx/server/natives/a_vehicles.lua
index 0f08b59..f0d3106 100644
--- a/amx/server/natives/a_vehicles.lua
+++ b/amx/server/natives/a_vehicles.lua
@@ -221,15 +221,15 @@ function GetVehicleModelInfo(amx, model, type, refX, refY, refZ)
 	end
 
 	local offsets = {
-		[1] = {start = 1,  count = 3},  -- VEHICLE_MODEL_INFO_SIZE
-		[2] = {start = 4,  count = 3},  -- VEHICLE_MODEL_INFO_FRONTSEAT
-		[3] = {start = 7,  count = 3},  -- VEHICLE_MODEL_INFO_REARSEAT
-		[4] = {start = 10, count = 3},  -- VEHICLE_MODEL_INFO_PETROLCAP
-		[5] = {start = 13, count = 3},  -- VEHICLE_MODEL_INFO_WHEELSFRONT
-		[6] = {start = 16, count = 3},  -- VEHICLE_MODEL_INFO_WHEELSREAR
-		[7] = {start = 19, count = 3},  -- VEHICLE_MODEL_INFO_WHEELSMID
-		[8] = {start = 22, count = 1},  -- VEHICLE_MODEL_INFO_FRONT_BUMPER_Z
-		[9] = {start = 25, count = 1}   -- VEHICLE_MODEL_INFO_REAR_BUMPER_Z
+		[1] = { start = 1,  count = 3 },  -- VEHICLE_MODEL_INFO_SIZE
+		[2] = { start = 4,  count = 3 },  -- VEHICLE_MODEL_INFO_FRONTSEAT
+		[3] = { start = 7,  count = 3 },  -- VEHICLE_MODEL_INFO_REARSEAT
+		[4] = { start = 10, count = 3 },  -- VEHICLE_MODEL_INFO_PETROLCAP
+		[5] = { start = 13, count = 3 },  -- VEHICLE_MODEL_INFO_WHEELSFRONT
+		[6] = { start = 16, count = 3 },  -- VEHICLE_MODEL_INFO_WHEELSREAR
+		[7] = { start = 19, count = 3 },  -- VEHICLE_MODEL_INFO_WHEELSMID
+		[8] = { start = 22, count = 1 },  -- VEHICLE_MODEL_INFO_FRONT_BUMPER_Z
+		[9] = { start = 25, count = 1 }   -- VEHICLE_MODEL_INFO_REAR_BUMPER_Z
 	}
 
 	local spec = offsets[type]
diff --git a/amx/server/syscalls.lua b/amx/server/syscalls.lua
index fc58357..98b5856 100644
--- a/amx/server/syscalls.lua
+++ b/amx/server/syscalls.lua
@@ -213,8 +213,10 @@ g_SAMPSyscallPrototypes = {
 	DestroyPlayerObject = {'p', 'i'},
 	DestroyVehicle = {'v'},
 	DetachTrailerFromVehicle = {'v'},
+	DisableInteriorEnterExits = {},
 	DisableMenu = {'i'},
 	DisableMenuRow = {'i', 'i'},
+	DisableNameTagLOS = {},
 	DisablePlayerCheckpoint = {'p'},
 	DisablePlayerRaceCheckpoint = {'p'},
 
@@ -361,6 +363,7 @@ g_SAMPSyscallPrototypes = {
 	MovePlayerObject = {'p', 'i', 'f', 'f', 'f', 'f', 'f', 'f', 'f'},
 
 	PlayAudioStreamForPlayer = {'p', 's', 'f', 'f', 'f', 'f', 'b'},
+	PlayerPlaySound = {'p', 'i', 'f', 'f', 'f'},
 	PlayerSpectatePlayer = {'p', 'p', 'i'},
 	PlayerSpectateVehicle = {'p', 'v', 'i'},
 	PutPlayerInVehicle = {'p', 'v', 'i'},
@@ -376,8 +379,8 @@ g_SAMPSyscallPrototypes = {
 
 	SendClientMessage = {'p', 'c', 's'},
 	SendClientMessageToAll = {'c', 's'},
-	SendDeathMessage = {'p', 'p', 'i'},
-	SendDeathMessageToPlayer = {'p', 'p', 'p', 'i'},
+	SendDeathMessage = {'i', 'p', 'i'},
+	SendDeathMessageToPlayer = {'p', 'i', 'p', 'i'},
 	SendPlayerMessageToAll = {'p', 's'},
 	SendPlayerMessageToPlayer = {'p', 'p', 's'},
 	SendRconCommand = {'s'},
@@ -387,6 +390,7 @@ g_SAMPSyscallPrototypes = {
 	SetGameModeText = {'s'},
 	SetGravity = {'f'},
 	SetMenuColumnHeader = {'m', 'i', 's'},
+	SetNameTagDrawDistance = {'f'},
 	SetObjectPos = {'o', 'f', 'f', 'f'},
 	SetObjectRot = {'o', 'f', 'f', 'f'},
 	SetPlayerAmmo = {'p', 'i', 'i'},
@@ -586,6 +590,8 @@ g_SAMPSyscallPrototypes = {
 	SetPlayerHeadless = {'p', 'b'},
 	GetPlayerBlurLevel = {'p'},
 	SetPlayerBlurLevel = {'p', 'i'},
+	IsPlayerMapForced = {'p'},
+	ForcePlayerMap = {'p', 'b'},
 	FadePlayerCamera = {'p', 'b', 'f', 'i', 'i', 'i'},
 	SetPlayerControlState = {'p', 's', 'b'},
 	IsPlayerCursorShowing = {'p'},
@@ -669,13 +675,22 @@ g_SAMPSyscallPrototypes = {
 	-- world
 	GetGameSpeed = {},
 	SetGameSpeed = {'f'},
+	GetRainLevel = {},
+	SetRainLevel = {'f'},
+	ResetRainLevel = {},
 	GetSkyGradient = {'r', 'r', 'r', 'r', 'r', 'r'},
 	SetSkyGradient = {'i', 'i', 'i', 'i', 'i', 'i'},
 	ResetSkyGradient = {},
+	GetFogDistance = {},
+	SetFogDistance = {'f'},
+	ResetFogDistance = {},
 	GetCloudsEnabled = {},
 	SetCloudsEnabled = {'b'},
+	SetWeatherBlended = {'i'},
 	GetInteriorSoundsEnabled = {},
 	SetInteriorSoundsEnabled = {'b'},
+	GetOcclusionsEnabled = {},
+	SetOcclusionsEnabled = {'b'},
 	IsGarageOpen = {'i'},
 	SetGarageOpen = {'i', 'b'},
 	IsGlitchEnabled = {'s'},
@@ -686,6 +701,7 @@ g_SAMPSyscallPrototypes = {
 	SetAircraftMaxHeight = {'f'},
 	GetJetpackMaxHeight = {},
 	SetJetpackMaxHeight = {'f'},
+	GetWeaponSlot = {'i'},
 	GetFPSLimit = {},
 	SetFPSLimit = {'i'},
 	GetRandomPlayer = {},
@@ -801,8 +817,6 @@ g_SAMPSyscallPrototypes = {
 	IsPlayerNPC = {'p'},
 	EnableStuntBonusForAll = {'b'},
 	EnableStuntBonusForPlayer = {'p', 'b'},
-	DisableNameTagLOS = {},
-	SetNameTagDrawDistance = {'f'},
 	SetObjectsDefaultCameraCol = {'b'},
 	SetPlayerChatBubble = {'p', 's', 'i', 'f', 'i'},
 	SetObjectMaterial = {'o', 'i', 'i', 's', 's', 'i'},
@@ -811,7 +825,6 @@ g_SAMPSyscallPrototypes = {
 	SetPlayerObjectMaterial = {'p', 'i', 'i', 'i', 's', 's', 'i'},
 	SetPlayerObjectMaterialText = {'p', 'i', 's', 'i', 'i', 's', 'i', 'b', 'i', 'i', 'i'},
 	SetPlayerObjectNoCameraCol = {'p', 'i'},
-	EditPlayerObject = {'p', 'i'},
 	TextDrawSetPreviewModel = {'x', 'i'},
 	TextDrawSetPreviewVehCol = {'x', 'i', 'i'},
 	TextDrawSetPreviewRot = {'x', 'f', 'f', 'f', 'f'},
@@ -825,7 +838,6 @@ g_SAMPSyscallPrototypes = {
 	GetVehicleRotationQuat = {'v', 'r', 'r', 'r', 'r'},
 	GetVehicleParamsCarWindows = {'v', 'r', 'r', 'r', 'r'},
 	SetVehicleParamsCarWindows = {'v', 'b', 'b', 'b', 'b'},
-	PlayerPlaySound = {'p', 'i', 'f', 'f', 'f'},
 	PlayCrimeReportForPlayer = {'p', 'i', 'i'},
 	SetPlayerShopName = {'p', 's'},
 	GetPlayerCameraMode = {'p'},
@@ -833,11 +845,11 @@ g_SAMPSyscallPrototypes = {
 	GetPlayerCameraZoom = {'p'},
 	EnableVehicleFriendlyFire = {},
 	DisableRemoteVehicleCollisions = {'p', 'b'},
-	DisableInteriorEnterExits = {},
 	SelectObject = {'p'},
 	CancelEdit = {'p'},
 	EditAttachedObject = {'p', 'i'},
 	EditObject = {'p', 'i'},
+	EditPlayerObject = {'p', 'i'},
 	SendClientCheck = {'p', 'i', 'i', 'i', 'i'},
 	StartRecordingPlayerData = {'p', 'i', 's'},
 	StopRecordingPlayerData = {'p'},
diff --git a/amx/server/util.lua b/amx/server/util.lua
index d80800f..4586a19 100644
--- a/amx/server/util.lua
+++ b/amx/server/util.lua
@@ -209,6 +209,7 @@ g_EventNames = {
 	OnPlayerClickWorldObject = true,
 	OnPlayerClickWorldVehicle = true,
 	OnPlayerClickPlayer = true,
+	OnPlayerClickMap = true,
 	OnObjectMoved = true,
 	OnPlayerObjectMoved = true,
 	OnBotConnect = true,
@@ -278,8 +279,19 @@ end
 local _warpPedIntoVehicle = warpPedIntoVehicle
 function warpPedIntoVehicle(player, vehicle, seat)
 	removePedFromVehicle(player)
-	g_Players[getElemID(player)].vehicle = vehicle
-	setTimer(_warpPedIntoVehicle, 500, 1, player, vehicle, seat)
+	setTimer(
+		function()
+			_warpPedIntoVehicle(player, vehicle, seat)
+			if getElementType(player) == 'player' then
+				setCameraTarget(player, player)
+				g_Players[getElemID(player)].vehicle = vehicle
+			else
+				g_Bots[getElemID(player)].vehicle = vehicle
+			end
+		end,
+		500,
+		1
+	)
 end
 
 local _bindKey = bindKey
@@ -455,6 +467,22 @@ function setBotState(bot, state)
 	end
 end
 
+function resetSpecialAction(player)
+	setPedWearingJetpack(player, false)
+
+	local playerdata = g_Players[getElemID(player)]
+	if not playerdata or not playerdata.specialaction then return end
+
+	if playerdata.specialaction == SPECIAL_ACTION_USECELLPHONE then
+		local actionID = SPECIAL_ACTION_STOPUSECELLPHONE
+		playerdata.specialaction = SPECIAL_ACTION_STOPUSECELLPHONE
+		setPedAnimation(player, unpack(g_SpecialActions[actionID]))
+	elseif playerdata.specialaction ~= SPECIAL_ACTION_STOPUSECELLPHONE then
+		playerdata.specialaction = SPECIAL_ACTION_NONE
+		setPedAnimation(player, false)
+	end
+end
+
 -- Clamping values
 function clamp(n, min, max)
 	return math.max(min, math.min(max, n))
diff --git a/amx/shared/sound_offset.lua b/amx/shared/sound_offset.lua
new file mode 100644
index 0000000..89124ea
--- /dev/null
+++ b/amx/shared/sound_offset.lua
@@ -0,0 +1,220 @@
+SFX_Offset = {
+	[1] = { first = 2000, last = 2163 },
+	[2] = { first = 2200, last = 2214 },
+	[3] = { first = 2400, last = 2404 },
+	[4] = { first = 2600, last = 2608 },
+	[5] = { first = 2800, last = 2813 },
+	[6] = { first = 3000, last = 3057 },
+	[7] = { first = 3200, last = 3201 },
+	[8] = { first = 3400, last = 3401 },
+	[9] = { first = 3600 },
+	[10] = { first = 3800 },
+	[11] = { first = 4000, last = 4001 },
+	[12] = { first = 4200, last = 4203 },
+	[13] = { first = 4400 },
+	[14] = { first = 4600, last = 4604 },
+	[15] = { first = 4800, last = 4807 },
+	[16] = { first = 5000, last = 5014 },
+	[17] = { first = 5200, last = 5206 },
+	[18] = { first = 5400, last = 5464 },
+	[19] = { first = 5600, last = 5602 },
+	[20] = { first = 5800, last = 5856 },
+	[21] = { first = 6000, last = 6003 },
+	[22] = { first = 6200, last = 6205 },
+	[23] = { first = 6400, last = 6402 },
+	[24] = { first = 6600, last = 6603 },
+	[25] = { first = 6800, last = 6802 },
+	[26] = { first = 7000, last = 7066 },
+	[27] = { first = 7200, last = 7239 },
+	[28] = { first = 7400, last = 7421 },
+	[29] = { first = 7600, last = 7612 },
+	[30] = { first = 7800, last = 7902 },
+	[31] = { first = 8000, last = 8017 },
+	[32] = { first = 8200, last = 8278 },
+	[33] = { first = 8400, last = 8412 },
+	[34] = { first = 8600, last = 8738 },
+	[35] = { first = 8800, last = 8840 },
+	[36] = { first = 9000, last = 9031 },
+	[37] = { first = 9200, last = 9201 },
+	[38] = { first = 9400, last = 9451 },
+	[39] = { first = 9600, last = 9676 },
+	[40] = { first = 9800, last = 9914 },
+	[41] = { first = 10000, last = 10015 },
+	[42] = { first = 10200, last = 10214 },
+	[43] = { first = 10400, last = 10409 },
+	[44] = { first = 10600, last = 10663 },
+	[45] = { first = 10800, last = 10832 },
+	[46] = { first = 11000, last = 11010 },
+	[47] = { first = 11200 },
+	[48] = { first = 11400, last = 11455 },
+	[49] = { first = 11600, last = 11655 },
+	[50] = { first = 11800, last = 11855 },
+	[51] = { first = 12000, last = 12055 },
+	[52] = { first = 12200, last = 12201 },
+	[53] = { first = 12400, last = 12411 },
+	[54] = { first = 12600, last = 12605 },
+	[55] = { first = 12800, last = 12832 },
+	[56] = { first = 13000, last = 13038 },
+	[57] = { first = 13200, last = 13216 },
+	[58] = { first = 13400, last = 13419 },
+	[59] = { first = 13600, last = 13646 },
+	[60] = { first = 13800, last = 13803 },
+	[61] = { first = 14000, last = 14041 },
+	[62] = { first = 14200 },
+	[63] = { first = 14400, last = 14410 },
+	[64] = { first = 14600 },
+	[65] = { first = 14800 },
+	[66] = { first = 15000, last = 15028 },
+	[67] = { first = 15200, last = 15258 },
+	[68] = { first = 15400, last = 15408 },
+	[69] = { first = 15600, last = 15603 },
+	[70] = { first = 15800, last = 15950 },
+	[71] = { first = 16000, last = 16018 },
+	[72] = { first = 16200 },
+	[73] = { first = 16400, last = 16504 },
+	[74] = { first = 16600, last = 16614 },
+	[75] = { first = 16800, last = 16803 },
+	[76] = { first = 17000, last = 17006 },
+	[77] = { first = 17200 },
+	[78] = { first = 17400, last = 17455 },
+	[79] = { first = 17600, last = 17622 },
+	[80] = { first = 17800, last = 17807 },
+	[81] = { first = 18000, last = 18025 },
+	[82] = { first = 18200, last = 18216 },
+	[83] = { first = 18400, last = 18434 },
+	[84] = { first = 18600, last = 18616 },
+	[85] = { first = 18800, last = 18807 },
+	[86] = { first = 19000, last = 19135 },
+	[87] = { first = 19200, last = 19219 },
+	[88] = { first = 19400, last = 19403 },
+	[89] = { first = 19600, last = 19604 },
+	[90] = { first = 19800 },
+	[91] = { first = 20000, last = 20072 },
+	[92] = { first = 20200, last = 20248 },
+	[93] = { first = 20400, last = 20424 },
+	[94] = { first = 20600 },
+	[95] = { first = 20800, last = 20804 },
+	[96] = { first = 21000, last = 21002 },
+	[97] = { first = 21200, last = 21207 },
+	[98] = { first = 21400, last = 21456 },
+	[99] = { first = 21600, last = 21666 },
+	[100] = { first = 21800, last = 21808 },
+	[101] = { first = 22000, last = 22039 },
+	[102] = { first = 22200, last = 22217 },
+	[103] = { first = 22400, last = 22406 },
+	[104] = { first = 22600 },
+	[105] = { first = 22800, last = 22839 },
+	[106] = { first = 23000 },
+	[107] = { first = 23200, last = 23209 },
+	[108] = { first = 23400 },
+	[109] = { first = 23600 },
+	[110] = { first = 23800, last = 23835 },
+	[111] = { first = 24000, last = 24063 },
+	[112] = { first = 24200, last = 24219 },
+	[113] = { first = 24400, last = 24433 },
+	[114] = { first = 24600 },
+	[115] = { first = 24800, last = 24829 },
+	[116] = { first = 25000, last = 25047 },
+	[117] = { first = 25200, last = 25319 },
+	[118] = { first = 25400, last = 25423 },
+	[119] = { first = 25600, last = 25604 },
+	[120] = { first = 25800, last = 25801 },
+	[121] = { first = 26000, last = 26009 },
+	[122] = { first = 26200, last = 26223 },
+	[123] = { first = 26400, last = 26412 },
+	[124] = { first = 26600, last = 26633 },
+	[125] = { first = 26800, last = 26811 },
+	[126] = { first = 27000, last = 27018 },
+	[127] = { first = 27200, last = 27205 },
+	[128] = { first = 27400, last = 27422 },
+	[129] = { first = 27600, last = 27621 },
+	[130] = { first = 27800, last = 27833 },
+	[131] = { first = 28000 },
+	[132] = { first = 28200, last = 28204 },
+	[133] = { first = 28400, last = 28427 },
+	[134] = { first = 28600, last = 28622 },
+	[135] = { first = 28800, last = 28811 },
+	[136] = { first = 29000, last = 29155 },
+	[137] = { first = 29200, last = 29217 },
+	[138] = { first = 29400, last = 29413 },
+	[139] = { first = 29600, last = 29665 },
+	[140] = { first = 29800, last = 29825 },
+	[141] = { first = 30000, last = 30082 },
+	[142] = { first = 30200, last = 30221 },
+	[143] = { first = 30400, last = 30416 },
+	[144] = { first = 30600 },
+	[145] = { first = 30800, last = 30803 },
+	[146] = { first = 31000, last = 31001 },
+	[147] = { first = 31200, last = 31205 },
+	[148] = { first = 31400 },
+	[149] = { first = 31600, last = 31605 },
+	[150] = { first = 31800, last = 31810 },
+	[151] = { first = 32000 },
+	[152] = { first = 32200, last = 32201 },
+	[153] = { first = 32400, last = 32402 },
+	[154] = { first = 32600 },
+	[155] = { first = 32800, last = 32847 },
+	[156] = { first = 33000, last = 33088 },
+	[157] = { first = 33200, last = 33304 },
+	[158] = { first = 33400, last = 33403 },
+	[159] = { first = 33600, last = 33676 },
+	[160] = { first = 33800, last = 33889 },
+	[161] = { first = 34000, last = 34067 },
+	[162] = { first = 34200, last = 34273 },
+	[163] = { first = 34400, last = 34415 },
+	[164] = { first = 34600, last = 34606 },
+	[165] = { first = 34800, last = 34831 },
+	[166] = { first = 35000, last = 35075 },
+	[167] = { first = 35200, last = 35240 },
+	[168] = { first = 35400, last = 35488 },
+	[169] = { first = 35600, last = 35733 },
+	[170] = { first = 35800, last = 35883 },
+	[171] = { first = 36000 },
+	[172] = { first = 36200, last = 36205 },
+	[173] = { first = 36400, last = 36401 },
+	[174] = { first = 36600, last = 36604 },
+	[175] = { first = 36800, last = 36860 },
+	[176] = { first = 37000, last = 37035 },
+	[177] = { first = 37200, last = 37245 },
+	[178] = { first = 37400, last = 37494 },
+	[179] = { first = 37600, last = 37681 },
+	[180] = { first = 37800, last = 37873 },
+	[181] = { first = 38000, last = 38060 },
+	[182] = { first = 38200, last = 38238 },
+	[183] = { first = 38400, last = 38471 },
+	[184] = { first = 38600, last = 38644 },
+	[185] = { first = 38800, last = 38854 },
+	[186] = { first = 39000, last = 39078 },
+	[187] = { first = 39200, last = 39223 },
+	[188] = { first = 39400, last = 39413 },
+	[189] = { first = 39600, last = 39667 },
+	[190] = { first = 39800, last = 39815 },
+	[191] = { first = 40000 },
+	[192] = { first = 40200, last = 40238 },
+	[193] = { first = 40400, last = 40408 },
+	[194] = { first = 40600 },
+	[195] = { first = 40800, last = 40820 },
+	[196] = { first = 41000, last = 41042 },
+	[197] = { first = 41200, last = 41272 },
+	[198] = { first = 41400, last = 41432 },
+	[199] = { first = 41600, last = 41604 },
+	[200] = { first = 41800 },
+	[201] = { first = 42000, last = 42011 },
+	[202] = { first = 42200, last = 42208 },
+	[203] = { first = 42400, last = 42424 },
+	[204] = { first = 42600, last = 42601 },
+	[205] = { first = 42800, last = 42803 },
+	[206] = { first = 43000, last = 43001 },
+	[207] = { first = 43200, last = 43206 },
+	[208] = { first = 43400, last = 43407 },
+	[209] = { first = 43600, last = 43664 },
+	[210] = { first = 43800, last = 43905 },
+	[211] = { first = 44000, last = 44107 },
+	[212] = { first = 44200, last = 44247 },
+	[213] = { first = 44400, last = 44444 },
+	[214] = { first = 44600, last = 44631 },
+	[215] = { first = 44800, last = 44820 },
+	[216] = { first = 45000, last = 45011 },
+	[217] = { first = 45200, last = 45255 },
+	[218] = { first = 45400 }
+}
\ No newline at end of file