diff --git a/polymer/build/include/startwin.editor.h b/polymer/build/include/startwin.editor.h
index de855590b..c0fff2210 100755
--- a/polymer/build/include/startwin.editor.h
+++ b/polymer/build/include/startwin.editor.h
@@ -3,8 +3,8 @@
 #define WIN_STARTWINPAGE_CONFIG 2000
 #define WIN_STARTWIN_BITMAP	100	// banner bitmap
 #define WIN_STARTWIN_TABCTL	101
-#define WIN_STARTWIN_CANCEL	102
-#define WIN_STARTWIN_START	103
+#define WIN_STARTWIN_CANCEL	IDCANCEL
+#define WIN_STARTWIN_START	IDOK
 
 #define WIN_STARTWIN_MESSAGES	104	// output list box
 
diff --git a/polymer/build/src/build.c b/polymer/build/src/build.c
index 47b62f275..efd90267d 100644
--- a/polymer/build/src/build.c
+++ b/polymer/build/src/build.c
@@ -192,7 +192,7 @@ void AutoAlignWalls(long nWall0, long ply);
 long gettile(long tilenum);
 
 long menuselect(void);
-long getfilenames(char *path, char kind[6]);
+long getfilenames(char *path, char *kind);
 void clearfilenames(void);
 
 void clearkeys(void) { memset(keystatus,0,sizeof(keystatus)); }
@@ -6416,7 +6416,7 @@ void clearfilenames(void)
     numfiles = numdirs = 0;
 }
 
-long getfilenames(char *path, char kind[6])
+long getfilenames(char *path, char *kind)
 {
     CACHE1D_FIND_REC *r;
 
diff --git a/polymer/build/src/startwin.editor.c b/polymer/build/src/startwin.editor.c
index 657b94cb7..04fdfd319 100755
--- a/polymer/build/src/startwin.editor.c
+++ b/polymer/build/src/startwin.editor.c
@@ -131,6 +131,8 @@ static void SetPage(int n)
     ShowWindow(pages[cur],SW_HIDE);
     SendMessage(tab, TCM_SETCURSEL, n, 0);
     ShowWindow(pages[n],SW_SHOW);
+
+    SetFocus(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL));
 }
 
 static void EnableConfig(int n)
diff --git a/polymer/build/src/startwin.game.c b/polymer/build/src/startwin.game.c
index efbe8b8e4..a9e7df3dd 100755
--- a/polymer/build/src/startwin.game.c
+++ b/polymer/build/src/startwin.game.c
@@ -107,6 +107,8 @@ static void SetPage(int n)
     ShowWindow(pages[cur],SW_HIDE);
     SendMessage(tab, TCM_SETCURSEL, n, 0);
     ShowWindow(pages[n],SW_SHOW);
+
+    SetFocus(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL));
 }
 
 static void EnableConfig(int n)
diff --git a/polymer/build/src/startwin.game.h b/polymer/build/src/startwin.game.h
index ee446bf2a..dce57bdd6 100755
--- a/polymer/build/src/startwin.game.h
+++ b/polymer/build/src/startwin.game.h
@@ -3,8 +3,8 @@
 #define WIN_STARTWINPAGE_CONFIG 2000
 #define WIN_STARTWIN_BITMAP	100	// banner bitmap
 #define WIN_STARTWIN_TABCTL	101
-#define WIN_STARTWIN_CANCEL	102
-#define WIN_STARTWIN_START	103
+#define WIN_STARTWIN_CANCEL	IDCANCEL
+#define WIN_STARTWIN_START	IDOK
 
 #define WIN_STARTWIN_MESSAGES	104	// output list box
 
diff --git a/polymer/eduke32/rsrc/manifest.build.xml b/polymer/eduke32/rsrc/manifest.build.xml
new file mode 100755
index 000000000..7eca5865e
--- /dev/null
+++ b/polymer/eduke32/rsrc/manifest.build.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="EDuke32.Mapster32"
+    type="win32"
+/>
+<description>Mapster32 for EDuke32</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/polymer/eduke32/rsrc/eduke32.manifest b/polymer/eduke32/rsrc/manifest.game.xml
similarity index 82%
rename from polymer/eduke32/rsrc/eduke32.manifest
rename to polymer/eduke32/rsrc/manifest.game.xml
index 7b68b5151..ae2e29158 100755
--- a/polymer/eduke32/rsrc/eduke32.manifest
+++ b/polymer/eduke32/rsrc/manifest.game.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    name="EDuke32"
-    processorArchitecture="x86"
     version="1.0.0.0"
