diff --git a/source/CubeMS/web.config b/source/CubeMS/web.config
index f0e7a535..edfc0711 100644
--- a/source/CubeMS/web.config
+++ b/source/CubeMS/web.config
@@ -16,8 +16,8 @@
     <add key="ClientScriptCacheMinutes" value="0"/>
   </appSettings>
   <connectionStrings>
-    <add name="CubeMS" connectionString="Data Source=ADRIAN\SQLEXPRESS;Initial Catalog=k0890;Integrated Security=True;Pooling=False"
-      providerName="System.Data.SqlClient" />
+    <!--<add name="CubeMS" connectionString="Data Source=ADRIAN\SQLEXPRESS;Initial Catalog=k0890;Integrated Security=True;Pooling=False" providerName="System.Data.SqlClient" />-->
+    <add name="CubeMS" connectionString="Data Source=IMVSRV52;Initial Catalog=k0890;UserId=k0890db;Password=99ABrx77-" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <system.web>
     <!-- 
diff --git a/source/roadmap.txt b/source/roadmap.txt
index 4195a5ac..21f6ba69 100644
--- a/source/roadmap.txt
+++ b/source/roadmap.txt
@@ -2,16 +2,18 @@ v0.94
 
     * new voting system (map, mode, kick, etc.) -- done (driAn)
     * _stable_ demo support (sauer backport) -- done (eihrul)
-    * new game mode (VIP)
+    * new game mode (VIP) -- todo:ac_stef
     * customizable server ports -- done (driAn)
-    * more sounds, taunts
+    * more sounds, taunts -- todo:makke
     * overhead team indicators -- done (implemented as colored vests/models instead)
     * footsteps -- done (driAn)
     * crouch -- done (driAn)
     * better server list -- done (driAn)
-    * ghost mode 
+    * ghost mode -- done (driAn), needs testing
     * new map: ac_power -- done
     * ambient sounds (sauer backport) -- done (driAn) 
+    * new map sending system
+    * wallshot sound fx
     
 v0.95
 
@@ -21,4 +23,4 @@ v0.95
     * kick/ban reason
     * language add-ons, unicode support
     * maxkills/maxflags
-    * better "game ended" msg 
\ No newline at end of file
+    * better "game ended" msg
\ No newline at end of file
diff --git a/source/src/client.cpp b/source/src/client.cpp
index 8b8a2d75..3fb15fd1 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -428,7 +428,7 @@ void sendmap(char *mapname)
     if(*mapname)
     {
         save_world(mapname);
-        changemap(mapname);
+        changemap(mapname); // FIXME!!
     }    
     else mapname = getclientmap();
     if(securemapcheck(mapname)) return;
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 4b3bae49..39665efd 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -127,8 +127,6 @@ COMMANDN(team, newteam, ARG_1STR);
 COMMANDN(name, newname, ARG_1STR);
 COMMANDN(skin, newskin, ARG_1INT);
 
-//extern void thrownade(playerent *d, const vec &vel, bounceent *p);
-
 void deathstate(playerent *pl)
 {
     pl->state = CS_DEAD;
@@ -136,6 +134,7 @@ void deathstate(playerent *pl)
     pl->move = pl->strafe = 0;
     pl->pitch = pl->roll = 0;
     pl->attacking = false;
+    pl->weaponsel->onownerdies();
     
     if(pl == player1)
     {
@@ -365,8 +364,6 @@ bool tryrespawn()
     return false;
 }
 
-void showteamkill() { player1->lastteamkill = lastmillis; }
-
 // damage arriving from the network, monsters, yourself, all ends up here.
 
 void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local)
