diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 2686f8812..34c66c0f3 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -224,7 +224,7 @@ void CONFIG_SetDefaults( void )
     ud.detail = 1;
     ud.lockout = 0;
     ud.pwlockout[0] = '\0';
-    ud.crosshair = 0;
+    ud.crosshair = 1;
     ud.m_marker = 1;
     ud.m_ffire = 1;
     ud.levelstats = 0;
@@ -250,7 +250,7 @@ void CONFIG_SetDefaults( void )
     Bstrcpy(ud.ridecule[9], "AARRRGHHHHH!!!");
 
     // JBF 20031211
-    memset(KeyboardKeys, 0xff, sizeof(KeyboardKeys));
+    Bmemset(KeyboardKeys, 0xff, sizeof(KeyboardKeys));
     for (i=0; i < (int32)(sizeof(keydefaults)/sizeof(keydefaults[0]))/3; i++) {
         f = CONFIG_FunctionNameToNum( keydefaults[3*i+0] );
         if (f == -1) continue;
@@ -261,7 +261,7 @@ void CONFIG_SetDefaults( void )
         KeyboardKeys[f][1] = k2;
     }
 
-    memset(MouseFunctions, -1, sizeof(MouseFunctions));
+    Bmemset(MouseFunctions, -1, sizeof(MouseFunctions));
     for (i=0; i<MAXMOUSEBUTTONS; i++) {
         MouseFunctions[i][0] = CONFIG_FunctionNameToNum( mousedefaults[i] );
 
@@ -270,7 +270,7 @@ void CONFIG_SetDefaults( void )
         MouseFunctions[i][1] = CONFIG_FunctionNameToNum( mouseclickeddefaults[i] );
     }
 
-    memset(MouseDigitalFunctions, -1, sizeof(MouseDigitalFunctions));
+    Bmemset(MouseDigitalFunctions, -1, sizeof(MouseDigitalFunctions));
     for (i=0; i<MAXMOUSEAXES; i++) {
         MouseAnalogueScale[i] = 65536;
 
@@ -281,13 +281,13 @@ void CONFIG_SetDefaults( void )
     }
     CONTROL_SetMouseSensitivity(32768);
 
-    memset(JoystickFunctions, -1, sizeof(JoystickFunctions));
+    Bmemset(JoystickFunctions, -1, sizeof(JoystickFunctions));
     for (i=0; i<MAXJOYBUTTONS; i++) {
         JoystickFunctions[i][0] = CONFIG_FunctionNameToNum( joystickdefaults[i] );
         JoystickFunctions[i][1] = CONFIG_FunctionNameToNum( joystickclickeddefaults[i] );
     }
 
