diff --git a/include/debug.h b/include/debug.h
index 337e8497..78805b70 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -23,6 +23,7 @@ bool DEBUG_IntBreakpoint(Bit8u intNum);
 void DEBUG_Enable(void);
 void DEBUG_CheckExecuteBreakpoint(Bit16u seg, Bit32u off);
 bool DEBUG_ExitLoop(void);
+void DEBUG_RefreshPage(char scroll);
 
 extern Bitu cycle_count;
 extern Bitu debugCallback;
diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp
index 4ac98ebc..122ba85d 100644
--- a/src/debug/debug.cpp
+++ b/src/debug/debug.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: debug.cpp,v 1.59 2004-08-31 23:11:35 harekiet Exp $ */
+/* $Id: debug.cpp,v 1.60 2004-10-23 15:15:06 qbix79 Exp $ */
 
 #include <string.h>
 #include <list>
@@ -387,7 +387,7 @@ bool CBreakpoint::CheckBreakpoint(Bitu seg, Bitu off)
 				Bit8u value = mem_readb(address);
 				if (bp->GetValue() != value) {
 					// Yup, memory value changed
-					DEBUG_ShowMsg("DEBUG: Memory breakpoint %s: %04X:%04X - %02X -> %02X",(bp->GetType()==BKPNT_MEMORY_PROT)?"(Prot)":"",bp->GetSegment(),bp->GetOffset(),bp->GetValue(),value);
+					DEBUG_ShowMsg("DEBUG: Memory breakpoint %s: %04X:%04X - %02X -> %02X\n",(bp->GetType()==BKPNT_MEMORY_PROT)?"(Prot)":"",bp->GetSegment(),bp->GetOffset(),bp->GetValue(),value);
 					bp->SetValue(value);
 					return true;
 				};		
@@ -527,18 +527,17 @@ void CBreakpoint::ShowList(void)
 	for(i=BPoints.begin(); i != BPoints.end(); i++) {
 		CBreakpoint* bp = static_cast<CBreakpoint*>(*i);
 		if (bp->GetType()==BKPNT_PHYSICAL) {
-			wprintw(dbg.win_out,"%02X. BP %04X:%04X\n",nr,bp->GetSegment(),bp->GetOffset());
+			DEBUG_ShowMsg("%02X. BP %04X:%04X\n",nr,bp->GetSegment(),bp->GetOffset());
 			nr++;
 		} else if (bp->GetType()==BKPNT_INTERRUPT) {
-			if (bp->GetValue()==BPINT_ALL)	wprintw(dbg.win_out,"%02X. BPINT %02X\n",nr,bp->GetIntNr());					
-			else							wprintw(dbg.win_out,"%02X. BPINT %02X AH=%02X\n",nr,bp->GetIntNr(),bp->GetValue());
+			if (bp->GetValue()==BPINT_ALL)	DEBUG_ShowMsg("%02X. BPINT %02X\n",nr,bp->GetIntNr());					
+			else							DEBUG_ShowMsg("%02X. BPINT %02X AH=%02X\n",nr,bp->GetIntNr(),bp->GetValue());
 			nr++;
 		} else if (bp->GetType()==BKPNT_MEMORY) {
-			wprintw(dbg.win_out,"%02X. BPMEM %04X:%04X (%02X)\n",nr,bp->GetSegment(),bp->GetOffset(),bp->GetValue());
+			DEBUG_ShowMsg("%02X. BPMEM %04X:%04X (%02X)\n",nr,bp->GetSegment(),bp->GetOffset(),bp->GetValue());
 			nr++;
 		};
 	}
-	wrefresh(dbg.win_out);
 };
 
 bool DEBUG_Breakpoint(void)
@@ -883,7 +882,7 @@ bool ParseCommand(char* str)
 		};
 		name[15] = 0;
 		
-		DEBUG_ShowMsg("DEBUG: Created debug var %s at %04X:%04X",name,seg,ofs);
+		DEBUG_ShowMsg("DEBUG: Created debug var %s at %04X:%04X\n",name,seg,ofs);
 		CDebugVar::InsertVariable(name,GetAddress(seg,ofs));
 		return true;
 	}
@@ -897,8 +896,8 @@ bool ParseCommand(char* str)
 			else { name[i] = 0; break; };
 		};
 		name[12] = 0;		
-		if (CDebugVar::SaveVars(name))	DEBUG_ShowMsg("DEBUG: Variable list save (%s) : ok.",name);
-		else							DEBUG_ShowMsg("DEBUG: Variable list save (%s) : failure",name);
+		if (CDebugVar::SaveVars(name))	DEBUG_ShowMsg("DEBUG: Variable list save (%s) : ok.\n",name);
+		else							DEBUG_ShowMsg("DEBUG: Variable list save (%s) : failure\n",name);
 		return true;
 	}
 
@@ -911,15 +910,15 @@ bool ParseCommand(char* str)
 			else { name[i] = 0; break; };
 		};
 		name[12] = 0;		
-		if (CDebugVar::LoadVars(name))	DEBUG_ShowMsg("DEBUG: Variable list load (%s) : ok.",name);
-		else							DEBUG_ShowMsg("DEBUG: Variable list load (%s) : failure",name);
+		if (CDebugVar::LoadVars(name))	DEBUG_ShowMsg("DEBUG: Variable list load (%s) : ok.\n",name);
+		else							DEBUG_ShowMsg("DEBUG: Variable list load (%s) : failure\n",name);
 		return true;
 	}
 	found = strstr(str,"SR ");
 	if (found) { // Set register value
 		found+=2;
-		if (ChangeRegister(found))	DEBUG_ShowMsg("DEBUG: Set Register success.");
-		else						DEBUG_ShowMsg("DEBUG: Set Register failure.");
+		if (ChangeRegister(found))	DEBUG_ShowMsg("DEBUG: Set Register success.\n");
+		else						DEBUG_ShowMsg("DEBUG: Set Register failure.\n");
 		return true;
 	}	
 	found = strstr(str,"SM ");
@@ -936,7 +935,7 @@ bool ParseCommand(char* str)
 				count++;
 			}
 		};