@@ -403,9 +400,8 @@ void dokill(playerent *pl, playerent *act, bool gib)
         outf("\f2%s suicided%s", pname, pl==player1 ? "!" : "");
     else if(isteam(pl->team, act->team))
     {
-        if(pl==player1) outf("\f2you got %s by a teammate (%s)", death, aname);
-        else outf("\f2%s %s %s teammate (%s)", aname, death, act==player1 ? "a" : "his", pname);
-        if(act==player1) showteamkill();
+        if(pl==player1) outf("\f2you got %s by teammate %s", death, aname);
+        else outf("%s%s %s teammate %s", act==player1 ? "\f3" : "\f2", aname, death, pname);
     }
     else
     {
@@ -415,8 +411,6 @@ void dokill(playerent *pl, playerent *act, bool gib)
 
     if(pl==player1)
     {
-        // FIXME!!!
-        //if(pl->inhandnade) thrownade(pl, vec(0,0,0), pl->inhandnade);
         if(m_ctf) tryflagdrop(pl!=act && isteam(act->team, pl->team));
     }
     if(gib)
@@ -762,12 +756,11 @@ void setadmin(char *claim, char *password)
 COMMAND(setmaster, ARG_1INT);
 COMMAND(setadmin, ARG_2STR);
 
-void changemap(char *name)                      // request map change, server may ignore. silent vote
+void changemap(char *name)                      // silently request map change, server may ignore
 {
     ENetPacket *packet = enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
     ucharbuf p(packet->data, packet->dataLength);
-    putint(p, SV_CALLVOTE);
-    putint(p, SA_MAP);
+    putint(p, SV_NEXTMAP);
     sendstring(name, p);
     putint(p, nextmode);
     enet_packet_resize(packet, p.length());
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index cb85ae39..b2934b58 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -123,7 +123,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
             {
                 string mode;
                 itoa(mode, gamemode);
-                callvote(SA_MAP, getclientmap(), mode); // FIXME
+                changemap(getclientmap());
             }
             break;
         }
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index 4b332cd2..c4fcacbd 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -195,8 +195,9 @@ void selectnextprimary(int num)
         case GUN_SUBGUN:
         case GUN_SNIPER:
         case GUN_ASSAULT:
-            player1->nextprimary = num;
-            addmsg(SV_PRIMARYWEAP, "ri", player1->nextprimary);
+            //player1->nextprimary = num;
+            player1->setnextprimary(num);
+            addmsg(SV_PRIMARYWEAP, "ri", player1->nextprimweap->type);
             break;
 
         default:
diff --git a/source/src/entity.h b/source/src/entity.h
index 233be986..cb30d15d 100644
--- a/source/src/entity.h
+++ b/source/src/entity.h
@@ -328,7 +328,7 @@ struct playerent : dynent, playerstate
     int lifesequence;                   // sequence id for each respawn, used in damage test
     int frags, flagscore;
     int deaths() { return lifesequence + (state==CS_DEAD ? 1 : 0); }
-    int lastaction, lastmove, lastpain, lastteamkill;
+    int lastaction, lastmove, lastpain;
     int clientrole;
     bool attacking;
     string name, team;
@@ -346,7 +346,7 @@ struct playerent : dynent, playerstate
 
     poshist history; // Previous stored locations of this player
 
-    playerent() : clientnum(-1), plag(0), ping(0), lifesequence(0), frags(0), flagscore(0), lastpain(0), lastteamkill(0), clientrole(CR_DEFAULT),
+    playerent() : clientnum(-1), plag(0), ping(0), lifesequence(0), frags(0), flagscore(0), lastpain(0), clientrole(CR_DEFAULT),
                   skin(0), nextskin(0), spectating(SM_NONE), followplayercn(0),
                   weaponsel(NULL), nextweaponsel(NULL), primweap(NULL), nextprimweap(NULL), lastattackweapon(NULL), inhandnade(NULL)
     {
diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp
index d1338e1e..49d31d58 100644
--- a/source/src/protocol.cpp
+++ b/source/src/protocol.cpp
@@ -108,7 +108,7 @@ char msgsizesl[] =               // size inclusive message token, 0 for variable
     SV_SHOOT, 0, SV_EXPLODE, 0, SV_SUICIDE, 1, SV_AKIMBO, 2, SV_RELOAD, 3,
     SV_GIBDIED, 4, SV_DIED, 4, SV_GIBDAMAGE, 6, SV_DAMAGE, 6, SV_HITPUSH, 6, SV_SHOTFX, 9, SV_THROWNADE, 8,
     SV_TRYSPAWN, 1, SV_SPAWNSTATE, 20, SV_SPAWN, 3, SV_FORCEDEATH, 2, SV_RESUME, 0,
-    SV_TIMEUP, 2, SV_EDITENT, 10, SV_MAPRELOAD, 2, SV_ITEMACC, 2,
+    SV_TIMEUP, 2, SV_EDITENT, 10, SV_MAPRELOAD, 2, SV_NEXTMAP, 0, SV_ITEMACC, 2,
     SV_MAPCHANGE, 0, SV_ITEMSPAWN, 2, SV_ITEMPICKUP, 2,
     SV_PING, 2, SV_PONG, 2, SV_CLIENTPING, 2, SV_GAMEMODE, 2,
     SV_EDITMODE, 2, SV_EDITH, 7, SV_EDITT, 7, SV_EDITS, 6, SV_EDITD, 6, SV_EDITE, 6,
diff --git a/source/src/protocol.h b/source/src/protocol.h
index a51ea350..7593253b 100644
--- a/source/src/protocol.h
+++ b/source/src/protocol.h
@@ -15,7 +15,7 @@ enum
     SV_SHOOT, SV_EXPLODE, SV_SUICIDE, SV_AKIMBO, SV_RELOAD,
     SV_GIBDIED, SV_DIED, SV_GIBDAMAGE, SV_DAMAGE, SV_HITPUSH, SV_SHOTFX, SV_THROWNADE,
     SV_TRYSPAWN, SV_SPAWNSTATE, SV_SPAWN, SV_FORCEDEATH, SV_RESUME,
-    SV_TIMEUP, SV_EDITENT, SV_MAPRELOAD, SV_ITEMACC,
+    SV_TIMEUP, SV_EDITENT, SV_MAPRELOAD, SV_NEXTMAP, SV_ITEMACC,
     SV_MAPCHANGE, SV_ITEMSPAWN, SV_ITEMPICKUP,
     SV_PING, SV_PONG, SV_CLIENTPING, SV_GAMEMODE,
     SV_EDITMODE, SV_EDITH, SV_EDITT, SV_EDITS, SV_EDITD, SV_EDITE,
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index 96734f0f..01e6df95 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -330,11 +330,10 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
     glEnable(GL_TEXTURE_2D);
 
     playerent *targetplayer = playerincrosshair();
-    bool didteamkill = player1->lastteamkill && player1->lastteamkill + 5000 > lastmillis;
     bool menu = menuvisible();
     bool command = getcurcommand() ? true : false;
 
-    if(player1->state==CS_ALIVE && !player1->weaponsel->reloading && !didteamkill && !menu)
+    if(player1->state==CS_ALIVE && !player1->weaponsel->reloading && !menu)
     {
         bool drawteamwarning = targetplayer ? (isteam(targetplayer->team, player1->team) && targetplayer->state!=CS_DEAD) : false;
         if(player1->weaponsel->type==GUN_SNIPER && scoped) drawscope();
@@ -368,6 +367,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
         draw_textf("wvt %d", left, top+240, curvert);
         draw_textf("evt %d", left, top+320, xtraverts);
     }
+
     if(!hidevote)
     {
         extern votedisplayinfo *curvote;
@@ -398,6 +398,22 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
 
     hudmsgs.render();
 
+    if(player1->state==CS_DEAD && player1->spectating==SM_NONE)
+    {
+        glLoadIdentity();
+		glOrtho(0, VIRTW*3/2, VIRTH*3/2, 0, -1, 1);
+        const int left = (VIRTW*3/2)*6/8, top = (VIRTH*3/2)*3/4;
+        draw_textf("jump or switch weapons", left, top);
+        draw_textf("to enter spectator mode", left, top+80);
+    }
+
+    if(player1->state==CS_SPECTATE || (player1->state==CS_DEAD && player1->spectating!=SM_NONE))
+    {
+        glLoadIdentity();
+		glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
+		draw_text("SPECTATING", VIRTW/40, VIRTH/10*7);
+    }
+
     if(player1->state==CS_ALIVE)
     {
         glLoadIdentity();
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 70a8a5b2..95a94896 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1774,7 +1774,6 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
         {
             int nextprimary = getint(p);
             cl->state.nextprimary = nextprimary;
-            QUEUE_MSG;
             break;
         }
 
@@ -1904,6 +1903,15 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
             break;
         }
 
+        case SV_NEXTMAP:
+        {
+            getstring(text, p);
+            filtertext(text, text);
+            int mode = getint(p);
+            if(mapreload || numclients() == 1) resetmap(text, mode);
+            break;
+        }
+
         case SV_SENDMAP:
         {
             getstring(text, p);
@@ -2073,12 +2081,9 @@ void checkintermission()
     if(!interm && minremain<=0) interm = gamemillis+10000;
 }
 
-/*void startintermission() { minremain = 0; checkintermission(); }*/
-
 void resetserverifempty()
 {
     loopv(clients) if(clients[i]->type!=ST_EMPTY) return;
-    //clients.setsize(0);
     resetmap("", 0, 10, false);
 	mastermode = MM_OPEN;
 	autoteam = true;
diff --git a/source/src/sound.cpp b/source/src/sound.cpp
index 03922aaa..750b9c27 100644
--- a/source/src/sound.cpp
+++ b/source/src/sound.cpp
@@ -328,8 +328,9 @@ void updatechanvol(int chan, int svol, soundloc *sl)
         }
         else
         {
-            vol -= (int)(dist*3/4*soundvol/255); // simple mono distance attenuation
+            vol -= (int)(dist*3*soundvol/255); // simple mono distance attenuation
             if(vol<0) vol = 0;
+            conoutf("vol %d", vol);
         }
         if(sl->pse) // control looping physent sound volume
         {
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 57325166..d77efd6f 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -37,7 +37,15 @@ void weaponswitch(weapon *w)
 }
 
 void selectweapon(weapon *w) { if(w && w->selectable()) weaponswitch(w); }
-void selectweaponi(int w) { if(w >= 0 && w < NUMGUNS) selectweapon(player1->weapons[w]); }
+
+void selectweaponi(int w) 
+{ 
+    if(player1->state == CS_ALIVE)
+    {
+        if(w >= 0 && w < NUMGUNS) selectweapon(player1->weapons[w]); 
+    }
+    else toggledeathcam();
+}
 
 void shiftweapon(int s)
 {
@@ -718,9 +726,6 @@ struct grenades : weapon
         }
     }
 
-    void selecting() { throwmillis = 0; }
-    void onammopicked() { throwmillis = 0; }
-
     int modelanim()
     {
         if(throwing()) return ANIM_GUN_THROW;
@@ -768,7 +773,7 @@ struct grenades : weapon
         else playsound(S_GRENADETHROW, owner);
     }
 
-    void drawstats()
+    void renderstats()
     {
         char gunstats[64];
         sprintf(gunstats, "%i", mag);
@@ -776,6 +781,15 @@ struct grenades : weapon
     }
 
     bool selectable() { return weapon::selectable() && !inhand() && mag; }
+    void reset() { throwmillis = 0; }
+
+    void onselecting() { reset(); }
+    //void onammopicked() { reset(); }
+    void onownerdies() 
+    { 
+        reset(); 
+        if(owner==player1 && owner->inhandnade) ((grenadeent *)owner->inhandnade)->explode();
+    }
 };
 
 struct gun : weapon
@@ -1003,6 +1017,7 @@ struct knife : weapon
 
     void drawstats() {}
     void attackfx(vec &from, vec &to, int millis) { attacksound(); }
+    void renderstats() { };
 };
 
 
