diff --git a/polymer/build/src/dynamicgtk.c b/polymer/build/src/dynamicgtk.c
index aca2cca55..e934e09e2 100755
--- a/polymer/build/src/dynamicgtk.c
+++ b/polymer/build/src/dynamicgtk.c
@@ -21,7 +21,7 @@ int dynamicgtk_init(void)
     if (handle) return 1;
 
     handle = dlopen("libgtk-x11-2.0.so", RTLD_NOW|RTLD_GLOBAL);
-    if (!handle) return 0;
+    if (!handle) return -1;
 
     memset(&dynamicgtksyms, 0, sizeof(dynamicgtksyms));
 
diff --git a/polymer/build/src/glbuild.c b/polymer/build/src/glbuild.c
index 0b9004331..f15234c4a 100644
--- a/polymer/build/src/glbuild.c
+++ b/polymer/build/src/glbuild.c
@@ -594,7 +594,7 @@ int loadglulibrary(const char *driver)
     if (!hGLUDLL) return -1;
 #else
     gluhandle = dlopen(driver, RTLD_NOW|RTLD_GLOBAL);
-    if (!gluhandle) return 0;
+    if (!gluhandle) return -1;
 #endif
     glulibrary = strdup(driver);
 
diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index e9c32a6b6..7f642605f 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -189,13 +189,13 @@ all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX)
 endif
 
 eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)/$(ENGINELIB)
-	$(CC) -o $@ $^ $(JFAUDLIBS) $(LIBS) $(STDCPPLIB) -Wl,-Map=$@.map
+	$(CC) -o $@ $^ $(JFAUDLIBS) $(LIBS) $(STDCPPLIB) # -Wl,-Map=$@.map
 	-rm -f eduke32.sym$(EXESUFFIX)
 	cp eduke32$(EXESUFFIX) eduke32.sym$(EXESUFFIX)
 	strip eduke32$(EXESUFFIX)
 	
 mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB)
-	$(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) -Wl,-Map=$@.map
+	$(CC) $(CFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) # -Wl,-Map=$@.map
 	-rm -f mapster32.sym$(EXESUFFIX)
 	cp mapster32$(EXESUFFIX) mapster32.sym$(EXESUFFIX)
 	strip mapster32$(EXESUFFIX)