-		DEBUG_ShowMsg("DEBUG: Memory changed.");
+		DEBUG_ShowMsg("DEBUG: Memory changed.\n");
 		return true;
 	}
 
@@ -946,7 +945,7 @@ bool ParseCommand(char* str)
 		Bit16u seg = (Bit16u)GetHexValue(found,found);found++; // skip ":"
 		Bit32u ofs = GetHexValue(found,found);
 		CBreakpoint::AddBreakpoint(seg,ofs,false);
-		DEBUG_ShowMsg("DEBUG: Set breakpoint at %04X:%04X",seg,ofs);
+		DEBUG_ShowMsg("DEBUG: Set breakpoint at %04X:%04X\n",seg,ofs);
 		return true;
 	}
 #if C_HEAVY_DEBUG
@@ -956,7 +955,7 @@ bool ParseCommand(char* str)
 		Bit16u seg = (Bit16u)GetHexValue(found,found);found++; // skip ":"
 		Bit32u ofs = GetHexValue(found,found);
 		CBreakpoint::AddMemBreakpoint(seg,ofs);
-		DEBUG_ShowMsg("DEBUG: Set memory breakpoint at %04X:%04X",seg,ofs);
+		DEBUG_ShowMsg("DEBUG: Set memory breakpoint at %04X:%04X\n",seg,ofs);
 		return true;
 	}
 	found = strstr(str,"BPPM ");
@@ -966,7 +965,7 @@ bool ParseCommand(char* str)
 		Bit32u ofs = GetHexValue(found,found);
 		CBreakpoint* bp = CBreakpoint::AddMemBreakpoint(seg,ofs);
 		if (bp) bp->SetType(BKPNT_MEMORY_PROT);
-		DEBUG_ShowMsg("DEBUG: Set prot-mode memory breakpoint at %04X:%08X",seg,ofs);
+		DEBUG_ShowMsg("DEBUG: Set prot-mode memory breakpoint at %04X:%08X\n",seg,ofs);
 		return true;
 	}
 	found = strstr(str,"BPLM ");
@@ -975,7 +974,7 @@ bool ParseCommand(char* str)
 		Bitu ofs		= GetHexValue(found,found);
 		CBreakpoint* bp = CBreakpoint::AddMemBreakpoint(0,ofs);
 		if (bp) bp->SetType(BKPNT_MEMORY_LINEAR);
-		DEBUG_ShowMsg("DEBUG: Set linear memory breakpoint at %08X",ofs);
+		DEBUG_ShowMsg("DEBUG: Set linear memory breakpoint at %08X\n",ofs);
 		return true;
 	}
 #endif
@@ -986,17 +985,17 @@ bool ParseCommand(char* str)
 		Bit8u valAH	= (Bit8u)GetHexValue(found,found);
 		if ((valAH==0x00) && (*found=='*')) {
 			CBreakpoint::AddIntBreakpoint(intNr,BPINT_ALL,false);
-			DEBUG_ShowMsg("DEBUG: Set interrupt breakpoint at INT %02X",intNr);
+			DEBUG_ShowMsg("DEBUG: Set interrupt breakpoint at INT %02X\n",intNr);
 		} else {
 			CBreakpoint::AddIntBreakpoint(intNr,valAH,false);
-			DEBUG_ShowMsg("DEBUG: Set interrupt breakpoint at INT %02X AH=%02X",intNr,valAH);
+			DEBUG_ShowMsg("DEBUG: Set interrupt breakpoint at INT %02X AH=%02X\n",intNr,valAH);
 		}
 		return true;
 	}
 	found = strstr(str,"BPLIST");
 	if (found) {
-		wprintw(dbg.win_out,"Breakpoint list:\n");
-		wprintw(dbg.win_out,"-------------------------------------------------------------------------\n");
+		DEBUG_ShowMsg("Breakpoint list:\n");
+		DEBUG_ShowMsg("-------------------------------------------------------------------------\n");
 		CBreakpoint::ShowList();
 		return true;
 	};