diff --git a/source/src/weapon.h b/source/src/weapon.h
index 28191ed7..d9e32732 100644
--- a/source/src/weapon.h
+++ b/source/src/weapon.h
@@ -33,6 +33,7 @@ struct weapon
     virtual void onselecting();
     virtual void ondeselecting() {}
     virtual void onammopicked() {}
+    virtual void onownerdies() {}
 
     void sendshoot(vec &from, vec &to);
     bool modelattacking();
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index 5749272d..19b96f0b 100644
Binary files a/source/vcpp/cube.suo and b/source/vcpp/cube.suo differ
diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index ec887418..2f0e725c 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -48,7 +48,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\enet\include;..\include"
+				AdditionalIncludeDirectories="..\enet\include;..\include;..\src"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -58,9 +58,9 @@
 				EnableFunctionLevelLinking="false"
 				DisableLanguageExtensions="false"
 				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="cube.h"
-				PrecompiledHeaderFile=".\Release/cube.pch"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="pch.h"
+				PrecompiledHeaderFile=".\Debug/cube.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
@@ -161,7 +161,7 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ENET_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="pch.h"
 				PrecompiledHeaderFile=".\Debug/cube.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -270,7 +270,8 @@
 				EnableFunctionLevelLinking="false"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/cube.pch"
