diff --git a/main/Balance.txt b/main/Balance.txt
index d8ebfc3..fee9ebc 100644
--- a/main/Balance.txt
+++ b/main/Balance.txt
@@ -119,8 +119,8 @@
 #define kGameDownloadSize 150
 #define kGameHDSpaceNeeded 300
 #define kGameVersionMajor 3
-#define kGameVersionMinor 0
-#define kGameVersionRevision 1
+#define kGameVersionMinor 1
+#define kGameVersionRevision 0
 #define kGestateBaseArmor 150
 #define kGestateHealth 200
 #define kGorgeArmorUpgrade 50
diff --git a/main/assets-common.txt b/main/assets-common.txt
index cb9d5c0..1074c0f 100644
--- a/main/assets-common.txt
+++ b/main/assets-common.txt
@@ -173,6 +173,7 @@ sprites/structurescursor.spr
 sprites/topdownbg.spr
 sprites/topdownbottom.spr
 sprites/topdowntop.spr
+sprites/query.spr
 
 ; New font rendering
 sprites/font_aria*.*
diff --git a/main/cl_dlls/client.dll b/main/cl_dlls/client.dll
index 605025f..fee0370 100644
Binary files a/main/cl_dlls/client.dll and b/main/cl_dlls/client.dll differ
diff --git a/main/dlls/ns.dll b/main/dlls/ns.dll
index 49bbe68..fab7bd2 100644
Binary files a/main/dlls/ns.dll and b/main/dlls/ns.dll differ
diff --git a/main/liblist.gam b/main/liblist.gam
index 1552f43..e584cb9 100644
--- a/main/liblist.gam
+++ b/main/liblist.gam
@@ -2,7 +2,7 @@
 // Natural Selection      //
 //   by Charlie Cleveland //
 ////////////////////////////
-game "Natural Selection"
+game "Natural Selection 3.1 (PT build 109)"
 url_info "www.natural-selection.org"
 url_dl "http://www.natural-selection.org/"
 version "v3.0"
diff --git a/main/listenserver.cfg b/main/listenserver.cfg
index e3c3e62..42c8776 100644
--- a/main/listenserver.cfg
+++ b/main/listenserver.cfg
@@ -12,7 +12,7 @@
 ////////////////////////////////////////////////////
 
 // Default server name. Change to "Bob's Server", etc.
-hostname "Natural Selection v3.0"
+hostname "Natural Selection v3.1"
 
 // Must specify sv_region, or it won't show up in Steam server browser
 // 0: US East coast
diff --git a/main/server.cfg b/main/server.cfg
index 79e50d1..78d9540 100644
--- a/main/server.cfg
+++ b/main/server.cfg
@@ -9,7 +9,7 @@
 ////////////////////////////////////////////////////
 
 // Default server name. Change to "Bob's Server", etc.
-hostname "Natural Selection v3.0"
+hostname "Natural Selection v3.1"
 
 // Must specify sv_region, or it won't show up in Steam server browser
 // 0: US East coast
diff --git a/main/settings.scr b/main/settings.scr
index 385de08..596b8a0 100644
--- a/main/settings.scr
+++ b/main/settings.scr
@@ -52,7 +52,7 @@ DESCRIPTION SERVER_OPTIONS
 	{
 		"#Valve_Hostname"
 		{ STRING }
-		{ "Natural Selection 3.0 Server" }
+		{ "Natural Selection 3.1 Server" }
 	}
 
 	"maxplayers"
diff --git a/main/source/cl_dll/cl_dll.vcproj b/main/source/cl_dll/cl_dll.vcproj
index 1af1434..a366d52 100644
--- a/main/source/cl_dll/cl_dll.vcproj
+++ b/main/source/cl_dll/cl_dll.vcproj
@@ -113,7 +113,7 @@
 				EnableIntrinsicFunctions="TRUE"
 				OptimizeForProcessor="0"
 				AdditionalIncludeDirectories=""$(SolutionDir)";U:\inlcude\stlport;U:\include\vgui;U:\include\nexus;U:\include\libpng;U:\include\fmod;U:\include\lua;U:\include\particle;U:\include\zlib"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;$(NOINHERIT)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;AVH_PLAYTEST_BUILD;$(NOINHERIT)"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="TRUE"
diff --git a/main/source/dlls/hl.vcproj b/main/source/dlls/hl.vcproj
index ef09227..b07d47a 100644
--- a/main/source/dlls/hl.vcproj
+++ b/main/source/dlls/hl.vcproj
@@ -27,7 +27,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
 				AdditionalIncludeDirectories=""$(SolutionDir)";U:\include\stlport;U:\include\nexus;U:\include\lua;U:\include\particle"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;$(NOINHERIT)"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_PLAYTEST_BUILD;$(NOINHERIT)"
 				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
 				RuntimeLibrary="0"
@@ -46,7 +46,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib particles.lib liblua.lib liblualib.lib nexus_server.lib ssleay32.lib libeay32.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib particles.lib liblua.lib liblualib.lib ssleay32.lib libeay32.lib"
 				OutputFile="$(SolutionDir)..\dlls\ns.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/main/source/mod/AvHConstants.cpp b/main/source/mod/AvHConstants.cpp
index c069ac0..3331f8b 100644
--- a/main/source/mod/AvHConstants.cpp
+++ b/main/source/mod/AvHConstants.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 
 const int slashchr =  '\\';
-#define kAvHModDir					((const char*)("ns"))
+#define kAvHModDir					((const char*)("nsp"))
 
 const char* getModDirectory(void)
 {