@@ -1007,7 +1006,7 @@ bool ParseCommand(char* str)
 		Bit8u bpNr	= (Bit8u)GetHexValue(found,found); 
 		if ((bpNr==0x00) && (*found=='*')) { // Delete all
 			CBreakpoint::DeleteAll();		
-			DEBUG_ShowMsg("DEBUG: Breakpoints deleted.");
+			DEBUG_ShowMsg("DEBUG: Breakpoints deleted.\n");
 		} else {		
 			// delete single breakpoint
 			CBreakpoint::DeleteByIndex(bpNr);
@@ -1019,7 +1018,7 @@ bool ParseCommand(char* str)
 		found++;
 		Bit16u codeSeg = (Bit16u)GetHexValue(found,found); found++;
 		Bit32u codeOfs = GetHexValue(found,found);
-		DEBUG_ShowMsg("DEBUG: Set code overview to %04X:%04X",codeSeg,codeOfs);
+		DEBUG_ShowMsg("DEBUG: Set code overview to %04X:%04X\n",codeSeg,codeOfs);
 		codeViewData.useCS	= codeSeg;
 		codeViewData.useEIP = codeOfs;
 		return true;
@@ -1029,18 +1028,18 @@ bool ParseCommand(char* str)
 		found++;
 		dataSeg = (Bit16u)GetHexValue(found,found); found++;
 		dataOfs = GetHexValue(found,found);
-		DEBUG_ShowMsg("DEBUG: Set data overview to %04X:%04X",dataSeg,dataOfs);
+		DEBUG_ShowMsg("DEBUG: Set data overview to %04X:%04X\n",dataSeg,dataOfs);
 		return true;
 	}
 #if C_HEAVY_DEBUG
 	found = strstr(str,"LOG ");
 	if (found) { // Create Cpu log file
 		found+=4;
-		DEBUG_ShowMsg("DEBUG: Starting log");
+		DEBUG_ShowMsg("DEBUG: Starting log\n");
 //		DEBUG_Log_Loop(GetHexValue(found,found));
 		cpuLogFile = fopen("LOGCPU.TXT","wt");
 		if (!cpuLogFile) {
-			DEBUG_ShowMsg("DEBUG: Logfile couldnt be created.");
+			DEBUG_ShowMsg("DEBUG: Logfile couldnt be created.\n");
 			return false;
 		}
 		cpuLog = true;
@@ -1057,7 +1056,7 @@ bool ParseCommand(char* str)
 	if (found) { // Create Cpu log file
 		found+=4;
 		Bit8u intNr = (Bit8u)GetHexValue(found,found);
-		DEBUG_ShowMsg("DEBUG: Tracing INT %02X",intNr);
+		DEBUG_ShowMsg("DEBUG: Tracing INT %02X\n",intNr);
 		CPU_HW_Interrupt(intNr);
 		SetCodeWinStart();
 		return true;
@@ -1066,7 +1065,7 @@ bool ParseCommand(char* str)
 	if (found) { // Create Cpu log file
 		found+=4;
 		Bit8u intNr = (Bit8u)GetHexValue(found,found);
-		DEBUG_ShowMsg("DEBUG: Starting INT %02X",intNr);
+		DEBUG_ShowMsg("DEBUG: Starting INT %02X\n",intNr);
 		CBreakpoint::AddBreakpoint		(SegValue(cs),reg_eip, true);
 		CBreakpoint::ActivateBreakpoints(SegPhys(cs)+reg_eip-1,true);
 		debugging=false;
@@ -1081,9 +1080,9 @@ bool ParseCommand(char* str)
 		while (found[0]==' ') found++;
 		char out1[200],out2[200];
 		GetDescriptorInfo(found,out1,out2);
-		DEBUG_ShowMsg("SelectorInfo %s:",found);
-		DEBUG_ShowMsg("%s",out1);
-		DEBUG_ShowMsg("%s",out2);
+		DEBUG_ShowMsg("SelectorInfo %s:\n",found);
+		DEBUG_ShowMsg("%s\n",out1);
+		DEBUG_ShowMsg("%s\n",out2);
 	};
 
 	found = strstr(str,"GDT");
@@ -1118,7 +1117,7 @@ bool ParseCommand(char* str)
 		if (found[0] != 0)
 		{
 			Bit8u intNr = (Bit8u)GetHexValue(found,found);
-			DEBUG_ShowMsg("DEBUG: Set code overview to interrupt handler %X",intNr);
+			DEBUG_ShowMsg("DEBUG: Set code overview to interrupt handler %X\n",intNr);
 			codeViewData.useCS	= mem_readw(intNr*4+2);
 			codeViewData.useEIP = mem_readw(intNr*4);
 			return true;
@@ -1130,7 +1129,7 @@ bool ParseCommand(char* str)
 		found += 9;
 		Bit8u num = GetHexValue(found,found);		
 		DPMI_CreateException(num,0xDD);
-		DEBUG_ShowMsg("Exception %04X",num);
+		DEBUG_ShowMsg("Exception %04X\n",num);
 	};
 */	
 
@@ -1138,56 +1137,55 @@ bool ParseCommand(char* str)
 	found = strstr(str,"HEAVYLOG");
 	if (found) { // Create Cpu log file
 		logHeavy = !logHeavy;
-		if (logHeavy)	DEBUG_ShowMsg("DEBUG: Heavy cpu logging on.");
-		else			DEBUG_ShowMsg("DEBUG: Heavy cpu logging off.");
+		if (logHeavy)	DEBUG_ShowMsg("DEBUG: Heavy cpu logging on.\n");
+		else			DEBUG_ShowMsg("DEBUG: Heavy cpu logging off.\n");
 		return true;
 	}
 #endif
 	if ((*str=='H') || (*str=='?')) {
-		wprintw(dbg.win_out,"Debugger keys:\n");
-		wprintw(dbg.win_out,"--------------------------------------------------------------------------\n");
-		wprintw(dbg.win_out,"F5                        - Run\n");
-		wprintw(dbg.win_out,"F9                        - Set/Remove breakpoint\n");
-		wprintw(dbg.win_out,"F10/F11                   - Step over / trace into instruction\n");
-		wprintw(dbg.win_out,"Up/Down                   - Move code view cursor\n");
-		wprintw(dbg.win_out,"Return                    - Enable command line input\n");
-		wprintw(dbg.win_out,"D/E/S/X/B                 - Set data view to DS:SI/ES:DI/SS:SP/DS:DX/ES:BX\n");
-		wprintw(dbg.win_out,"R/F                       - Scroll data view\n");
-		wprintw(dbg.win_out,"V                         - Toggle additional info\n");
-		wprintw(dbg.win_out,"Debugger commands (enter all values in hex or as register):\n");
-		wprintw(dbg.win_out,"--------------------------------------------------------------------------\n");
-		wprintw(dbg.win_out,"BP     [segment]:[offset] - Set breakpoint\n");
-		wprintw(dbg.win_out,"BPINT  [intNr] *          - Set interrupt breakpoint\n");
-		wprintw(dbg.win_out,"BPINT  [intNr] [ah]       - Set interrupt breakpoint with ah\n");
+		DEBUG_ShowMsg("Debugger keys:\n");
+		DEBUG_ShowMsg("--------------------------------------------------------------------------\n");
+		DEBUG_ShowMsg("F5                        - Run.\n");
+		DEBUG_ShowMsg("F9                        - Set/Remove breakpoint.\n");
+		DEBUG_ShowMsg("F10/F11                   - Step over / trace into instruction.\n");
+		DEBUG_ShowMsg("Up/Down                   - Move code view cursor.\n");
+		DEBUG_ShowMsg("Return                    - Enable command line input.\n");
+		DEBUG_ShowMsg("D/E/S/X/B                 - Set data view to DS:SI/ES:DI/SS:SP/DS:DX/ES:BX.\n");
+		DEBUG_ShowMsg("R/F                       - Scroll data view.\n");
+		DEBUG_ShowMsg("V                         - Toggle additional info.\n");
+		DEBUG_ShowMsg("Debugger commands (enter all values in hex or as register):\n");
+		DEBUG_ShowMsg("--------------------------------------------------------------------------\n");
+		DEBUG_ShowMsg("BP     [segment]:[offset] - Set breakpoint.\n");
+		DEBUG_ShowMsg("BPINT  [intNr] *          - Set interrupt breakpoint.\n");
+		DEBUG_ShowMsg("BPINT  [intNr] [ah]       - Set interrupt breakpoint with ah.\n");
 #if C_HEAVY_DEBUG
-		wprintw(dbg.win_out,"BPM    [segment]:[offset] - Set memory breakpoint (memory change)\n");
-		wprintw(dbg.win_out,"BPPM   [selector]:[offset]- Set pmode-memory breakpoint (memory change)\n");
-		wprintw(dbg.win_out,"BPLM   [linear address]   - Set linear memory breakpoint (memory change)\n");
+		DEBUG_ShowMsg("BPM    [segment]:[offset] - Set memory breakpoint (memory change).\n");
+		DEBUG_ShowMsg("BPPM   [selector]:[offset]- Set pmode-memory breakpoint (memory change).\n");
+		DEBUG_ShowMsg("BPLM   [linear address]   - Set linear memory breakpoint (memory change).\n");
 #endif
-		wprintw(dbg.win_out,"BPLIST                    - List breakpoints\n");		
-		wprintw(dbg.win_out,"BPDEL  [bpNr] / *         - Delete breakpoint nr / all\n");
-		wprintw(dbg.win_out,"C / D  [segment]:[offset] - Set code / data view address\n");
-		wprintw(dbg.win_out,"INT [nr] / INTT [nr]      - Execute / Trace into Iinterrupt\n");
-		wprintw(dbg.win_out,"LOG [num]                 - Write cpu log file\n");
+		DEBUG_ShowMsg("BPLIST                    - List breakpoints.\n");		
+		DEBUG_ShowMsg("BPDEL  [bpNr] / *         - Delete breakpoint nr / all.\n");
+		DEBUG_ShowMsg("C / D  [segment]:[offset] - Set code / data view address.\n");
+		DEBUG_ShowMsg("INT [nr] / INTT [nr]      - Execute / Trace into interrupt.\n");
 #if C_HEAVY_DEBUG
-		wprintw(dbg.win_out,"HEAVYLOG                  - Enable/Disable automatic cpu log for INT CD\n");
+		DEBUG_ShowMsg("LOG [num]                 - Write cpu log file.\n");
+		DEBUG_ShowMsg("HEAVYLOG                  - Enable/Disable automatic cpu when dosbox exits.\n");
 #endif
-		wprintw(dbg.win_out,"SR [reg] [value]          - Set register value\n");
-		wprintw(dbg.win_out,"SM [seg]:[off] [val] [.]..- Set memory with following values\n");	
+		DEBUG_ShowMsg("SR [reg] [value]          - Set register value.\n");
+		DEBUG_ShowMsg("SM [seg]:[off] [val] [.]..- Set memory with following values.\n");	
 	
-		wprintw(dbg.win_out,"IV [seg]:[off] [name]     - Create var name for memory address\n");
-		wprintw(dbg.win_out,"SV [filename]             - Save var list in file\n");
-		wprintw(dbg.win_out,"LV [seg]:[off] [name]     - Load var list from file\n");
+		DEBUG_ShowMsg("IV [seg]:[off] [name]     - Create var name for memory address.\n");
+		DEBUG_ShowMsg("SV [filename]             - Save var list in file.\n");
+		DEBUG_ShowMsg("LV [seg]:[off] [name]     - Load var list from file.\n");
 
-		wprintw(dbg.win_out,"MEMDUMP [seg]:[off] [len] - Write memory to file memdump.txt\n");
-		wprintw(dbg.win_out,"SELINFO [segName]         - Show selector info\n");
+		DEBUG_ShowMsg("MEMDUMP [seg]:[off] [len] - Write memory to file memdump.txt.\n");
+		DEBUG_ShowMsg("SELINFO [segName]         - Show selector info.\n");
 
-		wprintw(dbg.win_out,"INTVEC [filename]         - Writes interrupt vector table to file\n");
-		wprintw(dbg.win_out,"INTHAND [intNum]          - Set code view to interrupt handler\n");
+		DEBUG_ShowMsg("INTVEC [filename]         - Writes interrupt vector table to file.\n");
+		DEBUG_ShowMsg("INTHAND [intNum]          - Set code view to interrupt handler.\n");
 
-		wprintw(dbg.win_out,"H                         - Help\n");
+		DEBUG_ShowMsg("H                         - Help\n");
 		
-		wrefresh(dbg.win_out);
 		return TRUE;
 	}
 	return false;
@@ -1287,6 +1285,81 @@ char* AnalyzeInstruction(char* inst, bool saveSelector)
 			strcat(inst,"  ("); strcat(inst,descr); strcat(inst,")");
 		}
 	};
