diff --git a/engine/client/in_win.c b/engine/client/in_win.c
index f9242bb86..058034c75 100644
--- a/engine/client/in_win.c
+++ b/engine/client/in_win.c
@@ -1712,22 +1712,22 @@ qbyte        scantokey[128] =
 					{ 
 //  0           1       2       3       4       5       6       7 
 //  8           9       A       B       C       D       E       F 
-	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-	'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
-	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-	'\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 6 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0         // 7 
+	0  ,		27,		'1',		'2',		'3',	'4',		'5',			'6', 
+	'7',		'8',	'9',		'0',		'-',	'=',		K_BACKSPACE,	9,			// 0 
+	'q',		'w',	'e',		'r',		't',	'y',		'u',			'i', 
+	'o',		'p',	'[',		']',		13 ,	K_CTRL,		'a',			's',		// 1 
+	'd',		'f',	'g',		'h',		'j',	'k',		'l',			';', 
+	'\'',		'`',	K_SHIFT,	'\\',		'z',	'x',		'c',			'v',		// 2 
+	'b',		'n',	'm',		',',		'.',	'/',		K_SHIFT,		'*', 
+	K_ALT,		' ',	K_CAPSLOCK,	K_F1,		K_F2,	K_F3,		K_F4,			K_F5,		// 3 
+	K_F6,		K_F7,	K_F8,		K_F9,		K_F10,	K_PAUSE,	K_SCRLCK,		K_HOME, 
+	K_UPARROW,	K_PGUP,	'-',		K_LEFTARROW,'5',	K_RIGHTARROW,'+',			K_END,		// 4 
+	K_DOWNARROW,K_PGDN,	K_INS,		K_DEL,		0,      0,			0,				K_F11, 
+	K_F12,		0,		0,			0,			0,		0,			0,				0,			// 5 
+	0,			0,		0,			0,			0,		0,			0,				0, 
+	0,			0,		0,			0,			0,		0,			0,				0,			// 6 
+	0,			0,		0,			0,			0,		0,			0,				0, 
+	0,			0,		0,			0,			0,		0,			0,				0			// 7 
 					}; 
 
 qbyte        shiftscantokey[128] = 
@@ -1741,11 +1741,11 @@ qbyte        shiftscantokey[128] =
 	'D',    'F',    'G',    'H',    'J',    'K',    'L',    ':', 
 	'"' ,    '~',    K_SHIFT,'|',  'Z',    'X',    'C',    'V',      // 2 
 	'B',    'N',    'M',    '<',    '>',    '?',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    0  , K_HOME, 
+	K_ALT,' ',   K_CAPSLOCK  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
+	K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    K_SCRLCK  , K_HOME, 
 	K_UPARROW,K_PGUP,'_',K_LEFTARROW,'%',K_RIGHTARROW,'+',K_END, //4 
 	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
+	K_F12,  0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
 	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
 	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 6 
 	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
@@ -1824,7 +1824,9 @@ int MapKey (int vkey)
 		case 0x4e:
 			return K_KP_PLUS;
 		case 0x45:
-			return K_KP_NUMLOCK;
+			if ((vkey>>24)&1)	//not compleatly seperate
+				return K_KP_NUMLOCK;
+			break;
 		case 0x37:
 			return K_KP_STAR;
 //		case 0x
diff --git a/engine/client/keys.c b/engine/client/keys.c
index d9f4ff104..03a4bcf56 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -182,6 +182,9 @@ keyname_t keynames[] =
 	{"MWHEELUP", K_MWHEELUP},
 	{"MWHEELDOWN", K_MWHEELDOWN},
 
+	{"CAPSLOCK", K_CAPSLOCK},
+	{"SCROLLLOCK", K_SCRLCK},
+
 	{"SEMICOLON", ';'},	// because a raw semicolon seperates commands
 
 	{NULL,0}
@@ -468,7 +471,13 @@ void Key_Console (int key)
 
 	if (key == K_DOWNARROW)
 	{
-		if (history_line == edit_line) return;
+		if (history_line == edit_line)
+		{
+			key_lines[edit_line][0] = ']';
+			key_lines[edit_line][1] = '\0';
+			key_linepos=1;
+			return;
+		}
 		do
 		{
 			history_line = (history_line + 1) & 31;