diff --git a/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt b/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt
index 6098cad..cd50212 100644
--- a/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt
+++ b/cstrike/addons/sourcemod/translations/zombiereloaded.phrases.txt
@@ -140,37 +140,32 @@
 
 	"Menu main zadmin"
 	{
-		"en"		"ZAdmin (!zadmin) - View Admin Menu"
+		"en"		"ZAdmin ({1}) - Open admin menu."
 	}
 
 	"Menu main zclass"
 	{
-		"en"		"ZClass (!zclass) - Select a zombie class"
-		"ru"		"ZClass (!zclass) - Выбор класса зомби"
+		"en"		"ZClass ({1}) - Configure your class settings."
 	}
 
 	"Menu main zspawn"
 	{
-		"en"		"ZSpawn (!zspawn) - Spawn into game"
-		"ru"		"ZSpawn (!zspawn) - Заход в игру"
+		"en"		"ZSpawn ({1}) - Join late?  Use this to spawn."
 	}
 
 	"Menu main ztele"
 	{
-		"en"		"ZTele (!ztele) - Teleport to your spawnpoint"
-		"ru"		"ZTele (!ztele) - Телепорт на место появления"
+		"en"		"ZTele ({1}) - Teleport back to your spawn location."
 	}
 
 	"Menu main zhp"
 	{
-		"en"		"ZHP (!zhp) - Toggle real HP display when zombie"
-		"ru"		"ZHP (!zhp) - Показ здоровья зомби"
+		"en"		"ZHP ({1}) - Toggle real HP display when infected."
 	}
 
 	"Menu main zmarket"
 	{
-		"en"		"ZMarket (!zmarket) - Custom weapon list"
-		"ru"		"ZMarket (!zmarket) - Собственный набор оружия"
+		"en"		"ZMarket ({1}) - Need a weapon?  Buy them here."
 	}
 
 	// ===========================
@@ -376,7 +371,7 @@
 	"ZSpawn timelimit"
 	{
 		"#format"	"{1:d}"
-		"en"		"The timelimit, to use ZSpawn, ({1} seconds) has already expired."
+		"en"		"The timelimit ({1} seconds), to use ZSpawn, has already expired."
 	}
 
 	// ===========================
diff --git a/src/zombiereloaded.sp b/src/zombiereloaded.sp
index 09cd2cd..67f2835 100644
--- a/src/zombiereloaded.sp
+++ b/src/zombiereloaded.sp
@@ -27,6 +27,7 @@
 #include "zr/cvars"
 #include "zr/config"
 #include "zr/translation"
+#include "zr/sayhooks"
 #include "zr/tools"
 #include "zr/models"
 #include "zr/playerclasses/playerclasses"
@@ -35,8 +36,8 @@
 #include "zr/roundend"
 #include "zr/infect"
 #include "zr/damage"
+
 #include "zr/menu"
-#include "zr/sayhooks"
 #include "zr/event"
 #include "zr/zadmin"
 #include "zr/commands"
@@ -66,7 +67,7 @@
 public Plugin:myinfo =
 {
     name = "Zombie:Reloaded",
-    author = "Greyscale, Rhelgeby (Richard)",
+    author = "Greyscale | Richard Helgeby",
     description = "Infection/survival style gameplay",
     version = VERSION,
     url = ""
diff --git a/src/zr/menu.inc b/src/zr/menu.inc
index eaa451a..5c05bea 100644
--- a/src/zr/menu.inc
+++ b/src/zr/menu.inc
@@ -35,12 +35,12 @@ MenuMain(client)
     decl String:zmarket[64];
     
     // Translate each line into client's language.
-    Format(zadmin, sizeof(zadmin), "%t", "Menu main zadmin");
-    Format(zclass, sizeof(zclass), "%t", "Menu main zclass");
-    Format(zspawn, sizeof(zspawn), "%t", "Menu main zspawn");
-    Format(ztele, sizeof(ztele), "%t", "Menu main ztele");
-    Format(zhp, sizeof(zhp), "%t", "Menu main zhp");
-    Format(zmarket, sizeof(zmarket), "%t", "Menu main zmarket");
+    Format(zadmin, sizeof(zadmin), "%t", "Menu main zadmin", SAYHOOKS_KEYWORD_ZMENU);
+    Format(zclass, sizeof(zclass), "%t", "Menu main zclass", SAYHOOKS_KEYWORD_ZADMIN);
+    Format(zspawn, sizeof(zspawn), "%t", "Menu main zspawn", SAYHOOKS_KEYWORD_ZCLASS);
+    Format(ztele, sizeof(ztele), "%t", "Menu main ztele", SAYHOOKS_KEYWORD_ZTELE);
+    Format(zhp, sizeof(zhp), "%t", "Menu main zhp", SAYHOOKS_KEYWORD_ZHP);
+    Format(zmarket, sizeof(zmarket), "%t", "Menu main zmarket", SAYHOOKS_KEYWORD_ZMARKET);
     
     // Add items to menu.
     
diff --git a/src/zr/sayhooks.inc b/src/zr/sayhooks.inc
index c63fda2..ce1e801 100644
--- a/src/zr/sayhooks.inc
+++ b/src/zr/sayhooks.inc
@@ -67,8 +67,9 @@ public Action:SayHooksCmdSay(client, argc)
     // Get client's command string (typically 'say "text"')
     GetCmdArgString(args, sizeof(args));
     
-    // Strip away the quotes.
-    ReplaceString(args, sizeof(args), "\"", "");
+    // Strip away certain characters.
+    ReplaceString(args, sizeof(args), "\"", ""); // Strip quotes
+    ReplaceString(args, sizeof(args), " ", ""); // Strip all whitespace.
     
     new chatflag = SayHooksChatToFlag(args);
     
@@ -152,8 +153,8 @@ public Action:SayHooksCmdSay(client, argc)
 /**
  * Convert chat text into a defined flag.
  * 
- * @param chat  The chat text to convert.
- * @return      Returns flag for word given, returns 0 if matches none.
+ * @param chat      The chat text to convert.
+ * @return          Returns flag for word given, returns 0 if matches none.
  */
 SayHooksChatToFlag(const String:chat[])
 {
diff --git a/src/zr/weapons/restrict.inc b/src/zr/weapons/restrict.inc
index ee8688c..7b12218 100644
--- a/src/zr/weapons/restrict.inc
+++ b/src/zr/weapons/restrict.inc
@@ -44,7 +44,7 @@ enum WpnRestrictQuery
 RestrictInit()
 {
     // Initialize weapon restrict array.
-    gRestrictedWeapons = CreateArray(32, 0);
+    gRestrictedWeapons = CreateArray(WEAPONS_MAX_LENGTH, 0);
     
     // Hook buy command.
     RegConsoleCmd("buy", RestrictBuyCommand);