diff --git a/addons/sourcemod/scripting/surftimer/hooks.sp b/addons/sourcemod/scripting/surftimer/hooks.sp
index 62f7f34..3a04daa 100644
--- a/addons/sourcemod/scripting/surftimer/hooks.sp
+++ b/addons/sourcemod/scripting/surftimer/hooks.sp
@@ -95,8 +95,8 @@ public Action Event_OnPlayerSpawn(Handle event, const char[] name, bool dontBroa
 			g_WrcpStage[client] = 1;
 			g_Stage[0][client] = 1;
 			g_CurrentStage[client] = 1;
-            g_Stage[g_iClientInZone[client][2]][client] = 1;
-            g_bWrcpTimeractivated[client] = false;
+			g_Stage[g_iClientInZone[client][2]][client] = 1;
+			g_bWrcpTimeractivated[client] = false;
 		}
 
 		if (g_iCurrentStyle[client] == 4) // 4 low gravity
@@ -458,7 +458,8 @@ public Action Say_Hook(int client, const char[] command, int argc)
 		return Plugin_Handled;
 
 		// Chat Trigger?
-		if ((IsChatTrigger() && sText[0] == '/') || (sText[0] == '@' && (GetUserFlagBits(client) & ADMFLAG_ROOT || GetUserFlagBits(client) & ADMFLAG_GENERIC)))
+		if ((IsChatTrigger() && sText[0] == '/'))
+		//if ((IsChatTrigger() && sText[0] == '/') || (sText[0] == '@' && (GetUserFlagBits(client) & ADMFLAG_ROOT || GetUserFlagBits(client) & ADMFLAG_GENERIC)))
 		{
 			return Plugin_Continue;
 		}
diff --git a/addons/sourcemod/scripting/surftimer/timer.sp b/addons/sourcemod/scripting/surftimer/timer.sp
index e556485..035f031 100644
--- a/addons/sourcemod/scripting/surftimer/timer.sp
+++ b/addons/sourcemod/scripting/surftimer/timer.sp
@@ -176,6 +176,8 @@ public Action CKTimer2(Handle timer)
 				case 60:CPrintToChatAll("%t", "TimeleftSeconds", g_szChatPrefix, g_szMapName, timeleft);
 				case 30:CPrintToChatAll("%t", "TimeleftSeconds", g_szChatPrefix, g_szMapName, timeleft);
 				case 10:CPrintToChatAll("%t", "TimeleftSeconds", g_szChatPrefix, g_szMapName, timeleft);
+				//add ~~~MAP ENDING~~~ 
+				//maybe switch to 3,2,1,0 not 0,-1,-2,-3
 				case -3:
 				{
 					if (!g_bRoundEnd)
@@ -377,15 +379,17 @@ public Action SetClanTag(Handle timer, any client)
 			ReplaceString(tag, sizeof(tag), "{style}", szStyle);
 		}
 		else
-			ReplaceString(tag, sizeof(tag), "{style}", "");
+			ReplaceString(tag, sizeof(tag), "{style}", ""); 
 
-		char szTabRank[1024];
+		char szTabRank[1024], szTabClanTag[1024];
 		Format(szTabRank, 1024, "%s", g_pr_chat_coloredrank[client]);
 		CRemoveColors(szTabRank, 1024);
+		Format(szTabClanTag, 1024, "%s | %s", g_szCountryCode[client], szTabRank); //temp. disabled due to 
 
-		CS_SetClientClanTag(client, szTabRank);
+		if ((GetUserFlagBits(client) & ADMFLAG_ROOT || GetUserFlagBits(client) & ADMFLAG_GENERIC)) CS_SetClientClanTag(client, szTabRank);
+		else CS_SetClientClanTag(client, szTabClanTag);
 	}
-	else
+	else //we don't use it. What you think about it @totles :) ?
 	{
 		if (GetConVarBool(g_hPointSystem))
 		{