diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c
index 61484cf83..6555bf73a 100644
--- a/polymer/eduke32/build/src/polymost.c
+++ b/polymer/eduke32/build/src/polymost.c
@@ -6007,11 +6007,11 @@ void polymost_initosdfuncs(void)
         { "r_pr_overridespecular", "r_pr_overridespecular: overrides specular material power and factor values with values from the pr_specularpower and pr_specularfactor cvars; use it to fine-tune DEF tokens", (void*)&pr_overridespecular, CVAR_BOOL | CVAR_NOSAVE, 0, 0, 1 },
         { "r_pr_specularpower", "r_pr_specularpower: overriden specular material power", (void*)&pr_specularpower, CVAR_FLOAT | CVAR_NOSAVE, 0, -10, 1000 },
         { "r_pr_specularfactor", "r_pr_specularfactor: overriden specular material factor", (void*)&pr_specularfactor, CVAR_FLOAT | CVAR_NOSAVE, 0, -10, 1000 },
-        { "r_pr_atiworkaround", "r_pr_atiworkaround: enable this to workaround an ATI driver bug that causes sprite shadows to be square - you need to restart the renderer for it to take effect", (void*)&pr_atiworkaround, CVAR_BOOL, 0, 0, 1 },
+        { "r_pr_atiworkaround", "r_pr_atiworkaround: enable this to workaround an ATI driver bug that causes sprite shadows to be square - you need to restart the renderer for it to take effect", (void*)&pr_atiworkaround, CVAR_BOOL | CVAR_NOSAVE, 0, 0, 1 },
 #endif
 
-        { "r_models","r_models: enable/disable model rendering in >8-bit mode",(void *)&usemodels, CVAR_BOOL, 0, 0, 1 },
-        { "r_hightile","r_hightile: enable/disable hightile texture rendering in >8-bit mode",(void *)&usehightile, CVAR_BOOL, 0, 0, 1 },
+        { "r_models","r_models: enable/disable model rendering",(void *)&usemodels, CVAR_BOOL, 0, 0, 1 },
+        { "r_hightile","r_hightile: enable/disable hightile texture rendering",(void *)&usehightile, CVAR_BOOL, 0, 0, 1 },
 #endif
     };
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index a0bc6c275..f81ba70ef 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -50,7 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <shellapi.h>
 #endif
 
-#define BUILDDATE " 20090522"
+#define BUILDDATE " 20090616"
 
 static int32_t floor_over_floor;
 
@@ -192,10 +192,13 @@ void create_map_snapshot(void)
 
     tempcrc = crc32once((uint8_t *)&sector[0],sizeof(sectortype) * numsectors);
 