+	// Must be a jump
+	if (instu[0] == 'J')
+	{
+		bool jmp = 0;
+		switch (instu[1]) {
+		case 'A' :	{	jmp = !GETFLAGBOOL(CF) && !GETFLAGBOOL(ZF); // JA
+					}	break;
+		case 'B' :	{	if (instu[2] == 'E') {
+							jmp = GETFLAGBOOL(CF) && GETFLAGBOOL(ZF); // JBE
+						} else {
+							jmp = GETFLAGBOOL(CF); // JB
+						}
+					}	break;
+		case 'C' :	{	if (instu[2] == 'X') {
+							jmp = reg_cx == 0; // JCXZ
+						} else {
+							jmp = GETFLAGBOOL(CF); // JC
+						}
+					}	break;
+		case 'E' :	{	jmp = GETFLAGBOOL(ZF); // JE
+					}	break;
+		case 'G' :	{	if (instu[2] == 'E') {
+							jmp = !GETFLAGBOOL(SF); // JGE
+						} else {
+							jmp = !GETFLAGBOOL(SF) && !GETFLAGBOOL(ZF); // JG
+						}
+					}	break;
+		case 'L' :	{	if (instu[2] == 'E') {
+							jmp = GETFLAGBOOL(SF) || GETFLAGBOOL(ZF); // JLE
+						} else {
+							jmp = GETFLAGBOOL(SF); // JL
+						}
+					}	break;
+		case 'M' :	{	jmp = true; // JMP
+					}	break;
+		case 'N' :	{	switch (instu[2]) {
+						case 'B' :	
+						case 'C' :	{	jmp = !GETFLAGBOOL(CF);	// JNB / JNC
+									}	break;
+						case 'E' :	{	jmp = !GETFLAGBOOL(ZF);	// JNE
+									}	break;
+						case 'O' :	{	jmp = !GETFLAGBOOL(OF);	// JNO
+									}	break;
+						case 'P' :	{	jmp = !GETFLAGBOOL(PF);	// JNP
+									}	break;
+						case 'S' :	{	jmp = !GETFLAGBOOL(SF);	// JNS
+									}	break;
+						case 'Z' :	{	jmp = !GETFLAGBOOL(ZF);	// JNZ
+									}	break;
+						}
+					}	break;
+		case 'O' :	{	jmp = GETFLAGBOOL(OF); // JMP
+					}	break;
+		case 'P' :	{	if (instu[2] == 'O') {
+							jmp = !GETFLAGBOOL(PF); // JPO
+						} else {
+							jmp = GETFLAGBOOL(SF); // JP / JPE
+						}
+					}	break;
+		case 'S' :	{	jmp = GETFLAGBOOL(SF); // JS
+					}	break;
+		case 'Z' :	{	jmp = GETFLAGBOOL(ZF); // JZ
+					}	break;
+		}
+		if (jmp) {
+			pos = strchr(instu,'+');
+			if (pos) {
+				strcpy(result,"(down)");
+			} else {
+				strcpy(result,"(up)");
+			}
+		} else {
+			sprintf(result,"(no jmp)");
+		}
+	}
 	return result;
 };
 
