diff --git a/SierraUp.cfg b/SierraUp.cfg
index 4b355b7..f86e1f8 100644
--- a/SierraUp.cfg
+++ b/SierraUp.cfg
@@ -1,7 +1,7 @@
 ProductName "Tribes2"
 DisplayName "Tribes 2"
 PatchFolder .\patch
-CurrentVersion 0.22002.0.0
+CurrentVersion 0.22017.0.0
 AutoStart
 MonitorPatch
 LaunchExe "tribes2.exe"
diff --git a/base/input.log b/base/input.log
index 646feb0..524a98f 100644
--- a/base/input.log
+++ b/base/input.log
@@ -1,4 +1,4 @@
-Input log opened at Wed Mar 28 14:15:31 2001
+Input log opened at Fri Mar 30 12:01:39 2001
 
 Operating System:
   WinNT version 5.0
diff --git a/base/scripts/webstuff.cs b/base/scripts/webstuff.cs
index 0d6471e..a434c9b 100644
--- a/base/scripts/webstuff.cs
+++ b/base/scripts/webstuff.cs
@@ -154,6 +154,8 @@ function HandleDatabaseProxyResponse(%prefix, %params)
          $DBQueries[%i] = $DBQueries[%i+1];
          $DBQueryText[%i] = $DBQueryText[%i+1];
       }
+      $DBQueries[%i] = "";
+      $DBQueryText[%i] = "";
       $DBQueryCount--;
    }
 }
@@ -168,7 +170,7 @@ function DatabaseQueryi(%astr, %args, %proxyObject, %key)
 		if (%proxyObject !$= "")
 			%proxyObject.onDatabaseQueryResult("1\tORA-04061", "", %key);
 
-		return;
+		return 0;
 	}
 
    // maxRows will be empty
@@ -194,16 +196,36 @@ function DatabaseQueryi(%astr, %args, %proxyObject, %key)
    }
    %msg = getSubStr(%args, %i, 400);
    IRCClient::send("dbqax" SPC %id SPC %astr SPC ":" @ %msg);
+   return %id;
 }
 
 function DatabaseQuery(%ordinal, %args, %proxyObject, %key)
 {
-   DatabaseQueryi(%ordinal SPC "0", %args, %proxyObject, %key);
+   return DatabaseQueryi(%ordinal SPC "0", %args, %proxyObject, %key);
 }
 
 function DatabaseQueryArray(%ordinal, %maxRows, %args, %proxyObject, %key)
 {
-   DatabaseQueryi("C" @ %ordinal SPC %maxRows, %args, %proxyObject, %key);
+   return DatabaseQueryi("C" @ %ordinal SPC %maxRows, %args, %proxyObject, %key);
+}
+
+function DatabaseQueryCancel(%id)
+{
+   for(%qc = 0; %qc < $DBQueryCount; %qc++)
+      if(getWord($DBQueries[%qc], 0) == %id)
+         break;
+   if(%qc == $DBQueryCount)
+      return;
+   IRCClient::send("dbqc " @ %id);
+
+   for(%i = %qc; %i < $DBQueryCount; %i++)
+   {
+      $DBQueries[%i] = $DBQueries[%i+1];
+      $DBQueryText[%i] = $DBQueryText[%i+1];
+   }
+   $DBQueries[%i] = "";
+   $DBQueryText[%i] = "";
+   $DBQueryCount--;
 }
 
 function WONUpdateCertificateDone(%errCode, %errStr)
diff --git a/base/version.cs b/base/version.cs
index c207feb..5938353 100644
--- a/base/version.cs
+++ b/base/version.cs
@@ -1 +1 @@
-buildVersion.setValue( "MAR 28, 2001, 2:09 PM (dmoore)" );
+buildVersion.setValue( "MAR 30, 2001, 11:54 AM (dmoore)" );
diff --git a/console_start.cs b/console_start.cs
index 38ecd8d..bbeae30 100644
--- a/console_start.cs
+++ b/console_start.cs
@@ -540,7 +540,7 @@ function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck )
          default:
             if(%code <= -2900 && %code >= -2999)
             {				
-			   if(%code = -2902)
+			   if(%code == -2902)
 					%msg = "Account Creation Failed - That CDKey is already in use." @ %code;
 			   else
                		%msg = "Account Creation Failed - That warrior name is already in use.  Please choose another warrior name and try again. Code = " @ %code;