-    type="win32"/>
+    processorArchitecture="X86"
+    name="EDuke32"
+    type="win32"
+/>
 <description>EDuke32</description>
 <dependency>
     <dependentAssembly>
@@ -12,7 +13,7 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="x86"
+            processorArchitecture="X86"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 3347f3688..d269bcecd 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "util_lib.h"
 
-#define VERSION " 1.4.0 beta 2"
+#define VERSION " 1.4.0svn"
 
 #define HEAD  "EDuke32"VERSION" (shareware mode)"
 #define HEAD2 "EDuke32"VERSION
@@ -8424,8 +8424,6 @@ void freeconmem(void)
 
 void Shutdown( void )
 {
-    int i;
-
     SoundShutdown();
     MusicShutdown();
     uninittimer();
diff --git a/polymer/eduke32/source/misc/buildres.rc b/polymer/eduke32/source/misc/buildres.rc
index d92bf07dc..6d89a5d4b 100644
--- a/polymer/eduke32/source/misc/buildres.rc
+++ b/polymer/eduke32/source/misc/buildres.rc
@@ -1,35 +1,34 @@
-#include <windows.h>
-#include <commctrl.h>
-#include "startwin.editor.h"
+#include <windows.h>
+#include <commctrl.h>
+#include "startwin.editor.h"
 
-1 24 "rsrc/eduke32.manifest"
-
-RSRC_ICON ICON "rsrc/build_icon.ico"
-RSRC_BMP BITMAP "rsrc/build.bmp"
-
-WIN_STARTWIN DIALOGEX DISCARDABLE  20, 40, 260, 200
-STYLE DS_MODALFRAME | DS_CENTER | DS_SETFONT | DS_FIXEDSYS | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
-CAPTION "Startup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "", WIN_STARTWIN_BITMAP, "STATIC", SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 32, 32
-	CONTROL "", WIN_STARTWIN_TABCTL, WC_TABCONTROL, WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 5, 250, 170
-	CONTROL "&Start", WIN_STARTWIN_START, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 154, 180, 48, 14
-	CONTROL "&Cancel", WIN_STARTWIN_CANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 207, 180, 48, 14
-
-	CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
-END
-
-WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE  20, 40, 279, 168
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "&2D Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 8, 50, 8
-	CONTROL "",            IDC2DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
-	CONTROL "&Fullscreen", IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
-	CONTROL "&3D Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 24, 50, 8
-	CONTROL "",            IDC3DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 22, 80, 56
-	CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
-END
-
+RSRC_ICON ICON "rsrc/build_icon.ico"
+RSRC_BMP BITMAP "rsrc/build.bmp"
+
+WIN_STARTWIN DIALOGEX DISCARDABLE  20, 40, 260, 200
+STYLE DS_MODALFRAME | DS_CENTER | DS_SETFONT | DS_FIXEDSYS | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "Startup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL "", WIN_STARTWIN_BITMAP, "STATIC", SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 32, 32
+	CONTROL "", WIN_STARTWIN_TABCTL, WC_TABCONTROL, WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 5, 250, 170
+	CONTROL "&Start", WIN_STARTWIN_START, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 154, 180, 48, 14
+	CONTROL "&Cancel", WIN_STARTWIN_CANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 207, 180, 48, 14
+
+	CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
+END
+
+WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE  20, 40, 279, 168
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL "&2D Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 8, 50, 8
+	CONTROL "",            IDC2DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
+	CONTROL "&Fullscreen", IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
+	CONTROL "&3D Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 24, 50, 8
+	CONTROL "",            IDC3DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 22, 80, 56
+	CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
+END
+
+1 24 "rsrc/manifest.build.xml"
diff --git a/polymer/eduke32/source/misc/gameres.rc b/polymer/eduke32/source/misc/gameres.rc
index 5fec43d25..43543450e 100644
--- a/polymer/eduke32/source/misc/gameres.rc
+++ b/polymer/eduke32/source/misc/gameres.rc
@@ -1,47 +1,46 @@
-#include <windows.h>
-#include <commctrl.h>
-#include "startwin.game.h"
+#include <windows.h>
+#include <commctrl.h>
+#include "startwin.game.h"
 
-1 24 "rsrc/eduke32.manifest"
-
-RSRC_ICON ICON "rsrc/game_icon.ico"
-RSRC_ICON+1 ICON "rsrc/game_icon.ico"
-RSRC_ICON+2 ICON "rsrc/game_icon.ico"
-RSRC_BMP BITMAP "rsrc/game.bmp"
-
-WIN_STARTWIN DIALOGEX DISCARDABLE  20, 40, 260, 200
-STYLE DS_MODALFRAME | DS_CENTER | DS_SETFONT | DS_FIXEDSYS | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
-CAPTION "Startup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "", WIN_STARTWIN_BITMAP, "STATIC", SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 32, 32
-	CONTROL "", WIN_STARTWIN_TABCTL, WC_TABCONTROL, WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 5, 250, 170
-	CONTROL "&Start", WIN_STARTWIN_START, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 154, 180, 48, 14
-	CONTROL "&Cancel", WIN_STARTWIN_CANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 207, 180, 48, 14
-
-	CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
-END
-
-WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE  20, 40, 279, 168
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-BEGIN
-	CONTROL "&Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 8, 50, 8
-	CONTROL "",               IDCVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
-	CONTROL "&Fullscreen",    IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
-
-	CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
-	CONTROL "",               IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
-	CONTROL "&MIDI device:",  -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 44, 50, 8
-	CONTROL "",               IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
-	CONTROL "C&D drive:",     -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 60, 50, 8
-	CONTROL "",               IDCCDADEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 58, 40, 56
-
-	CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 80, 50, 8
-	CONTROL "Mo&use",         IDCINPUTMOUSE, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 80, 49, 8
-	CONTROL "&Joystick",      IDCINPUTJOY, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 110, 80, 49, 8
-
-	CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
-END
-
+RSRC_ICON ICON "rsrc/game_icon.ico"
+RSRC_ICON+1 ICON "rsrc/game_icon.ico"
+RSRC_ICON+2 ICON "rsrc/game_icon.ico"
+RSRC_BMP BITMAP "rsrc/game.bmp"
+
+WIN_STARTWIN DIALOGEX DISCARDABLE  20, 40, 260, 200
+STYLE DS_MODALFRAME | DS_CENTER | DS_SETFONT | DS_FIXEDSYS | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "Startup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL "", WIN_STARTWIN_BITMAP, "STATIC", SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 32, 32
+	CONTROL "", WIN_STARTWIN_TABCTL, WC_TABCONTROL, WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 5, 250, 170
+	CONTROL "&Start", WIN_STARTWIN_START, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 154, 180, 48, 14
+	CONTROL "&Cancel", WIN_STARTWIN_CANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 207, 180, 48, 14
+
+	CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
+END
+
+WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE  20, 40, 279, 168
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL "&Video mode:",   -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 8, 50, 8
+	CONTROL "",               IDCVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
+	CONTROL "&Fullscreen",    IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
+
+	CONTROL "S&ound driver:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 28, 50, 8
+	CONTROL "",               IDCSOUNDDRV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 26, 110, 56
+	CONTROL "&MIDI device:",  -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 44, 50, 8
+	CONTROL "",               IDCMIDIDEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 42, 110, 56
+	CONTROL "C&D drive:",     -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 60, 50, 8
+	CONTROL "",               IDCCDADEV, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 58, 40, 56
+
+	CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 80, 50, 8
+	CONTROL "Mo&use",         IDCINPUTMOUSE, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 60, 80, 49, 8
+	CONTROL "&Joystick",      IDCINPUTJOY, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 110, 80, 49, 8
+
+	CONTROL "&Always show configuration on start", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
+END
+
+1 24 "rsrc/manifest.game.xml"
diff --git a/polymer/eduke32/source/startwin.game.c b/polymer/eduke32/source/startwin.game.c
index b5dc6ceb8..97fc4d5c5 100755
--- a/polymer/eduke32/source/startwin.game.c
+++ b/polymer/eduke32/source/startwin.game.c
@@ -119,6 +119,8 @@ static void SetPage(int n)
     ShowWindow(pages[cur],SW_HIDE);
     SendMessage(tab, TCM_SETCURSEL, n, 0);
     ShowWindow(pages[n],SW_SHOW);
+
+    SetFocus(GetDlgItem(startupdlg, WIN_STARTWIN_TABCTL));
 }
 
 static void EnableConfig(int n)
diff --git a/polymer/eduke32/source/startwin.game.h b/polymer/eduke32/source/startwin.game.h
index 358ed0135..446a9b087 100755
--- a/polymer/eduke32/source/startwin.game.h
+++ b/polymer/eduke32/source/startwin.game.h
@@ -3,8 +3,8 @@
 #define WIN_STARTWINPAGE_CONFIG 2000
 #define WIN_STARTWIN_BITMAP	100	// banner bitmap
 #define WIN_STARTWIN_TABCTL	101
-#define WIN_STARTWIN_CANCEL	102
-#define WIN_STARTWIN_START	103
+#define WIN_STARTWIN_CANCEL	IDCANCEL
+#define WIN_STARTWIN_START	IDOK
 
 #define WIN_STARTWIN_MESSAGES	104	// output list box