diff --git a/polymer/eduke32/eduke32.sln b/polymer/eduke32/eduke32.sln
index 226519e84..a534651dc 100644
--- a/polymer/eduke32/eduke32.sln
+++ b/polymer/eduke32/eduke32.sln
@@ -1,18 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcproj", "{8E7A6179-0B72-4073-8A4C-E8682D481DAE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD149A75-4507-404D-856C-E9DBC2E0B286} = {CD149A75-4507-404D-856C-E9DBC2E0B286}
-		{862365FE-811C-46B8-BB1E-B7189DA8D858} = {862365FE-811C-46B8-BB1E-B7189DA8D858}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jfaud", "..\jfaud\jfaud.vcproj", "{CD149A75-4507-404D-856C-E9DBC2E0B286}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpadec", "..\jfaud\mpadec\mpadec.vcproj", "{862365FE-811C-46B8-BB1E-B7189DA8D858}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD149A75-4507-404D-856C-E9DBC2E0B286} = {CD149A75-4507-404D-856C-E9DBC2E0B286}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,36 +31,6 @@ Global
 		{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD Release|Win32.Build.0 = HRP SD Release|Win32
 		{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD|Win32.ActiveCfg = HRP SD|Win32
 		{8E7A6179-0B72-4073-8A4C-E8682D481DAE}.HRP SD|Win32.Build.0 = HRP SD|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic JFAud|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic JFAud|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic Release JFAud|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic Release JFAud|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic Release|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic Release|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.Classic|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD JFAud|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD JFAud|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD Release JFAud|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD Release JFAud|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD Release|Win32.ActiveCfg = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD Release|Win32.Build.0 = Release|Win32
-		{CD149A75-4507-404D-856C-E9DBC2E0B286}.HRP SD|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic JFAud|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic JFAud|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic Release JFAud|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic Release JFAud|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic Release|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic Release|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.Classic|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD JFAud|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD JFAud|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD Release JFAud|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD Release JFAud|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD Release|Win32.ActiveCfg = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD Release|Win32.Build.0 = Release|Win32
-		{862365FE-811C-46B8-BB1E-B7189DA8D858}.HRP SD|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 118534120..af5fd1811 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -5641,14 +5641,14 @@ int parsetilegroups(scriptfile *script)
 
             while (script->textptr < end)
             {
-            tokenlist tgtokens2[] =
-                {
-                    { "tilegroup",  T_TILEGROUP   },
-                    { "tile",       T_TILE        },
-                    { "tilerange",  T_TILERANGE   },
-                    { "hotkey",     T_HOTKEY      },
-                    { "tiles",      T_TILES       },
-                };
+                tokenlist tgtokens2[] =
+                    {
+                        { "tilegroup",  T_TILEGROUP   },
+                        { "tile",       T_TILE        },
+                        { "tilerange",  T_TILERANGE   },
+                        { "hotkey",     T_HOTKEY      },
+                        { "tiles",      T_TILES       },
+                    };
 
                 int token = getatoken(script,tgtokens2,sizeof(tgtokens2)/sizeof(tokenlist));
                 switch (token)
@@ -5692,7 +5692,7 @@ int parsetilegroups(scriptfile *script)
                         {
                             if (i >= 0 && i < MAXTILES && s_TileGroups[tile_groups].nIds < MAX_TILE_GROUP_ENTRIES)
                                 s_TileGroups[tile_groups].pIds[s_TileGroups[tile_groups].nIds++] = i;
-        //                    OSD_Printf("added tile %d to group %d\n",i,g);
+                            //                    OSD_Printf("added tile %d to group %d\n",i,g);
                         }
                     }
                     break;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index c762a5e05..ee605533f 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -52,8 +52,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <shellapi.h>
 extern int getversionfromwebsite(char *buffer);
-#define BUILDDATE 20070413
-#define UPDATEINTERVAL 86400 // 24h
+#define BUILDDATE 20070501
+#define UPDATEINTERVAL 604800 // 1w
 #endif
 
 #define IDFSIZE 479985668
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 325541726..de06814e1 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -1005,7 +1005,7 @@ static void DefineProjectile(long lVar1, long lLabelID, long lVar2)
     return;
 }
 
-char CheckEventSync(int iEventID)
+static int CheckEventSync(int iEventID)
 {
     if (parsing_event || parsing_actor)
     {
@@ -1737,7 +1737,7 @@ static int parsecommand(void)
 
         for (i=0;i<labelcnt;i++)
         {
-            if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 && (labeltype[i] & LABEL_DEFINE))
+            if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 /* && (labeltype[i] & LABEL_DEFINE) */)
             {
                 if (i >= defaultlabelcnt)
                 {
@@ -1817,7 +1817,7 @@ static int parsecommand(void)
                 }
 
             for (i=0;i<labelcnt;i++)
-                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 && (labeltype[i] & LABEL_MOVE))
+                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 /* && (labeltype[i] & LABEL_MOVE) */)
                 {
                     warning++;
                     initprintf("%s:%ld: warning: duplicate move `%s' ignored.\n",compilefile,line_number,label+(labelcnt<<6));
@@ -2009,7 +2009,7 @@ static int parsecommand(void)
                 }
 
             for (i=0;i<labelcnt;i++)
-                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 && (labeltype[i] & LABEL_AI))
+                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 /* && (labeltype[i] & LABEL_AI) */)
                 {
                     warning++;
                     initprintf("%s:%ld: warning: duplicate ai `%s' ignored.\n",compilefile,line_number,label+(labelcnt<<6));
@@ -2076,7 +2076,7 @@ static int parsecommand(void)
                     return 0;
                 }
             for (i=0;i<labelcnt;i++)
-                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 && (labeltype[i] & LABEL_ACTION))
+                if (Bstrcmp(label+(labelcnt<<6),label+(i<<6)) == 0 /* && (labeltype[i] & LABEL_ACTION) */)
                 {
                     warning++;
                     initprintf("%s:%ld: warning: duplicate action `%s' ignored.\n",compilefile,line_number,label+(labelcnt<<6));
diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c
index 6faf037d5..81e382c82 100755
--- a/polymer/eduke32/source/gamevars.c
+++ b/polymer/eduke32/source/gamevars.c
@@ -1274,8 +1274,8 @@ static void ResetPointerVars(void)
     aGameVars[GetGameID("COOP")].lValue = (long)&ud.coop;
     aGameVars[GetGameID("MULTIMODE")].lValue = (long)&ud.multimode;
 
-    aGameVars[GetGameID("myconnectindex")].lValue =  (long)&myconnectindex;
-    aGameVars[GetGameID("screenpeek")].lValue =  (long)&screenpeek;
+    aGameVars[GetGameID("myconnectindex")].lValue = (long)&myconnectindex;
+    aGameVars[GetGameID("screenpeek")].lValue = (long)&screenpeek;
     aGameVars[GetGameID("currentweapon")].lValue = (long)&g_currentweapon;
     aGameVars[GetGameID("gs")].lValue = (long)&g_gs;
     aGameVars[GetGameID("looking_arc")].lValue = (long)&g_looking_arc;
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index f941e84d4..e1c9f5706 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -3388,7 +3388,7 @@ void processinput(int snum)
             if (p->buttonpalette && ud.from_bonus == 0)
             {
                 ud.from_bonus = ud.level_number+1;
-                if (ud.secretlevel > 0 && ud.secretlevel < 12) ud.level_number = ud.secretlevel-1;
+                if (ud.secretlevel > 0 && ud.secretlevel < MAXLEVELS) ud.level_number = ud.secretlevel-1;
                 ud.m_level_number = ud.level_number;
             }
             else