diff --git a/season_halloween/scripting/season_halloween.sp b/season_halloween/scripting/season_halloween.sp
index e0b99e1f..e5d4baee 100644
--- a/season_halloween/scripting/season_halloween.sp
+++ b/season_halloween/scripting/season_halloween.sp
@@ -65,6 +65,7 @@ public void OnPluginStart()
 	HookEvent("round_start", OnRoundStart, EventHookMode_Post);
 
 	RegConsoleCmd("sm_pumpkins", Command_Collected, "Shows the total amount of Pumpkins you have collected so far");
+	RegConsoleCmd("sm_halloween", Command_Collected, "Shows the total amount of Pumpkins you have collected so far");
 	RegConsoleCmd("sm_highscore", Command_HighScore, "Shows the Pumpkin HighScore");
 
 	AutoExecConfig();
@@ -438,7 +439,7 @@ public void TQueryCBCollected(Handle owner, Handle rs, const char[] error, any d
 	if (g_iCollected[client] < g_hCVar_MilestoneGrenade.IntValue)
 		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}You need to collect {green}%d {white}more pumpkins to unlock {red}GRENADE SKINS{white}.", g_hCVar_MilestoneGrenade.IntValue - g_iCollected[client]);
 	if (g_iCollected[client] < g_hCVar_MilestoneSkin.IntValue)
-		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}You need to collect {green}%d {white}more pumpkins to unlock {red}XMAS PLAYER SKINS{white}.", g_hCVar_MilestoneSkin.IntValue - g_iCollected[client]);
+		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}You need to collect {green}%d {white}more pumpkins to unlock {red}HALLOWEEN PLAYER SKINS{white}.", g_hCVar_MilestoneSkin.IntValue - g_iCollected[client]);
 
 }
 
@@ -668,17 +669,19 @@ public void TQueryCBUpdate(Handle owner, Handle rs, const char[] error, any data
 		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}Congratulations! You have unlocked {red}GRENADE SKINS{white}!");
 
 	if (g_iCollected[client] == g_hCVar_MilestoneSkin.IntValue)
-		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}Congratulations! You have unlocked {red}XMAS SKINS{white}!");
+		CPrintToChat(client, "{darkorange}[UNLOZE HALLOWEEN] {white}Congratulations! You have unlocked {red}HALLOWEEN SKINS{white}!");
 }
 
 public void ZR_OnClientInfected(int client, int attacker, bool motherInfect, bool respawnOverride, bool respawn)
 {
+	if (!IsValidClient(attacker))
+		return;
+
 	if (g_hCVar_InfectionEffectEnabled.BoolValue && ((g_iCollected[client] >= g_hCVar_MilestoneInfection.IntValue) || g_iCollected[attacker] >= g_hCVar_MilestoneInfection.IntValue))
 	{
 		float fInfectionOrigin[3];
 		GetClientAbsOrigin(client, fInfectionOrigin);
 
-
 		// Rotating
 		int iRotating  = CreateEntityAtOrigin("func_rotating", fInfectionOrigin);
 		DispatchKeyFormat(iRotating, "targetname", 		"season_infection_rotating_%d", g_iCounter);