diff --git a/plugins/include/sdktools_functions.inc b/plugins/include/sdktools_functions.inc
index ec16e086..fc3f9c84 100644
--- a/plugins/include/sdktools_functions.inc
+++ b/plugins/include/sdktools_functions.inc
@@ -298,7 +298,7 @@ native bool:GetPlayerJingleFile(client, String:hex[], maxlength);
  * @param out				Buffer to store the output traffic velocity.
  * @noreturn
  */
-native GetServerNetStats(&Float:in, &Float:out);
+native GetServerNetStats(&Float:inAmount, &Float:outAmout);
 
 /**
  * Equip's a player's weapon.
@@ -343,4 +343,4 @@ native SetClientInfo(client, const String:key[], const String:value[]);
  *
  * @return Amount of ammo actually given.
  */
-native GivePlayerAmmo(client, amount, ammotype, bool:suppressSound=false);
\ No newline at end of file
+native GivePlayerAmmo(client, amount, ammotype, bool:suppressSound=false);
diff --git a/sourcepawn/compiler/sc.h b/sourcepawn/compiler/sc.h
index c9eb0016..d22c1b54 100644
--- a/sourcepawn/compiler/sc.h
+++ b/sourcepawn/compiler/sc.h
@@ -394,9 +394,12 @@ enum TokenKind {
   /* value of last multi-character operator */
   tMIDDLE    = tDBLCOLON,
 /* reserved words (statements) */
+  tACQUIRE,
+  tAS,
   tASSERT,
   tBEGIN,
   tBREAK,
+  tCATCH,
   tCASE,
   tCAST_TO,
   tCELLSOF,
@@ -408,28 +411,47 @@ enum TokenKind {
   tDEFINED,
   tDELETE,
   tDO,
+  tDOUBLE,
   tELSE,
   tEND,
   tENUM,
   tEXIT,
+  tEXPLICIT,
+  tFINALLY,
   tFOR,
+  tFOREACH,
   tFORWARD,
   tFUNCENUM,
   tFUNCTAG,
   tFUNCTION,
   tGOTO,
   tIF,
+  tIMPLICIT,
+  tIMPORT,
+  tIN,
   tINT,
+  tINT8,
+  tINT16,
+  tINT32,
+  tINT64,
+  tINTERFACE,
+  tINTN,
   tLET,
   tMETHODMAP,
+  tNAMESPACE,
   tNATIVE,
   tNEW,
   tNULL,
   tNULLABLE,
   tOBJECT,
   tOPERATOR,
+  tPACKAGE,
+  tPRIVATE,
+  tPROTECTED,
   tPUBLIC,
+  tREADONLY,
   tRETURN,
+  tSEALED,
   tSIZEOF,
   tSLEEP,
   tSTATIC,
@@ -439,13 +461,26 @@ enum TokenKind {
   tTAGOF,
   tTHEN,
   tTHIS,
+  tTHROW,
+  tTRY,
   tTYPEDEF,
+  tTYPEOF,
   tTYPESET,
+  tUINT8,
+  tUINT16,
+  tUINT32,
+  tUINT64,
+  tUINTN,
   tUNION,
+  tUSING,
   tVAR,
+  tVARIANT,
   tVIEW_AS,
+  tVIRTUAL,
   tVOID,
+  tVOLATILE,
   tWHILE,
+  tWITH,
   /* compiler directives */
   tpASSERT,     /* #assert */
   tpDEFINE,
diff --git a/sourcepawn/compiler/sc2.cpp b/sourcepawn/compiler/sc2.cpp
index 51f13bd5..31f5a79b 100644
--- a/sourcepawn/compiler/sc2.cpp
+++ b/sourcepawn/compiler/sc2.cpp
@@ -1959,25 +1959,93 @@ const char *sc_tokens[] = {
          "*=", "/=", "%=", "+=", "-=", "<<=", ">>>=", ">>=", "&=", "^=", "|=",
          "||", "&&", "==", "!=", "<=", ">=", "<<", ">>>", ">>", "++", "--",
          "...", "..", "::",
+         "acquire",
+         "as",
          "assert",
-         "*begin", "break",
-         "case", "cast_to", "cellsof", "char", "const", "continue",
-         "decl", "default", "defined", "delete", "do",
-         "else", "*end", "enum", "exit",
-         "for", "forward", "funcenum", "functag", "function",
+         "*begin",
+         "break",
+         "catch",
+         "case",
+         "cast_to",
+         "cellsof",
+         "char",
+         "const",
+         "continue",
+         "decl",
+         "default",
+         "defined",
+         "delete",
+         "do",
+         "double",
+         "else",
+         "*end",
+         "enum",
+         "exit",
+         "explicit",
+         "finally",
+         "for",
+         "foreach",
+         "forward",
+         "funcenum",
+         "functag",
+         "function",
          "goto",
-         "if", "int",
+         "if",
+         "implicit",
+         "import",
+         "in",
+         "int",
+         "int8",
+         "int16",
+         "int32",
+         "int64",
+         "interface",
+         "intn",
          "let",
          "methodmap",
-         "native", "new", "null", "__nullable__",
-         "object", "operator",
+         "namespace",
+         "native",
+         "new",
+         "null",
+         "__nullable__",
+         "object",
+         "operator",
+         "package",
+         "private",
+         "protected",
          "public",
+         "readonly",
          "return",
-         "sizeof", "sleep", "static", "stock", "struct", "switch",
-         "tagof", "*then", "this", "typedef", "typeset",
+         "sealed",
+         "sizeof",
+         "sleep",
+         "static",
+         "stock",
+         "struct",
+         "switch",
+         "tagof",
+         "*then",
+         "this",
+         "throw",
+         "try",
+         "typedef",
+         "typeof",
+         "typeset",
+         "uint8",
+         "uint16",
+         "uint32",
+         "uint64",
+         "uintn",
          "union",
-         "var", "view_as", "void",
+         "using",
+         "var",
+         "variant",
+         "view_as",
+         "virtual",
+         "void",
+         "volatile",
          "while",
+         "with",
          "#assert", "#define", "#else", "#elseif", "#emit", "#endif", "#endinput",
          "#endscript", "#error", "#file", "#if", "#include", "#line", "#pragma",
          "#tryinclude", "#undef",