-    memset(JoystickDigitalFunctions, -1, sizeof(JoystickDigitalFunctions));
+    Bmemset(JoystickDigitalFunctions, -1, sizeof(JoystickDigitalFunctions));
     for (i=0; i<MAXJOYAXES; i++) {
         JoystickAnalogueScale[i] = 65536;
         JoystickAnalogueDead[i] = 1000;
diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h
index ef817c460..a08638e02 100644
--- a/polymer/eduke32/source/duke3d.h
+++ b/polymer/eduke32/source/duke3d.h
@@ -336,7 +336,7 @@ struct user_defs {
     long reccnt;
 
     int32 runkey_mode,statusbarscale,mouseaiming,weaponswitch,drawweapon;   // JBF 20031125
-	int32 brightskins,democams,color,pcolor[MAXPLAYERS], msgdisptime;
+	int32 brightskins,democams,color,pcolor[MAXPLAYERS],msgdisptime;
 
     int32 entered_name,screen_tilting,shadows,fta_on,executions,auto_run;
     int32 coords,tickrate,levelstats,m_coop,coop,screen_size,lockout,crosshair;
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 068fd4bbc..000e626af 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -365,9 +365,9 @@ void getpackets(void)
 
             if(j == connecthead && networkmode == 0 )
                 gameexit( " \nThe 'MASTER/First player' just quit the game.  All\nplayers are returned from the game.");
-            else 
+            else
             {
-	    	connectpoint2[numplayers] = -1;
+                connectpoint2[numplayers] = -1;
                 connectpoint2[numplayers-1] = connecthead;
             }
 
@@ -2003,7 +2003,7 @@ void operatefta(void)
     for(i=0;i<MAXUSERQUOTES;i++)
     {
         k = user_quote_time[i]; if (k <= 0) break;
-        l = Bstrlen(user_quote[i]); 
+        l = Bstrlen(user_quote[i]);
         while(l > TEXTWRAPLEN)
         {
             l -= TEXTWRAPLEN;
@@ -2048,7 +2048,7 @@ void operatefta(void)
         {
             if (user_quote_time[i] <= 0) break;
             k -= 8;
-            l = Bstrlen(user_quote[i]); 
+            l = Bstrlen(user_quote[i]);
             while(l > TEXTWRAPLEN)
             {
                 l -= TEXTWRAPLEN;
@@ -2223,11 +2223,11 @@ short strget_(int small,short x,short y,char *t,short dalen,short c)
         for(ii=0;ii<inputloc;ii++)
             b[ii] = '*';
         b[ii] = 0;
-        if(ps[myconnectindex].gm&MODE_TYPE) 
+        if(ps[myconnectindex].gm&MODE_TYPE)
             x = mpgametext(x,y,b,c,2+8+16);
         else x = gametext(x,y,b,c,2+8+16);
     }
-    else 
+    else
     {
         if(ps[myconnectindex].gm&MODE_TYPE)
             x = mpgametext(x,y,t,c,2+8+16);
@@ -2235,7 +2235,7 @@ short strget_(int small,short x,short y,char *t,short dalen,short c)
     }
     c = 4-(sintable[(totalclock<<4)&2047]>>11);
 
-    i = Bstrlen(t); 
+    i = Bstrlen(t);
     while(i > TEXTWRAPLEN-!small)
     {
         i -= TEXTWRAPLEN-!small;
@@ -2295,7 +2295,7 @@ void typemode(void)
                 }
                 adduserquote(recbuf);
                 quotebot += 8;
-                l = Bstrlen(recbuf); 
+                l = Bstrlen(recbuf);
                 while(l > TEXTWRAPLEN)
                 {
                     l -= TEXTWRAPLEN;
@@ -2898,7 +2898,7 @@ void displayrest(long smoothratio)
         OnEvent(EVENT_DISPLAYCROSSHAIR, ps[screenpeek].i, screenpeek, -1);
 
         if(GetGameVarID(g_iReturnVarID,ps[screenpeek].i,screenpeek) == 0)
-            rotatesprite((160L-(ps[myconnectindex].look_ang>>1))<<16,100L<<16,65536L,0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
+            rotatesprite((160L-(ps[myconnectindex].look_ang>>1))<<16,100L<<16,ud.crosshair>1?65536L>>(ud.crosshair-1):65536L,0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
     }
     if(ps[myconnectindex].gm&MODE_TYPE)
         typemode();
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 4d4f10fac..f147e33d6 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -800,6 +800,7 @@ LABELS userdefslabels[]= {
                              { "brightskins", USERDEFS_BRIGHTSKINS, 0, 0 },
                              { "democams", USERDEFS_DEMOCAMS, 0, 0 },
                              { "color", USERDEFS_COLOR, 0, 0 },
+                             { "msgdisptime", USERDEFS_MSGDISPTIME, 0, 0 },
                              { "", -1, 0, 0  }     // END OF LIST
                          };
 
diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h
index 5d9960e26..007bf4a55 100644
--- a/polymer/eduke32/source/gamedef.h
+++ b/polymer/eduke32/source/gamedef.h
@@ -285,7 +285,8 @@ enum userdefslabels {
 	USERDEFS_WEAPONSWITCH,
 	USERDEFS_BRIGHTSKINS,
     USERDEFS_DEMOCAMS,
-    USERDEFS_COLOR
+    USERDEFS_COLOR,
+    USERDEFS_MSGDISPTIME
 };
 
 enum sectorlabels {
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index 82ea3c979..c257b6773 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -611,6 +611,13 @@ void DoUserDef(char bSet, long lVar1, long lLabelID, long lVar2, short sActor, s
             SetGameVarID((int)lVar2, ud.color, sActor, sPlayer);
         break;
 
+    case USERDEFS_MSGDISPTIME:
+        if(bSet)
+            ud.msgdisptime = lValue;
+        else
+            SetGameVarID((int)lVar2, ud.msgdisptime, sActor, sPlayer);
+        break;
+
     default:
         break;
     }
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index bb551d4b5..386cd6757 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -797,7 +797,7 @@ void menus(void)
         for(i=0;i<10;i++)
         {
             if(current_menu == 20005 && i == last_probey) continue;
-            gametextpal(25,40+(8*i),ud.ridecule[i],MENUHIGHLIGHT(i),0);
+            gametextpal(25,40+(i<<3),ud.ridecule[i],MENUHIGHLIGHT(i),0);
         }
         break;
 
diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c
index 70ca1ba2a..721601e17 100644
--- a/polymer/eduke32/source/osdcmds.c
+++ b/polymer/eduke32/source/osdcmds.c
@@ -428,6 +428,7 @@ struct cvarmappings {
         { "cl_showcoords", "cl_showcoords: show your position in the game world", (void*)&ud.coords, CVAR_BOOL, 0, 0, 1 },
         { "r_precache", "r_precache: enable/disable the pre-level caching routine", (void*)&useprecache, CVAR_BOOL, 0, 0, 1 },
         { "cl_drawweapon", "cl_drawweapon: enable/disable weapon drawing", (void*)&ud.drawweapon, CVAR_INT, 0, 0, 2 },
+        { "crosshair", "crosshair: enable/disable crosshair", (void*)&ud.crosshair, CVAR_INT, 0, 0, 3 },
         { "cl_weaponswitch", "cl_weaponswitch: enable/disable auto weapon switching", (void*)&ud.weaponswitch, CVAR_INT|256, 0, 0, 3 },
         { "cl_autoaim", "cl_autoaim: enable/disable weapon autoaim", (void*)&AutoAim, CVAR_INT|256, 0, 0, 2 },
         { "cl_messagetime", "cl_messagetime: length of time to display multiplayer chat messages\n", (void*)&ud.msgdisptime, CVAR_INT, 0, 0, 3600 },
@@ -625,7 +626,7 @@ int registerosdcommands(void)
     OSD_RegisterFunction("give","give <all|health|weapons|ammo|armor|keys|inventory>: gives requested item", osdcmd_give);
     OSD_RegisterFunction("noclip","noclip: toggles clipping mode", osdcmd_noclip);
 
-    OSD_RegisterFunction("setstatusbarscale","setstatusbarscale <percent>: changes the status bar scale", osdcmd_setstatusbarscale);
+    OSD_RegisterFunction("cl_statusbarscale","cl_statusbarscale: changes the status bar scale", osdcmd_setstatusbarscale);
     OSD_RegisterFunction("sensitivity","sensitivity <value>: changes the mouse sensitivity", osdcmd_sensitivity);
     OSD_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",osdcmd_spawn);
     OSD_RegisterFunction("setvar","setvar <gamevar> <value>: sets the value of a gamevar", osdcmd_setvar);