diff --git a/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua b/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua
index abcd683..cd0373d 100644
--- a/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua
+++ b/beatrun/gamemodes/beatrun/entities/weapons/shapedrawer/shared.lua
@@ -83,7 +83,9 @@ function SWEP:SecondaryAttack()
 end
 
 hook.Add("PostDrawTranslucentRenderables", "ShapeGun", function()
-	local ply = Entity(1)
+	if not CLIENT then return end
+
+	local ply = LocalPlayer()
 	local wep = ply:GetActiveWeapon()
 	local isShapeDrawer = IsValid(wep) and wep:GetClass() == "shapedrawer"
 
diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
index b5a7ecd..22bcd7e 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/AddonWarning.lua
@@ -23,32 +23,31 @@ end
 local addons = 0
 
 local incompatible = {
-	["1581533176"] = true,
-	["2675972006"] = true,
-	["378401390"] = true,
-	["2027577882"] = true,
-	["1190705063"] = true,
-	["123514260"] = true,
-	["2416989205"] = true,
-	["2591814455"] = true,
-	["240159269"] = true,
-	["2230307188"] = true,
-	["2137973704"] = true,
-	["577145478"] = true,
-	["1632091428"] = true,
-	["1622199072"] = true,
-	["2840019616"] = true,
-	["583517911"] = true,
-	["2106330193"] = true,
-	["2593047682"] = true,
-	["142911907"] = true,
-	["2316713217"] = true,
-	["2052642961"] = true,
-	["2635378860"] = true,
-	["2919957168"] = true,
-	["104815552"] = true,
-	["779595105"] = true,
-	["2600234804"] = true
+	["1581533176"] = true, -- The Aperture [Reupload]
+	["2675972006"] = true, -- Custom Loadout
+	["378401390"] = true, -- Quake/Half-Life View bobbing
+	["2027577882"] = true, -- Mantle + Wallrun
+	["1190705063"] = true, -- Lerped View Models
+	["123514260"] = true, -- SharpeYe
+	["2416989205"] = true, -- Quick Slide
+	["2591814455"] = true, -- [PF] Half-Life: Alyx
+	["240159269"] = true, -- S.M.A.R.T.:Smooth Parkour Movement
+	["2230307188"] = true, -- EFT Walk Sounds (Footsteps)
+	["2137973704"] = true, -- [PF] Modern Warfare 2
+	["577145478"] = true, -- ViewMod
+	["1632091428"] = true, -- Fine Speed
+	["1622199072"] = true, -- SaVav Parkour Mod
+	["2840019616"] = true, -- cBobbing (Reupped & Fixed)
+	["583517911"] = true, -- Eye View Attachment
+	["2106330193"] = true, -- BSMod Punch SWEP + Kick & KillMoves
+	["2593047682"] = true, -- Viewpunch Viewbob
+	["142911907"] = true, -- Advanced Combat Rolls
+	["2316713217"] = true, -- Player Speeds Changer 2.0 [REUPLOAD]
+	["2052642961"] = true, -- SNPC Particle Resource Pack
+	["2635378860"] = true, -- MW/WZ Skydive/Parachute + Infil
+	["2919957168"] = true, -- Modern Warfare II - Takedowns & Revive System
+	["104815552"] = true, -- SmartSnap (how tho?)
+	["2600234804"] = true -- ASTW2 - Base Weapons
 }
 
 local warnpanel = {