+
     if (mapstate->prev && mapstate->prev->numsectors == numsectors && mapstate->prev->sectcrc == tempcrc)
     {
         mapstate->sectors = mapstate->prev->sectors;
-        /*OSD_Printf("found a match between undo sectors\n");*/
+        mapstate->sectsiz = mapstate->prev->sectsiz;
+        mapstate->sectcrc = tempcrc;
+        /* OSD_Printf("found a match between undo sectors\n"); */
     }
     else
     {
@@ -208,10 +211,13 @@ void create_map_snapshot(void)
 
     tempcrc = crc32once((uint8_t *)&wall[0],sizeof(walltype) * numwalls);
 
+
     if (mapstate->prev && mapstate->prev->numwalls == numwalls && mapstate->prev->wallcrc == tempcrc)
     {
         mapstate->walls = mapstate->prev->walls;
-        /*OSD_Printf("found a match between undo walls\n");*/
+        mapstate->wallsiz = mapstate->prev->wallsiz;
+        mapstate->wallcrc = tempcrc;
+        /* OSD_Printf("found a match between undo walls\n"); */
     }
     else
     {
@@ -222,21 +228,24 @@ void create_map_snapshot(void)
         mapstate->wallcrc = tempcrc;
     }
 
-    tempcrc = crc32once((uint8_t *)&sprite[0],sizeof(spritetype) * numsprites);
+    tempcrc = crc32once((uint8_t *)&sprite[0],sizeof(spritetype) * MAXSPRITES);
 
     if (mapstate->prev && mapstate->prev->numsprites == numsprites && mapstate->prev->spritecrc == tempcrc)
     {
         mapstate->sprites = mapstate->prev->sprites;
+        mapstate->spritesiz = mapstate->prev->spritesiz;
+        mapstate->spritecrc = tempcrc;
         /*OSD_Printf("found a match between undo sprites\n");*/
     }
     else
     {
+        int32_t i = 0;
         spritetype *spri, *tspri = (spritetype *)Bcalloc(1, sizeof(spritetype) * numsprites);
         mapstate->sprites = (spritetype *)Bcalloc(1, sizeof(spritetype) * numsprites);
 
         spri = &tspri[0];
 
-        for (j=0; j<MAXSPRITES; j++)
+        for (j=0; j<MAXSPRITES && i < numsprites; j++,i++)
         {
             if (sprite[j].statnum != MAXSTATUS)
                 Bmemcpy(spri++,&sprite[j],sizeof(spritetype));
@@ -6906,7 +6915,7 @@ static void Keys3d(void)
             temphitag = sprite[searchwall].hitag;
             tempextra = sprite[searchwall].extra;
             tempxvel = sprite[searchwall].xvel;
-            tempyvel = sprite[searchwall].xvel;
+            tempyvel = sprite[searchwall].zvel;
             tempzvel = sprite[searchwall].xvel;
         }
         if (searchstat == 4)
@@ -10452,6 +10461,8 @@ static void Keys2d3d(void)
 void ExtCheckKeys(void)
 {
     static int32_t soundinit = 0;
+    static int32_t lastbstatus = 0;
+
     if (!soundinit)
     {
         g_numsounds = 0;
@@ -10510,6 +10521,7 @@ void ExtCheckKeys(void)
                 }
         }
     }
+    lastbstatus = bstatus;
     readmousebstatus(&bstatus);
 
     Keys2d3d();
@@ -10525,7 +10537,7 @@ void ExtCheckKeys(void)
     }
     else Keys2d();
 
-    if (asksave == 1 && bstatus == 0 && mapstate)
+    if (asksave == 1 && (bstatus + lastbstatus) == 0 && mapstate)
     {
 //        message("Saved undo rev %d",map_revision);
         create_map_snapshot();
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index 09824b0e5..7eaa5ac64 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -52,7 +52,7 @@ extern "C" {
 #include "macros.h"
 
 #define APPNAME "EDuke32"
-#define VERSION " 2.0.0devel"
+#define VERSION " 2.0.0unstable"
 // this is checked against http://eduke32.com/VERSION
 extern const char *s_buildDate;
 #define HEAD2 APPNAME VERSION
@@ -225,15 +225,17 @@ enum PlayerActionFlags_t {
     pfacing         = 65536
 };
 
-enum InventoryItem_t {
+enum DukeInventory_t {
     GET_STEROIDS,
     GET_SHIELD,
     GET_SCUBA,
     GET_HOLODUKE,
     GET_JETPACK,
-    GET_ACCESS   = 6,
+    GET_DUMMY1,
+    GET_ACCESS,
     GET_HEATS,
-    GET_FIRSTAID = 9,
+    GET_DUMMY2,
+    GET_FIRSTAID,
     GET_BOOTS
 };
 
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 87f1a4ac0..9e2b900aa 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -11269,7 +11269,7 @@ CLEAN_DIRECTORY:
 
     flushlogwindow = 0;
     loaddefinitions_game(duke3ddef, TRUE);
-    flushlogwindow = 1;
+//    flushlogwindow = 1;
 
     {
         struct strllist *s;
diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c
index d26360c9d..3dc40d3b5 100644
--- a/polymer/eduke32/source/global.c
+++ b/polymer/eduke32/source/global.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //-------------------------------------------------------------------------
 #include "duke3d.h"
 
-const char *s_buildDate = "20090613";
+const char *s_buildDate = "20090616";
 char *MusicPtr = NULL;
 int32_t g_musicSize;