+				PrecompiledHeaderThrough="pch.h"
+				PrecompiledHeaderFile=".\Debug/cube.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
@@ -377,9 +378,9 @@
 				EnableFunctionLevelLinking="false"
 				DisableLanguageExtensions="false"
 				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="cube.h"
-				PrecompiledHeaderFile=".\Standalone/cube.pch"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="pch.h"
+				PrecompiledHeaderFile=".\Debug/cube.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -475,8 +476,8 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="cube.h"
-				PrecompiledHeaderFile=".\Standalone Debug/cube.pch"
+				PrecompiledHeaderThrough="pch.h"
+				PrecompiledHeaderFile=".\Debug/cube.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -753,14 +754,6 @@
 			<File
 				RelativePath="..\src\rendercubes.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -782,14 +775,6 @@
 			<File
 				RelativePath="..\src\rendergl.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -851,14 +836,6 @@
 			<File
 				RelativePath="..\src\renderparticles.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -880,14 +857,6 @@
 			<File
 				RelativePath="..\src\rendertext.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -933,14 +902,6 @@
 			<File
 				RelativePath="..\src\client.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -962,14 +923,6 @@
 			<File
 				RelativePath="..\src\clientgame.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1060,14 +1013,6 @@
 			<File
 				RelativePath="..\src\server.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					>