@@ -1366,7 +1439,7 @@ Bit32u DEBUG_CheckKeys(void) {
 					ParseCommand(codeViewData.inputStr);
 					break;
 		case 'T'  :	DEBUG_RaiseTimerIrq(); 
-					DEBUG_ShowMsg("Debug: Timer Int started.");
+					DEBUG_ShowMsg("Debug: Timer Int started.\n");
 					break;
 		case 'V'  : showExtend = !showExtend;	
 					break;
@@ -1383,6 +1456,12 @@ Bit32u DEBUG_CheckKeys(void) {
 						if (codeViewData.cursorPos>0) codeViewData.cursorPos--;
 						else codeViewData.useEIP -= 1;
 						break;
+		case KEY_HOME:	// Home: scroll log page up
+						DEBUG_RefreshPage(-1);
+						break;
+		case KEY_END:	// End: scroll log page down
+						DEBUG_RefreshPage(1);
+						break;
 		case KEY_F(5):	// Run Programm
 						debugging=false;
 						CBreakpoint::ActivateBreakpoints(SegPhys(cs)+reg_eip,true);						
@@ -1449,11 +1528,15 @@ Bitu DEBUG_Loop(void) {
 }
 
 void DEBUG_Enable(void) {
-
+	static bool showhelp=false;
 	debugging=true;
 	SetCodeWinStart();
 	DEBUG_DrawScreen();
 	DOSBOX_SetLoop(&DEBUG_Loop);
+	if(!showhelp) { 
+		showhelp=true;
+		DEBUG_ShowMsg("***| PRESS \"H\" TO SHOW ALL COMMANDS. PRESS \"RETURN\" TO ENTER COMMANDMODE. |***\n");
+	}
 }
 
 void DEBUG_DrawScreen(void) {
@@ -1684,7 +1767,7 @@ Bitu debugCallback;
 
 void DEBUG_Init(Section* sec) {
 
-	MSG_Add("DEBUG_CONFIGFILE_HELP","Nothing to setup yet!\n");
+	MSG_Add("DEBUG_CONFIGFILE_HELP","Debugger related options.\n");
 	DEBUG_DrawScreen();
 	/* Add some keyhandlers */
 	MAPPER_AddHandler(DEBUG_Enable,MK_pause,0,"debugger","Debugger");
@@ -1694,7 +1777,7 @@ void DEBUG_Init(Section* sec) {
 	PROGRAMS_MakeFile("DEBUG.COM",DEBUG_ProgramStart);
 	/* Setup callback */
 	debugCallback=CALLBACK_Allocate();
-	CALLBACK_Setup(debugCallback,DEBUG_EnableDebugger,CB_RETF);
+	CALLBACK_Setup(debugCallback,DEBUG_EnableDebugger,CB_RETF,"debugger");
 	/* shutdown function */
 	sec->AddDestroyFunction(&DEBUG_ShutDown);
 }
@@ -1778,7 +1861,7 @@ static void SaveMemory(Bitu seg, Bitu ofs1, Bit32s num)
 {
 	FILE* f = fopen("MEMDUMP.TXT","wt");
 	if (!f) {
-		DEBUG_ShowMsg("DEBUG: Memory dump failed.");
+		DEBUG_ShowMsg("DEBUG: Memory dump failed.\n");
 		return;
 	}
 	
@@ -1798,7 +1881,7 @@ static void SaveMemory(Bitu seg, Bitu ofs1, Bit32s num)
 		fprintf(f,"%s\n",buffer);
 	};
 	fclose(f);
-	DEBUG_ShowMsg("DEBUG: Memory dump success.");
+	DEBUG_ShowMsg("DEBUG: Memory dump success.\n");
 };
 
 static void OutputVecTable(char* filename)
@@ -1806,7 +1889,7 @@ static void OutputVecTable(char* filename)
 	FILE* f = fopen(filename, "wt");
 	if (!f)
 	{
-		DEBUG_ShowMsg("DEBUG: Output of interrupt vector table failed.");
+		DEBUG_ShowMsg("DEBUG: Output of interrupt vector table failed.\n");
 		return;
 	}
 
@@ -1814,7 +1897,7 @@ static void OutputVecTable(char* filename)
 		fprintf(f,"INT %02X:  %04X:%04X\n", i, mem_readw(i*4+2), mem_readw(i*4));
 
 	fclose(f);
-	DEBUG_ShowMsg("DEBUG: Interrupt vector table written to %s.", filename);
+	DEBUG_ShowMsg("DEBUG: Interrupt vector table written to %s.\n", filename);
 }
 
 #define DEBUG_VAR_BUF_LEN 16
@@ -1876,11 +1959,11 @@ void DEBUG_HeavyWriteLogInstruction(void)
 
 	logHeavy = false;
 	
-	DEBUG_ShowMsg("DEBUG: Creating cpu log LOGCPU_INT_CD.TXT");
+	DEBUG_ShowMsg("DEBUG: Creating cpu log LOGCPU_INT_CD.TXT\n");
 
 	FILE* f = fopen("LOGCPU_INT_CD.TXT","wt");
 	if (!f) {
-		DEBUG_ShowMsg("DEBUG: Failed.");	
+		DEBUG_ShowMsg("DEBUG: Failed.\n");	
 		return;
 	}
 
@@ -1893,7 +1976,7 @@ void DEBUG_HeavyWriteLogInstruction(void)
 	
 	fclose(f);
 
-	DEBUG_ShowMsg("DEBUG: Done.");	
+	DEBUG_ShowMsg("DEBUG: Done.\n");	
 };
 
 bool DEBUG_HeavyIsBreakpoint(void)
@@ -1907,7 +1990,7 @@ bool DEBUG_HeavyIsBreakpoint(void)
 		}
 		if (cpuLogCounter<=0) {
 			fclose(cpuLogFile);
-			DEBUG_ShowMsg("DEBUG: cpu log LOGCPU.TXT created");
+			DEBUG_ShowMsg("DEBUG: cpu log LOGCPU.TXT created\n");
 			cpuLog = false;
 			DEBUG_EnableDebugger();
 			return true;
diff --git a/src/debug/debug_gui.cpp b/src/debug/debug_gui.cpp
index 268fecfa..8e16c203 100644
--- a/src/debug/debug_gui.cpp
+++ b/src/debug/debug_gui.cpp
@@ -39,6 +39,8 @@ struct _LogGroup {
 
 static _LogGroup loggrp[LOG_MAX]={{"",true},{0,false}};
 static FILE* debuglog;
+static std::list<char*> logBuff;
+static std::list<char*>::iterator logBuffPos = logBuff.end();
 
 extern int old_cursor_state;
 
@@ -51,9 +53,45 @@ void DEBUG_ShowMsg(char * format,...) {
 	va_start(msg,format);
 	vsprintf(buf,format,msg);
 	va_end(msg);
-	wprintw(dbg.win_out,"%10d: %s\n",cycle_count,buf);
+
+	/* Add newline if not present */
+	Bitu len=strlen(buf);
+	if(buf[len-1]!='\n') strcat(buf,"\n");
+
+	if(debuglog) fprintf(debuglog,"%s",buf);
+
+	char* newLine = new char[strlen(buf) + 1];
+	strcpy(newLine, buf);
+	if (logBuffPos!=logBuff.end()) {
+		logBuffPos=logBuff.end();
+		DEBUG_RefreshPage(0);
+		mvwprintw(dbg.win_out,dbg.win_out->_maxy, 0, "");
+	}
+	logBuff.push_back(newLine);
+	if (logBuff.size()>500) {
+		char * firstline = logBuff.front();
+		delete firstline;
+		logBuff.pop_front();
+	}
+	logBuffPos = logBuff.end();
+	wprintw(dbg.win_out,"%s",buf);
+	wrefresh(dbg.win_out);
+}
+
+void DEBUG_RefreshPage(char scroll) {
+	if (scroll==-1 && logBuffPos!=logBuff.begin()) logBuffPos--;
+	else if (scroll==1 && logBuffPos!=logBuff.end()) logBuffPos++;
+
+	std::list<char*>::iterator i = logBuffPos;
+	int rem_lines = dbg.win_out->_maxy;
+
+	wclear(dbg.win_out);
+
+	while (rem_lines > 0 && i!=logBuff.begin()) {
+		rem_lines -= (int) (strlen(*--i) / dbg.win_out->_maxx) + 1; 
+		mvwprintw(dbg.win_out,rem_lines-1, 0, *i);
+	}
 	wrefresh(dbg.win_out);
-	if(debuglog) fprintf(debuglog,"%10d: %s\n",cycle_count,buf);
 }
 
 void LOG::operator() (char* format, ...){
@@ -65,7 +103,7 @@ void LOG::operator() (char* format, ...){
 
 	if (d_type>=LOG_MAX) return;
 	if ((d_severity!=LOG_ERROR) && (!loggrp[d_type].enabled)) return;
-	DEBUG_ShowMsg("%s:%s",loggrp[d_type].front,buf);
+	DEBUG_ShowMsg("%10d: %s:%s\n",cycle_count,loggrp[d_type].front,buf);
 }
 
 
@@ -99,15 +137,15 @@ static void DrawBars(void) {
 		attrset(COLOR_PAIR(PAIR_BLACK_BLUE));
 	}
 	/* Show the Register bar */
-	mvaddstr(dbg.win_reg->_begy-1,0,"---(Register Overview)---");
+	mvaddstr(dbg.win_reg->_begy-1,0, "---(Register Overview                   )---");
 	/* Show the Data Overview bar perhaps with more special stuff in the end */
-	mvaddstr(dbg.win_data->_begy-1,0,"---(Data Overview)---");
+	mvaddstr(dbg.win_data->_begy-1,0,"---(Data Overview      Scroll: r/f      )---");
 	/* Show the Code Overview perhaps with special stuff in bar too */
-	mvaddstr(dbg.win_code->_begy-1,0,"---(Code Overview)---");
+	mvaddstr(dbg.win_code->_begy-1,0,"---(Code Overview      Scroll: up/down  )---");
 	/* Show the Variable Overview bar */
-	mvaddstr(dbg.win_var->_begy-1,0,"---(Variable Overview)---");
+	mvaddstr(dbg.win_var->_begy-1,0, "---(Variable Overview                   )---");
 	/* Show the Output OverView */
-	mvaddstr(dbg.win_out->_begy-1,0,"---(OutPut/Input)---");
+	mvaddstr(dbg.win_out->_begy-1,0, "---(OutPut/Input       Scroll: home/end )---");
 	attrset(0);
 }
 
diff --git a/src/hardware/mpu401.cpp b/src/hardware/mpu401.cpp
index d3185601..412ef88a 100644
--- a/src/hardware/mpu401.cpp
+++ b/src/hardware/mpu401.cpp
@@ -719,7 +719,7 @@ static void MPU401_Reset(void) {
 
 void MPU401_Init(Section* sec) {
 	call_irq9=CALLBACK_Allocate(); //allocate handler for irq 9
-	CALLBACK_Setup(call_irq9,&INT71_Handler,CB_IRET);
+	CALLBACK_Setup(call_irq9,&INT71_Handler,CB_IRET,"irq 9 mpu");
 	RealSetVec(0x71,CALLBACK_RealPointer(call_irq9));
 
 	Section_prop * section=static_cast<Section_prop *>(sec);
diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp
index 7069b6ea..e617ee36 100644
--- a/src/ints/bios.cpp
+++ b/src/ints/bios.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: bios.cpp,v 1.35 2004-08-04 09:12:56 qbix79 Exp $ */
+/* $Id: bios.cpp,v 1.36 2004-10-23 15:15:06 qbix79 Exp $ */
 
 #include <time.h>
 #include "dosbox.h"
@@ -410,7 +410,7 @@ void BIOS_SetupKeyboard(void);
 void BIOS_SetupDisks(void);
 
 void BIOS_Init(Section* sec) {
-    MSG_Add("BIOS_CONFIGFILE_HELP","Nothing to setup yet!\n");
+	MSG_Add("BIOS_CONFIGFILE_HELP","Nothing to setup yet!\n");
 	/* Clear the Bios Data Area */
 	for (Bit16u i=0;i<1024;i++) real_writeb(0x40,i,0);
 	/* Setup all the interrupt handlers the bios controls */
@@ -418,7 +418,7 @@ void BIOS_Init(Section* sec) {
 	//TODO Maybe give this a special callback that will also call int 8 instead of starting 
 	//a new system
 	call_int8=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int8,&INT8_Handler,CB_IRET);
+	CALLBACK_Setup(call_int8,&INT8_Handler,CB_IRET,"Int 8 Clock");
 	phys_writeb(CB_BASE+(call_int8<<4)+0,(Bit8u)0xFE);		//GRP 4
 	phys_writeb(CB_BASE+(call_int8<<4)+1,(Bit8u)0x38);		//Extra Callback instruction
 	phys_writew(CB_BASE+(call_int8<<4)+2,call_int8);		//The immediate word          
@@ -434,44 +434,44 @@ void BIOS_Init(Section* sec) {
 	RealSetVec(0x8,CALLBACK_RealPointer(call_int8));
 	/* INT 11 Get equipment list */
 	call_int11=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int11,&INT11_Handler,CB_IRET);
+	CALLBACK_Setup(call_int11,&INT11_Handler,CB_IRET,"Int 11 Equipment");
 	RealSetVec(0x11,CALLBACK_RealPointer(call_int11));
 	/* INT 12 Memory Size default at 640 kb */
 	call_int12=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int12,&INT12_Handler,CB_IRET);
+	CALLBACK_Setup(call_int12,&INT12_Handler,CB_IRET,"Int 12 Memory");
 	RealSetVec(0x12,CALLBACK_RealPointer(call_int12));
 	mem_writew(BIOS_MEMORY_SIZE,640);
 	/* INT 13 Bios Disk Support */
 	BIOS_SetupDisks();
 	call_int14=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int14,&INT14_Handler,CB_IRET);
+	CALLBACK_Setup(call_int14,&INT14_Handler,CB_IRET,"Int 14 COM-port");
 	RealSetVec(0x14,CALLBACK_RealPointer(call_int14));
 	/* INT 15 Misc Calls */
 	call_int15=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int15,&INT15_Handler,CB_IRET);
+	CALLBACK_Setup(call_int15,&INT15_Handler,CB_IRET,"Int 15 Bios");
 	RealSetVec(0x15,CALLBACK_RealPointer(call_int15));
 	/* INT 16 Keyboard handled in another file */
 	BIOS_SetupKeyboard();
 	/* INT 16 Printer Routines */
 	call_int17=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int17,&INT17_Handler,CB_IRET);
+	CALLBACK_Setup(call_int17,&INT17_Handler,CB_IRET,"Int 17 Printer");
 	RealSetVec(0x17,CALLBACK_RealPointer(call_int17));
 	/* INT 1A TIME and some other functions */
 	call_int1a=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int1a,&INT1A_Handler,CB_IRET_STI);