@@ -1107,6 +1052,14 @@
 				<File
 					RelativePath="..\enet\callbacks.c"
 					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -1115,6 +1068,30 @@
 							UsePrecompiledHeader="0"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Profile|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Standalone|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Standalone Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\enet\host.c"
@@ -1376,14 +1353,6 @@
 			<File
 				RelativePath="..\src\editing.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1405,14 +1374,6 @@
 			<File
 				RelativePath="..\src\rndmap.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1434,14 +1395,6 @@
 			<File
 				RelativePath="..\src\world.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1463,14 +1416,6 @@
 			<File
 				RelativePath="..\src\worldio.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1492,14 +1437,6 @@
 			<File
 				RelativePath="..\src\worldlight.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1521,14 +1458,6 @@
 			<File
 				RelativePath="..\src\worldocull.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1550,14 +1479,6 @@
 			<File
 				RelativePath="..\src\worldrender.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1583,14 +1504,6 @@
 			<File
 				RelativePath="..\src\entities.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1612,14 +1525,6 @@
 			<File
 				RelativePath="..\src\physics.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1661,14 +1566,6 @@
 			<File
 				RelativePath="..\src\weapon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1694,14 +1591,6 @@
 			<File
 				RelativePath="..\src\command.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1723,14 +1612,6 @@
 			<File
 				RelativePath="..\src\console.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1772,14 +1653,6 @@
 			<File
 				RelativePath="..\src\main.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1801,21 +1674,12 @@
 			<File
 				RelativePath="..\src\menus.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1830,30 +1694,29 @@
 			<File
 				RelativePath="..\src\pch.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
 						PrecompiledHeaderThrough="pch.h"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Profile|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1862,7 +1725,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
+						UsePrecompiledHeader="0"
 						PrecompiledHeaderThrough="cube.h"
 					/>
 				</FileConfiguration>
@@ -1870,14 +1733,6 @@
 			<File
 				RelativePath="..\src\sound.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="2"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Standalone|Win32"
 					ExcludedFromBuild="true"
@@ -1899,14 +1754,6 @@
 			<File
 				RelativePath="..\src\tools.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>