+	CALLBACK_Setup(call_int1a,&INT1A_Handler,CB_IRET_STI,"Int 1a Time");
 	RealSetVec(0x1A,CALLBACK_RealPointer(call_int1a));
 	/* INT 1C System Timer tick called from INT 8 */
 	call_int1c=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int1c,&INT1C_Handler,CB_IRET);
+	CALLBACK_Setup(call_int1c,&INT1C_Handler,CB_IRET,"Int 1c Timer tick");
 	RealSetVec(0x1C,CALLBACK_RealPointer(call_int1c));
 	/* IRQ 8 RTC Handler */
 	call_int70=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int70,&INT70_Handler,CB_IRET);
+	CALLBACK_Setup(call_int70,&INT70_Handler,CB_IRET,"Int 70 RTC");
 	RealSetVec(0x70,CALLBACK_RealPointer(call_int70));
 
 	/* Some defeault CPU error interrupt handlers */
 	call_int1=CALLBACK_Allocate();
-	CALLBACK_Setup(call_int1,&INT1_Single_Step,CB_IRET);
+	CALLBACK_Setup(call_int1,&INT1_Single_Step,CB_IRET,"Int 1 Single step");
 	RealSetVec(0x1,CALLBACK_RealPointer(call_int1));
 
 	/* Setup some stuff in 0x40 bios segment */
diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp
index 892701d0..be354e73 100644
--- a/src/ints/bios_disk.cpp
+++ b/src/ints/bios_disk.cpp
@@ -403,7 +403,7 @@ void BIOS_SetupDisks(void) {
 /* TODO Start the time correctly */
 	call_int13=CALLBACK_Allocate();	
 	//CALLBACK_Setup(call_int13,&INT13_SmallHandler,CB_IRET);
-	CALLBACK_Setup(call_int13,&INT13_DiskHandler,CB_IRET);
+	CALLBACK_Setup(call_int13,&INT13_DiskHandler,CB_IRET,"Int 13 Bios disk");
 	RealSetVec(0x13,CALLBACK_RealPointer(call_int13));
 	int i;
 	for(i=0;i<4;i++) {
diff --git a/src/ints/ems.cpp b/src/ints/ems.cpp
index c0faac71..8389567a 100644
--- a/src/ints/ems.cpp
+++ b/src/ints/ems.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: ems.cpp,v 1.35 2004-10-17 14:45:00 qbix79 Exp $ */
+/* $Id: ems.cpp,v 1.36 2004-10-23 15:15:06 qbix79 Exp $ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -610,14 +610,14 @@ static Bitu INT4B_Handler() {
 void EMS_Init(Section* sec) {
 	/* Virtual DMA interrupt callback */
 	call_vdma=CALLBACK_Allocate();
-	CALLBACK_Setup(call_vdma,&INT4B_Handler,CB_IRET);
+	CALLBACK_Setup(call_vdma,&INT4B_Handler,CB_IRET,"Int 4b vdma");
 	RealSetVec(0x4b,CALLBACK_RealPointer(call_vdma));
 
 	Section_prop * section=static_cast<Section_prop *>(sec);
 	if (!section->Get_bool("ems")) return;
 	BIOS_ZeroExtendedSize();
 	call_int67=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_int67,&INT67_Handler,CB_IRET);
+	CALLBACK_Setup(call_int67,&INT67_Handler,CB_IRET,"Int 67 ems");
 /* Register the ems device */
 	DOS_Device * newdev = new device_EMM();
 	DOS_AddDevice(newdev);
diff --git a/src/ints/int10.cpp b/src/ints/int10.cpp
index de170ea3..975d7ac3 100644
--- a/src/ints/int10.cpp
+++ b/src/ints/int10.cpp
@@ -467,7 +467,7 @@ void INT10_Init(Section* sec) {
 	if (machine==MCH_TANDY) SetupTandyBios();
 	/* Setup the INT 10 vector */
 	call_10=CALLBACK_Allocate();	
-	CALLBACK_Setup(call_10,&INT10_Handler,CB_IRET);
+	CALLBACK_Setup(call_10,&INT10_Handler,CB_IRET,"Int 10 video");
 	RealSetVec(0x10,CALLBACK_RealPointer(call_10));
 	//Init the 0x40 segment and init the datastructures in the the video rom area
 	INT10_SetupRomMemory();
diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp
index a6ffc200..aafc081b 100644
--- a/src/misc/programs.cpp
+++ b/src/misc/programs.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: programs.cpp,v 1.15 2004-09-16 21:47:39 qbix79 Exp $ */
+/* $Id: programs.cpp,v 1.16 2004-10-23 15:15:07 qbix79 Exp $ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -220,7 +220,7 @@ static void CONFIG_ProgramStart(Program * * make) {
 void PROGRAMS_Init(Section* sec) {
 	/* Setup a special callback to start virtual programs */
 	call_program=CALLBACK_Allocate();
-	CALLBACK_Setup(call_program,&PROGRAMS_Handler,CB_RETF);
+	CALLBACK_Setup(call_program,&PROGRAMS_Handler,CB_RETF,"internal program");
 	PROGRAMS_MakeFile("CONFIG.COM",CONFIG_ProgramStart);
 
 	MSG_Add("PROGRAM_CONFIG_FILE_ERROR","Can't open file %s\n");
diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index 4d38efc5..1b208432 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell.cpp,v 1.50 2004-10-17 14:45:00 qbix79 Exp $ */
+/* $Id: shell.cpp,v 1.51 2004-10-23 15:15:07 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <stdarg.h>
@@ -302,13 +302,17 @@ void SHELL_Init() {
 		"\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xBB\n"
 		"\xBA \033[32mDOSBox Shell v" VERSION "\033[37m                                                 \xBA\n"
 		"\xBA DOSBox runs real and protected mode games.                         \xBA\n"
-		"\xBA For supported shell commands type: \033[1;33mHELP\033[37m                            \xBA\n"
+		"\xBA For supported shell commands type: \033[33mHELP\033[37m                            \xBA\n"
 		"\xBA For a short introduction type: \033[33mINTRO\033[37m                               \xBA\n"
 		"\xBA                                                                    \xBA\n"
 		"\xBA If you want more speed, try \033[31mctrl-F8\033[37m and \033[31mctrl-F12\033[37m.                  \xBA\n"
 		"\xBA To activate the keymapper \033[31mctrl-F1\033[37m.                                 \xBA\n"
 		"\xBA For more information read the \033[36mREADME\033[37m file in the DOSBox directory. \xBA\n"
 		"\xBA                                                                    \xBA\n"
+#if C_DEBUG
+		"\xBA Press \033[31mPause\033[37m to enter the debugger or start the exe with \033[33mDEBUG\033[37m.     \xBA\n"
+		"\xBA                                                                    \xBA\n"
+#endif
 		"\xBA \033[32mHAVE FUN!\033[37m                                                          \xBA\n"
 		"\xBA \033[32mThe DOSBox Team\033[37m                                                    \xBA\n"
 		"\xC8\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
@@ -347,7 +351,7 @@ void SHELL_Init() {
 	SegSet16(cs,RealSeg(newcsip));
 	reg_ip=RealOff(newcsip);
 
-	CALLBACK_Setup(call_shellstop,shellstop_handler,CB_IRET);
+	CALLBACK_Setup(call_shellstop,shellstop_handler,CB_IRET,"shell stop");
 	PROGRAMS_MakeFile("COMMAND.COM",SHELL_ProgramStart);
 
 	/* Now call up the shell for the first time */