diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C
index e4fc49d4..e783bd28 100755
Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ
diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN
index 4bca41fd..9902173c 100755
Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ
diff --git a/src/Demo/AcctExample/PersonalNotes.DD b/src/Demo/AcctExample/PersonalNotes.DD
index 8ac82558..cacb5dc4 100755
--- a/src/Demo/AcctExample/PersonalNotes.DD
+++ b/src/Demo/AcctExample/PersonalNotes.DD
@@ -418,7 +418,7 @@ catches divide and out-of-mem.  Not sure what to do, yet.
 * Might make CSprite flood fill operate on a separate bitmap
 and blotted at the end.
 * <CTRL-r> delete subsprite in menu near others
-* make better heapwalk, do something with $LK,"_CONFIG_HEAP_DBG",A="FF:::/Kernel/KernelA.HH,_CONFIG_HEAP_DBG"$.
+* make better heapwalk, do something with $LK,"_CONFIG_HEAP_DEBUG",A="FF:::/Kernel/KernelA.HH,_CONFIG_HEAP_DEBUG"$.
 
 * static var off of data heap.
 * could add "const" to not set CCF_NOT_CONST flag for trig, etc.
diff --git a/src/Demo/AcctExample/TOS/TOSConfig.CC b/src/Demo/AcctExample/TOS/TOSConfig.CC
index 7b79fb12..dc747679 100755
--- a/src/Demo/AcctExample/TOS/TOSConfig.CC
+++ b/src/Demo/AcctExample/TOS/TOSConfig.CC
@@ -6,19 +6,19 @@ U0 TOSDebugDistro1()
 {
   CBinFile *bfh=mem_boot_base-sizeof(CBinFile);
   bfh(I64)+=bfh->file_size-1;
-  DefinePrint("TOS_DBG_DISTRO","0x%X",
+  DefinePrint("TOS_DEBUG_DISTRO","0x%X",
 	CeilI64(SYS_KERNEL_END+SLOP,BLK_SIZE));
-  DefinePrint("TOS_DBG_DISTRO_END",  "0x%X",FloorI64(
+  DefinePrint("TOS_DEBUG_DISTRO_END",  "0x%X",FloorI64(
 	(BOOT_RAM_LIMIT-(BOOT_STACK_SIZE+DVD_BOOT_LOADER_SIZE))>>4<<4-
 	(bfh(I64)-SYS_KERNEL_END)-SLOP,BLK_SIZE));
-  DefinePrint("CONFIG_DBG_DISTRO_FILE","\"/Tmp/DebugDistro.BIN\"");
+  DefinePrint("CONFIG_DEBUG_DISTRO_FILE","\"/Tmp/DebugDistro.BIN\"");
 } TOSDebugDistro1;
 
 U0 TOSDebugDistro2()
 {
-  DefinePrint("CONFIG_DBG_DISTRO","\"a0x%X\n0x%X\n\"",TOS_DBG_DISTRO,
-	(TOS_DBG_DISTRO_END-TOS_DBG_DISTRO)/BLK_SIZE);
-  DefinePrint("CONFIG_DBG_DISTRO_START","\"0x%X\"",TOS_DBG_DISTRO);
+  DefinePrint("CONFIG_DEBUG_DISTRO","\"a0x%X\n0x%X\n\"",TOS_DEBUG_DISTRO,
+	(TOS_DEBUG_DISTRO_END-TOS_DEBUG_DISTRO)/BLK_SIZE);
+  DefinePrint("CONFIG_DEBUG_DISTRO_START","\"0x%X\"",TOS_DEBUG_DISTRO);
 } TOSDebugDistro2;
 
 U0 TOSInit()
@@ -47,15 +47,15 @@ U0 TOSInit()
 #define TOS_ISO_NAME	"B:/TOS_Distro.ISO.C"
 #define TOS_DISTRO_DIR	"B:/Distro"
 #define CONFIG_OPTS	"StaffMode\nMountIDEAuto\nCT\n"
-#define CONFIG_DBG_OPTS	"StaffMode\nMountIDEAuto\nCT"\
+#define CONFIG_DEBUG_OPTS	"StaffMode\nMountIDEAuto\nCT"\
 			"HeapInit\n130\nMemInit\n131\nVarInit\n132\n\n"
-#define CONFIG_DBGZ_OPTS	"StaffMode\nMountIDEAuto\nCT"\
+#define CONFIG_DEBUGZ_OPTS	"StaffMode\nMountIDEAuto\nCT"\
 			"HeapInit\n0\nMemInit\n0\nVarInit\n0\n\n"
 #define TOS_CONFIG		"\n" CONFIG_RAM_DRIVES CONFIG_DVD_DRIVES CONFIG_HARD_DRIVES "\n"\
 			CONFIG_DISK_CACHE CONFIG_OPTS
 #define TOS_DVD_CONFIG	"TB\n0x20000\nT\n\n\nStaffMode\nMountIDEAuto\nCT\n"
-#define TOS_DVD_DBG_CONFIG "A" CONFIG_DBG_DISTRO\
+#define TOS_DVD_DEBUG_CONFIG "A" CONFIG_DEBUG_DISTRO\
 			"B\nScale2Mem(2048,0x40000)\n\n\n"\
 			"NoMP\nTextMode\nDontProbe\nDebugDistro\n"\
-			"C:" CONFIG_DBG_DISTRO_FILE "\n"\
-			CONFIG_DBG_DISTRO_START "\n\n"
+			"C:" CONFIG_DEBUG_DISTRO_FILE "\n"\
+			CONFIG_DEBUG_DISTRO_START "\n\n"
diff --git a/src/Demo/AcctExample/TOS/TOSDistro.CC b/src/Demo/AcctExample/TOS/TOSDistro.CC
index 9e14185a..55c1ab65 100755
--- a/src/Demo/AcctExample/TOS/TOSDistro.CC
+++ b/src/Demo/AcctExample/TOS/TOSDistro.CC
@@ -3,7 +3,7 @@
 #help_index "Misc/TOS/Distro"
 
 #define MAKE_LITE	1
-#define MAKE_DBG	0
+#define MAKE_DEBUG	0
 #define MAKE_STAFF	1
 
 public U8 TOSGetDrive()
@@ -90,7 +90,7 @@ U0 DebugDistroFilePrep()
 {
   CBlkDev *bd;
   if (!Letter2Drive('A',FALSE)) {
-    In(CONFIG_DBG_DISTRO "\n");
+    In(CONFIG_DEBUG_DISTRO "\n");
     Mount;
   }
   bd=Letter2BlkDev('A');
@@ -117,7 +117,7 @@ U0 DebugDistroFilePrep()
   Copy("C:/Zenith/AMem.CC",	"A:/Zenith");
   Copy("C:/Zenith/TaskRep.CC",	"A:/Zenith");
 
-  FileWrite("C:" CONFIG_DBG_DISTRO_FILE,
+  FileWrite("C:" CONFIG_DEBUG_DISTRO_FILE,
 	bd->RAM_disk,(bd->max_blk+1)<<BLK_SIZE_BITS);
 }
 
@@ -183,7 +183,7 @@ U0 DebugDistroPrep()
   Drive('C');
   DistroPrep;
   DebugDistroFilePrep;
-  In(TOS_DVD_DBG_CONFIG);
+  In(TOS_DVD_DEBUG_CONFIG);
   BootDVDIns('C');
   Format('B',,FALSE,FSt_REDSEA);
   DelTree(TOS_DISTRO_DIR);
@@ -198,7 +198,7 @@ U0 MakeDebugDistro()
 {
   DebugDistroPrep;
   RedSeaISO(TOS_ISO_NAME,TOS_DISTRO_DIR,TOS_DISTRO_DIR BOOT_DIR_KERNEL_BIN_C);
-  DefinePrint("DD_TEMPLEOS_DBG_SIZE",
+  DefinePrint("DD_TEMPLEOS_DEBUG_SIZE",
 	"Download $TX,"ZenithOS V5.03",D="DD_OS_NAME_VERSION"$ - Debug Distro (%0.1fMB)",
 	0.1*(10*Size(TOS_ISO_NAME,"+s")/1024/1024));
   Drive('C');
@@ -279,7 +279,7 @@ U0 TOSProgress(U8 *st)
   progress4=tos_progress;
   progress3_max=1;
   *progress4_desc=0;
-  progress4_max=9+MAKE_LITE+MAKE_DBG+MAKE_STAFF;
+  progress4_max=9+MAKE_LITE+MAKE_DEBUG+MAKE_STAFF;
   progress4_t0=tos_progress_t0;
   StrPrint(buf,"%d. %s",++progress4,st);
   "$$PURPLE$$$$TX+CX,\"%s\"$$$$FG$$\n",buf;
@@ -327,7 +327,7 @@ U0 TOSRegen2()
   DocClear;
   Move(TOS_ISO_NAME,"D:/Downloads/TOS_Lite.ISO");
 #endif
-#if MAKE_DBG
+#if MAKE_DEBUG
   TOSProgress("Make Debug Distro ISO");
   MakeDebugDistro;
   DocClear;
diff --git a/src/Doc/HeapDebug.DD b/src/Doc/HeapDebug.DD
index 72d5c147..cb9e7218 100755
--- a/src/Doc/HeapDebug.DD
+++ b/src/Doc/HeapDebug.DD
@@ -1 +1 @@
-$WW,1$Recompile the kernel with $LK,"_CONFIG_HEAP_DBG",A="MN:_CONFIG_HEAP_DBG"$=TRUE if you want more heap debugging.  You are on your own.
+$WW,1$Recompile the kernel with $LK,"_CONFIG_HEAP_DEBUG",A="MN:_CONFIG_HEAP_DEBUG"$=TRUE if you want more heap debugging.  You are on your own.
diff --git a/src/Doc/Tips.DD b/src/Doc/Tips.DD
index 075ba22b..73f98016 100755
--- a/src/Doc/Tips.DD
+++ b/src/Doc/Tips.DD
@@ -129,7 +129,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes.
 
 * Use $LK,"HeapLog",A="MN:HeapLog"$(), $LK,"HeapLogAddrRep",A="MN:HeapLogAddrRep"$() and $LK,"HeapLogSizeRep",A="MN:HeapLogSizeRep"$() to find leaks.  Don't be confused by $LK,"CDoc",A="MN:CDoc"$ allocations.  Those are generated when text is written to the cmd line buffer.
 
-* For advanced heap debugging, play with $LK,"_CONFIG_HEAP_DBG",A="MN:_CONFIG_HEAP_DBG"$.  You're on your own.
+* For advanced heap debugging, play with $LK,"_CONFIG_HEAP_DEBUG",A="MN:_CONFIG_HEAP_DEBUG"$.  You're on your own.
 
 * You can use $LK,"Type",A="MN:Type"$() to display $FG,2$.GR$FG$ files.
 
diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C
index 3632a000..80c78658 100755
Binary files a/src/Kernel.BIN.C and b/src/Kernel.BIN.C differ
diff --git a/src/Kernel/KConfig.CC b/src/Kernel/KConfig.CC
index 95fe5aa9..74008bc5 100755
--- a/src/Kernel/KConfig.CC
+++ b/src/Kernel/KConfig.CC
@@ -12,7 +12,7 @@ U8 *kernel_config_options="MemInit\0HeapInit\0VarInit\0StaffMode\0"
 #define CONFIG_TEXT_MODE		6
 #define CONFIG_DONT_PROBE		7
 #define CONFIG_MOUNT_IDE_AUTO	8
-#define CONFIG_DBG_DISTRO	9
+#define CONFIG_DEBUG_DISTRO	9
 #define CONFIG_OPTIONS_NUM		10
 
 #define CONFIG_HELP		10
@@ -133,7 +133,7 @@ U0 KConfigOptions(CKConfig *c)
 	      c->mount_ide_auto_cd_let=0;
 	    }
 	    break;
-	  case CONFIG_DBG_DISTRO:
+	  case CONFIG_DEBUG_DISTRO:
 	    Free(c->debug_distro_file);
 	    c->debug_distro_file=0;
 	    c->debug_distro_start=0;
diff --git a/src/Kernel/KDebug.CC b/src/Kernel/KDebug.CC
index 607590fb..3a4ccd0e 100755
--- a/src/Kernel/KDebug.CC
+++ b/src/Kernel/KDebug.CC
@@ -579,7 +579,7 @@ U0 Fault3(I64 fault_num,I64 fault_err_code)
   "\n\tZenithOS Debugger\n\n"
 	">Help;\t//For help.\n\n";
   Beep(62,TRUE);
-  if (fault_num==I_DBG) {
+  if (fault_num==I_DEBUG) {
     if (debug.message) {
       "\n!!!%s",debug.message;
       if (debug.message_num)
@@ -594,7 +594,7 @@ U0 Fault3(I64 fault_num,I64 fault_err_code)
 }
 
 U0 Fault2(I64 fault_num,I64 fault_err_code)
-{//Called from $LK,"Fault2",A="FF:::/Kernel/KInts.CC,Fault2"$.
+{//Called from $LK,"Fault2",A="FF:::/Kernel/KInterrupts.CC,Fault2"$.
 //$BK,1$Be careful not to swap-out and ruin the saved context$BK,0$
   Bool was_raw,was_single_user,was_silent,was_in_debug;
   I64  i,old_raw_flags=text.raw_flags;
@@ -605,7 +605,7 @@ U0 Fault2(I64 fault_num,I64 fault_err_code)
   if (fault_num==I_BPT)
     Fs->rip--;
   if (Fs->debug_task)
-    CallExtNum(EXT_DBG_RESUME,fault_num,fault_err_code);
+    CallExtNum(EXT_DEBUG_RESUME,fault_num,fault_err_code);
   else {
     was_raw=Raw(ON);
     was_silent=Silent(OFF);
@@ -631,7 +631,7 @@ U0 Fault2(I64 fault_num,I64 fault_err_code)
     text.raw_flags=old_raw_flags;
   }
   SingleUser(was_single_user);
-  if (LBtr(&Fs->task_flags,TASKf_KILL_AFTER_DBG))
+  if (LBtr(&Fs->task_flags,TASKf_KILL_AFTER_DEBUG))
     Exit;
 }
 
@@ -642,7 +642,7 @@ U0 Panic(U8 *message=NULL,I64 message_num=0,Bool panic=TRUE)
   debug.message=message;
   debug.message_num=message_num;
   debug.panic=panic;
-  INT I_DBG
+  INT I_DEBUG
   POPFD
 }
 
diff --git a/src/Kernel/KInts.CC b/src/Kernel/KInterrupts.CC
similarity index 98%
rename from src/Kernel/KInts.CC
rename to src/Kernel/KInterrupts.CC
index b1547d93..459f7f1b 100755
--- a/src/Kernel/KInts.CC
+++ b/src/Kernel/KInterrupts.CC
@@ -210,6 +210,6 @@ I have no idea why I got a IRQ 0x27.
   IntEntrySet(I_TIMER,IRQ_TIMER);
   IntEntrySet(I_MP_CRASH,*INT_MP_CRASH_ADDR(U32 *));
   IntEntrySet(I_WAKE,INT_WAKE);
-  IntEntrySet(I_DBG,&debug.int_fault_code[7*I_DBG]);
+  IntEntrySet(I_DEBUG,&debug.int_fault_code[7*I_DEBUG]);
   POPFD
 }
diff --git a/src/Kernel/KMain.CC b/src/Kernel/KMain.CC
index 766a1d0d..837a7f71 100755
--- a/src/Kernel/KMain.CC
+++ b/src/Kernel/KMain.CC
@@ -80,7 +80,7 @@ U0 SysGrInit()
   text.font[255] = text.aux_font[255]; //auxillary block character
 
   text.border_chars[2] (I64)='ÄͳºÚÉ¿»';
-  text.border_chars[10](U32)='ÀÈÙ¼';
+  text.border_chars[10](U32)='ÀÈÙ¼';
   text.vga_alias	=dev.uncached_alias+VGAM_GRAPHICS;
   text.vga_text_alias	=dev.uncached_alias+VGAM_TEXT;
   if (!Bt(&sys_run_level,RLf_VGA)) { //if text mode
@@ -240,7 +240,7 @@ U0 KMain()
 asm {	ALIGN	16,OC_NOP
 SYS_KERNEL_END::
 #exe {
-  if (kernel_config->opts[CONFIG_DBG_DISTRO])
+  if (kernel_config->opts[CONFIG_DEBUG_DISTRO])
     StreamPrint("DU8 0x%X-(SYS_KERNEL_END-SYS_KERNEL+"
 	"BOOT_RAM_BASE+sizeof(CBinFile)) DUP (0);"
 	"BINFILE \"%s\";",kernel_config->debug_distro_start,
diff --git a/src/Kernel/KMisc.CC b/src/Kernel/KMisc.CC
index 2fa03300..a983e4e9 100755
--- a/src/Kernel/KMisc.CC
+++ b/src/Kernel/KMisc.CC
@@ -45,7 +45,7 @@ I64 BCount(I64 d)
 }
 
 U0 IntCore0TimerHandler(CTask *)
-{//Called from $LK,"IntCore0TimerHandler",A="FF:::/Kernel/KInts.CC,IntCore0TimerHandler"$
+{//Called from $LK,"IntCore0TimerHandler",A="FF:::/Kernel/KInterrupts.CC,IntCore0TimerHandler"$
   I64 i;
   if (mp_count>1)
     while (LBts(&sys_semas[SEMA_SYS_TIMER],0))
@@ -311,12 +311,12 @@ Bool IsSingleUser()
 
 Bool DebugMode(Bool val)
 {//Set debug-mode.
-  return LBEqual(&sys_semas[SEMA_DBG_MODE],0,val);
+  return LBEqual(&sys_semas[SEMA_DEBUG_MODE],0,val);
 }
 
 Bool IsDebugMode()
 {//Return debug-mode.
-  return Bt(&sys_semas[SEMA_DBG_MODE],0);
+  return Bt(&sys_semas[SEMA_DEBUG_MODE],0);
 }
 
 U0 ProgressBarsReset(U8 *path=NULL)
diff --git a/src/Kernel/KStart32.CC b/src/Kernel/KStart32.CC
index 9c7982fe..d060ac73 100755
--- a/src/Kernel/KStart32.CC
+++ b/src/Kernel/KStart32.CC
@@ -28,7 +28,7 @@ kernel_config->opts[CONFIG_HEAP_INIT],kernel_config->heap_init_val,
 kernel_config->opts[CONFIG_VAR_INIT], kernel_config->var_init_val,
 kernel_config->opts[CONFIG_STAFF_MODE]);
 };
-SYS_HEAP_DBG_FLAG::	DU8	_CONFIG_HEAP_DBG;
+SYS_HEAP_DEBUG_FLAG::	DU8	_CONFIG_HEAP_DEBUG;
 
 	ALIGN	8,0
 SYS_CTRL_ALT_FLAGS::	DU64	0;
diff --git a/src/Kernel/KTask.CC b/src/Kernel/KTask.CC
index 523775fe..6f33e6a3 100755
--- a/src/Kernel/KTask.CC
+++ b/src/Kernel/KTask.CC
@@ -1,7 +1,7 @@
 U0 Exit()
 {//Terminate own task.
   if (Fs==sys_focus_task && IsDebugMode) {
-    LBts(&Fs->task_flags,TASKf_KILL_AFTER_DBG);
+    LBts(&Fs->task_flags,TASKf_KILL_AFTER_DEBUG);
     G;
   } else {
     if (sys_staff_mode_flag)
diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP
index c803ee14..ffea619d 100755
--- a/src/Kernel/Kernel.MAP
+++ b/src/Kernel/Kernel.MAP
@@ -411,7 +411,6 @@ $LK,"StrPrintHex",A="FL:::/Kernel/StrA.CC,1",BI=86$
 $LK,"_D3_ADD_EQU",A="FL:::/Kernel/KMathA.CC,239"$
 $LK,"F64_MAX",A="FL:::/Kernel/KernelA.HH,47"$
 $LK,"SYS_MP_COUNT_LOCK",A="FL:::/Kernel/KStart32.CC,67"$
-$LK,"_CONFIG_HEAP_DBG",A="FL:::/Kernel/KernelA.HH,2773"$
 $LK,"Cf_EXTERN",A="FL:::/Kernel/KernelA.HH,835"$
 $LK,"HPET_GCAP_ID",A="FL:::/Kernel/KernelA.HH,554"$
 $LK,"ATan",A="FL:::/Kernel/KernelB.HH,95"$
@@ -505,7 +504,6 @@ $LK,"ACD_H1",A="FL:::/Kernel/KernelA.HH,1513"$
 $LK,"Ff_RET1",A="FL:::/Kernel/KernelA.HH,859"$
 $LK,"RS_ATTR_ARCHIVE",A="FL:::/Kernel/KernelA.HH,2502"$
 $LK,"DOCEf_UPDATE_DATA",A="FL:::/Kernel/KernelA.HH,1101"$
-$LK,"EXT_DBG_RESUME",A="FL:::/Kernel/KernelA.HH,600"$
 $LK,"WINMGR_PERIOD",A="FL:::/Kernel/KernelA.HH,1480"$
 $LK,"FSt_FAT32",A="FL:::/Kernel/KernelA.HH,2660"$
 $LK,"OPTf_WARN_PAREN",A="FL:::/Kernel/KernelA.HH,1549"$
@@ -530,7 +528,7 @@ $LK,"_CPUID",A="FL:::/Kernel/KUtils.CC,319"$
 $LK,"Caller",A="FL:::/Kernel/KDebug.CC,60",BI=114$
 $LK,"SUF_S2T",A="FL:::/Kernel/KernelA.HH,3737"$
 $LK,"ATA_DEV_RST",A="FL:::/Kernel/KernelA.HH,2270"$
-$LK,"INT_MP_CRASH_ADDR",A="FL:::/Kernel/KInts.CC,2"$
+$LK,"INT_MP_CRASH_ADDR",A="FL:::/Kernel/KInterrupts.CC,2"$
 $LK,"RWF_LAST_DOLLAR",A="FL:::/Kernel/KernelA.HH,3537"$
 $LK,"RS_ATTR_CONTIGUOUS",A="FL:::/Kernel/KernelA.HH,2509"$
 $LK,"ARGT_NONE",A="FL:::/Kernel/KernelA.HH,1889"$
@@ -624,6 +622,7 @@ $LK,"CKbdStateGlobals",A="FL:::/Kernel/KernelA.HH,2958"$
 $LK,"DOCEf_LINK",A="FL:::/Kernel/KernelA.HH,1091"$
 $LK,"DOCEF_LINK",A="FL:::/Kernel/KernelA.HH,1003"$
 $LK,"D3Copy",A="FL:::/Kernel/KernelB.HH,147"$
+$LK,"SYS_HEAP_DEBUG_FLAG",A="FL:::/Kernel/KStart32.CC,31"$
 $LK,"MESSAGE_MS_L_D_UP",A="FL:::/Kernel/KernelA.HH,3182"$
 $LK,"Beep",A="FL:::/Kernel/KMisc.CC,237",BI=125$
 $LK,"mouse_hard",A="FL:::/Kernel/KGlobals.CC,28"$
@@ -753,7 +752,7 @@ $LK,"_TEST_EXCEPT",A="FL:::/Kernel/KExcept.CC,4"$
 $LK,"_FSTCW",A="FL:::/Kernel/KMathA.CC,632"$
 $LK,"ScanFlags",A="FL:::/Kernel/StrB.CC,123",BI=147$
 $LK,"Ln",A="FL:::/Kernel/KernelB.HH,134"$
-$LK,"INT_WAKE",A="FL:::/Kernel/KInts.CC,6"$
+$LK,"INT_WAKE",A="FL:::/Kernel/KInterrupts.CC,6"$
 $LK,"Letter2Letter",A="FL:::/Kernel/BlkDev/DiskDrive.CC,161",BI=148$
 $LK,"GetS",A="FL:::/Kernel/SerialDev/Message.CC,209",BI=149$
 $LK,"_MEMSET_U32",A="FL:::/Kernel/KUtils.CC,29"$
@@ -824,7 +823,6 @@ $LK,"SYS_PROGRESS4_DESC",A="FL:::/Kernel/KStart32.CC,60"$
 $LK,"__FILE__",A="FL:::/Kernel/KernelA.HH,2041"$
 $LK,"CDate",A="FL:::/Kernel/KernelA.HH,187"$
 $LK,"CLFlush",A="FL:::/Kernel/KernelB.HH,275"$
-$LK,"SYS_HEAP_DBG_FLAG",A="FL:::/Kernel/KStart32.CC,31"$
 $LK,"_RIP",A="FL:::/Kernel/KernelA.HH,3377"$
 $LK,"ISOT_SUPPLEMENTARY_DESC",A="FL:::/Kernel/KernelA.HH,2464"$
 $LK,"IEF_REX_ONLY_R8_R15",A="FL:::/Kernel/KernelA.HH,1744"$
@@ -887,7 +885,7 @@ $LK,"RS_ATTR_VOL_ID",A="FL:::/Kernel/KernelA.HH,2500"$
 $LK,"DOCf_UNDERLINE",A="FL:::/Kernel/KernelA.HH,1337"$
 $LK,"DOCF_UNDERLINE",A="FL:::/Kernel/KernelA.HH,1299"$
 $LK,"DOCT_UNDERLINE",A="FL:::/Kernel/KernelA.HH,928"$
-$LK,"IntDivZero",A="FL:::/Kernel/KInts.CC,150",BI=179$
+$LK,"IntDivZero",A="FL:::/Kernel/KInterrupts.CC,150",BI=179$
 $LK,"MemPagFree",A="FL:::/Kernel/Memory/MemPag.CC,83",BI=180$
 $LK,"_SQR",A="FL:::/Kernel/KMathA.CC,337"$
 $LK,"DISPLAYf_SILENT",A="FL:::/Kernel/KernelA.HH,3249"$
@@ -905,9 +903,9 @@ $LK,"ICF_RES_NOT_USED",A="FL:::/Kernel/KernelA.HH,1611"$
 $LK,"DOCEt_SEL",A="FL:::/Kernel/KernelA.HH,960"$
 $LK,"ArcDetermineCompressionType",A="FL:::/Kernel/Compress.CC,102",BI=183$
 $LK,"FlushMessages",A="FL:::/Kernel/SerialDev/Message.CC,87",BI=184$
-$LK,"IntInit1",A="FL:::/Kernel/KInts.CC,180",BI=185$
+$LK,"IntInit1",A="FL:::/Kernel/KInterrupts.CC,180",BI=185$
 $LK,"CH_CURSOR",A="FL:::/Kernel/KernelA.HH,3452"$
-$LK,"IntInit2",A="FL:::/Kernel/KInts.CC,195",BI=186$
+$LK,"IntInit2",A="FL:::/Kernel/KInterrupts.CC,195",BI=186$
 $LK,"MemCompare",A="FL:::/Kernel/KernelB.HH,167"$
 $LK,"DOCT_CURSOR",A="FL:::/Kernel/KernelA.HH,910"$
 $LK,"GetKey",A="FL:::/Kernel/SerialDev/Message.CC,142",BI=187$
@@ -1030,7 +1028,6 @@ $LK,"OS_LINUX",A="FL:::/Kernel/KernelA.HH,3886"$
 $LK,"InputFilterTask",A="FL:::/Kernel/SerialDev/Message.CC,1",BI=221$
 $LK,"SYS_HASH_STR",A="FL:::/Kernel/KHashA.CC,4"$
 $LK,"ATAR0_CMD",A="FL:::/Kernel/KernelA.HH,2296"$
-$LK,"I_DBG",A="FL:::/Kernel/KernelA.HH,310"$
 $LK,"FATNameTo",A="FL:::/Kernel/BlkDev/FileSysFAT.CC,118",BI=222$
 $LK,"MinI64",A="FL:::/Kernel/KernelB.HH,101"$
 $LK,"MaxU64",A="FL:::/Kernel/KernelB.HH,100"$
@@ -1145,7 +1142,7 @@ $LK,"blkdev_text_attr",A="FL:::/Kernel/BlkDev/DiskDrive.CC,318"$
 $LK,"ListSub",A="FL:::/Kernel/StrA.CC,397",BI=243$
 $LK,"SC_F8",A="FL:::/Kernel/KernelA.HH,3524"$
 $LK,"Mute",A="FL:::/Kernel/KMisc.CC,251",BI=244$
-$LK,"INT_FAULT",A="FL:::/Kernel/KInts.CC,62"$
+$LK,"INT_FAULT",A="FL:::/Kernel/KInterrupts.CC,62"$
 $LK,"progress2_desc",A="FL:::/Kernel/KernelB.HH,214"$
 $LK,"DCSF_PALETTE_GET",A="FL:::/Kernel/KernelA.HH,3588"$
 $LK,"SC_F9",A="FL:::/Kernel/KernelA.HH,3525"$
@@ -1202,7 +1199,7 @@ $LK,"sqrt2",A="FL:::/Kernel/KernelA.HH,58"$
 $LK,"VM_QEMU",A="FL:::/Kernel/KernelA.HH,3892"$
 $LK,"ATAR0_SEL",A="FL:::/Kernel/KernelA.HH,2294"$
 $LK,"DOCEf_FLAGS_NUM",A="FL:::/Kernel/KernelA.HH,1117"$
-$LK,"IntFaultHandlersNew",A="FL:::/Kernel/KInts.CC,166",BI=256$
+$LK,"IntFaultHandlersNew",A="FL:::/Kernel/KInterrupts.CC,166",BI=256$
 $LK,"SpawnQueue",A="FL:::/Kernel/MultiProc.CC,247",BI=257$
 $LK,"DriveBlkDevDel",A="FL:::/Kernel/BlkDev/DiskDrive.CC,78",BI=258$
 $LK,"mem_boot_base",A="FL:::/Kernel/KernelB.HH,37"$
@@ -1326,7 +1323,7 @@ $LK,"BOOT_SRC_RAM",A="FL:::/Kernel/KernelA.HH,3841"$
 $LK,"TK_AND_EQU",A="FL:::/Kernel/KernelA.HH,2105"$
 $LK,"I64",A="FL:::/Kernel/KernelA.HH,106"$
 $LK,"PopUpPrint",A="FL:::/Kernel/Job.CC,397",BI=278$
-$LK,"IntEntryGet",A="FL:::/Kernel/KInts.CC,97",BI=279$
+$LK,"IntEntryGet",A="FL:::/Kernel/KInterrupts.CC,97",BI=279$
 $LK,"FILEMASK_GR",A="FL:::/Kernel/KernelA.HH,2305"$
 $LK,"CD2",A="FL:::/Kernel/KernelA.HH,151"$
 $LK,"MouseHardGetType",A="FL:::/Kernel/SerialDev/Mouse.CC,103",BI=280$
@@ -1448,7 +1445,7 @@ $LK,"SYS_MP_COUNT_INITIAL",A="FL:::/Kernel/KStart32.CC,66"$
 $LK,"TaskQueueRemove",A="FL:::/Kernel/Sched.CC,301",BI=305$
 $LK,"U64",A="FL:::/Kernel/KernelA.HH,96"$
 $LK,"FSize",A="FL:::/Kernel/BlkDev/DiskCFile.CC,1",BI=306$
-$LK,"IntEntrySet",A="FL:::/Kernel/KInts.CC,109",BI=307$
+$LK,"IntEntrySet",A="FL:::/Kernel/KInterrupts.CC,109",BI=307$
 $LK,"Mem32DevIns",A="FL:::/Kernel/Memory/MemPhysical.CC,1",BI=308$
 $LK,"FUf_FLATTEN_TREE",A="FL:::/Kernel/KernelA.HH,2560"$
 $LK,"WIf_FOCUS_TASK_MS_L",A="FL:::/Kernel/KernelA.HH,1462"$
@@ -1568,7 +1565,7 @@ $LK,"FUF_WHOLE_LABELS_BEFORE",A="FL:::/Kernel/KernelA.HH,2590"$
 $LK,"TK_MUL_EQU",A="FL:::/Kernel/KernelA.HH,2103"$
 $LK,"TK_NOT_EQU",A="FL:::/Kernel/KernelA.HH,2095"$
 $LK,"CFileNameTo",A="FL:::/Kernel/BlkDev/DiskStrB.CC,1",BI=336$
-$LK,"IntNop",A="FL:::/Kernel/KInts.CC,143",BI=337$
+$LK,"IntNop",A="FL:::/Kernel/KInterrupts.CC,143",BI=337$
 $LK,"_D3_MUL_EQU",A="FL:::/Kernel/KMathA.CC,273"$
 $LK,"DISPLAYf_SHOW",A="FL:::/Kernel/KernelA.HH,3247"$
 $LK,"DOF_DONT_SHOW",A="FL:::/Kernel/KernelA.HH,1232"$
@@ -1806,12 +1803,12 @@ $LK,"SUF_REM_LEADING",A="FL:::/Kernel/KernelA.HH,3731"$
 $LK,"OPTf_USE_IMM64",A="FL:::/Kernel/KernelA.HH,1558"$
 $LK,"Raw",A="FL:::/Kernel/KMisc.CC,290",BI=395$
 $LK,"ZMAlloc",A="FL:::/Kernel/Memory/MAllocFree.CC,390",BI=396$
+$LK,"I_DEBUG",A="FL:::/Kernel/KernelA.HH,310"$
 $LK,"DOCT_PROMPT",A="FL:::/Kernel/KernelA.HH,912"$
 $LK,"MemPagAlloc",A="FL:::/Kernel/Memory/MemPag.CC,11",BI=397$
 $LK,"OPTf_GLBLS_ON_DATA_HEAP",A="FL:::/Kernel/KernelA.HH,1555"$
 $LK,"KbdInit",A="FL:::/Kernel/SerialDev/Keyboard.CC,424",BI=398$
 $LK,"ToBool",A="FL:::/Kernel/KernelB.HH,119"$
-$LK,"TASKf_KILL_AFTER_DBG",A="FL:::/Kernel/KernelA.HH,3242"$
 $LK,"PUT_HEX_U16",A="FL:::/Kernel/StrA.CC,37"$
 $LK,"PUT_HEX_U32",A="FL:::/Kernel/StrA.CC,30"$
 $LK,"ATAPIStartStop",A="FL:::/Kernel/BlkDev/DiskATA.CC,144",BI=399$
@@ -1911,6 +1908,7 @@ $LK,"DOCEf_FILTER_SKIP",A="FL:::/Kernel/KernelA.HH,1112"$
 $LK,"SCF_NUM",A="FL:::/Kernel/KernelA.HH,3484"$
 $LK,"ACD_DEF_FILENAME",A="FL:::/Kernel/KernelA.HH,1511"$
 $LK,"fp_doc_put",A="FL:::/Kernel/KGlobals.CC,34"$
+$LK,"SEMA_DEBUG_MODE",A="FL:::/Kernel/KernelA.HH,615"$
 $LK,"IsRaw",A="FL:::/Kernel/KMisc.CC,297",BI=416$
 $LK,"TK_DBL_COLON",A="FL:::/Kernel/KernelA.HH,2091"$
 $LK,"ATAPIReadTrackInfo",A="FL:::/Kernel/BlkDev/DiskATA.CC,281",BI=417$
@@ -2012,7 +2010,6 @@ $LK,"DOC_DEFAULT",A="FL:::/Kernel/KernelA.HH,1168"$
 $LK,"DOCEf_DEFINE",A="FL:::/Kernel/KernelA.HH,1061"$
 $LK,"HeapCtrlInit",A="FL:::/Kernel/Memory/HeapCtrl.CC,1",BI=439$
 $LK,"MESSAGE_MS_MOVE",A="FL:::/Kernel/KernelA.HH,3178"$
-$LK,"SEMA_DBG_MODE",A="FL:::/Kernel/KernelA.HH,615"$
 $LK,"BlkWriteZero",A="FL:::/Kernel/BlkDev/DiskBlk.CC,2",BI=440$
 $LK,"progress1",A="FL:::/Kernel/KernelB.HH,206"$
 $LK,"Floor",A="FL:::/Kernel/KernelB.HH,131"$
@@ -2124,7 +2121,7 @@ $LK,"OPTf_NO_BUILTIN_CONST",A="FL:::/Kernel/KernelA.HH,1557"$
 $LK,"HTG_SRC_SYM",A="FL:::/Kernel/KernelA.HH,717"$
 $LK,"LAPIC_LVT_THERMAL",A="FL:::/Kernel/KernelA.HH,520"$
 $LK,"RFLAGf_IOPL0",A="FL:::/Kernel/KernelA.HH,330"$
-$LK,"IntsInit",A="FL:::/Kernel/KInts.CC,129",BI=459$
+$LK,"IntsInit",A="FL:::/Kernel/KInterrupts.CC,129",BI=459$
 $LK,"_XCHG_U8",A="FL:::/Kernel/KUtils.CC,208"$
 $LK,"DOCEF_CHECK_COLLAPSABLE",A="FL:::/Kernel/KernelA.HH,1011"$
 $LK,"RFLAGf_IOPL1",A="FL:::/Kernel/KernelA.HH,331"$
@@ -2186,6 +2183,7 @@ $LK,"ACD_BLK_SIZE",A="FL:::/Kernel/KernelA.HH,1523"$
 $LK,"CSysLimitBase",A="FL:::/Kernel/KernelA.HH,363"$
 $LK,"DVD_BLK_SIZE",A="FL:::/Kernel/KernelA.HH,2310"$
 $LK,"CGrSym",A="FL:::/Kernel/KernelA.HH,3592"$
+$LK,"TASKf_KILL_AFTER_DEBUG",A="FL:::/Kernel/KernelA.HH,3242"$
 $LK,"ATAR0_FEAT",A="FL:::/Kernel/KernelA.HH,2289"$
 $LK,"RLF_HOME",A="FL:::/Kernel/KernelA.HH,491"$
 $LK,"RLf_HOME",A="FL:::/Kernel/KernelA.HH,469"$
@@ -2201,6 +2199,7 @@ $LK,"char_bmp_filename",A="FL:::/Kernel/StrA.CC,345"$
 $LK,"FunSegCacheAdd",A="FL:::/Kernel/FunSeg.CC,92",BI=472$
 $LK,"CTRLT_GENERIC",A="FL:::/Kernel/KernelA.HH,3038"$
 $LK,"CCF_KEEP_AT_SIGN",A="FL:::/Kernel/KernelA.HH,2148"$
+$LK,"_CONFIG_HEAP_DEBUG",A="FL:::/Kernel/KernelA.HH,2773"$
 $LK,"RS_ATTR_DIR",A="FL:::/Kernel/KernelA.HH,2501"$
 $LK,"CCF_POSTDEC",A="FL:::/Kernel/KernelA.HH,2163"$
 $LK,"FileExtRemove",A="FL:::/Kernel/BlkDev/DiskStrA.CC,10",BI=473$
@@ -2568,7 +2567,7 @@ $LK,"CTRL_ALT_TAB",A="FL:::/Kernel/KernelA.HH,637"$
 $LK,"RFLAGf_VINT_PENDING",A="FL:::/Kernel/KernelA.HH,337"$
 $LK,"DirEntryDel2",A="FL:::/Kernel/BlkDev/DiskDirA.CC,23",BI=550$
 $LK,"DefineLoad",A="FL:::/Kernel/KDefine.CC,1",BI=551$
-$LK,"INT_FAULT_ERR_CODE_BITMAP",A="FL:::/Kernel/KInts.CC,94"$
+$LK,"INT_FAULT_ERR_CODE_BITMAP",A="FL:::/Kernel/KInterrupts.CC,94"$
 $LK,"ICF_NO_RIP",A="FL:::/Kernel/KernelA.HH,1628"$
 $LK,"SUF_REM_CTRL_CHARS",A="FL:::/Kernel/KernelA.HH,3730"$
 $LK,"SC_SHIFT",A="FL:::/Kernel/KernelA.HH,3501"$
@@ -2657,7 +2656,7 @@ $LK,"SC_NUM",A="FL:::/Kernel/KernelA.HH,3505"$
 $LK,"MEM_BOOT_BASE",A="FL:::/Kernel/KStart16.CC,30"$
 $LK,"IEF_DONT_SWITCH_MODES",A="FL:::/Kernel/KernelA.HH,1740"$
 $LK,"I_TIMER",A="FL:::/Kernel/KernelA.HH,306"$
-$LK,"IRQ_TIMER",A="FL:::/Kernel/KInts.CC,16"$
+$LK,"IRQ_TIMER",A="FL:::/Kernel/KInterrupts.CC,16"$
 $LK,"DOC_COLOR_TREE",A="FL:::/Kernel/KernelA.HH,1144"$
 $LK,"DOCEf_HAS_BIN",A="FL:::/Kernel/KernelA.HH,1067"$
 $LK,"DOCEF_HAS_BIN",A="FL:::/Kernel/KernelA.HH,979"$
@@ -2782,6 +2781,7 @@ $LK,"LAPIC_PROCESSOR_PRIORITY",A="FL:::/Kernel/KernelA.HH,504"$
 $LK,"Core0Init",A="FL:::/Kernel/MultiProc.CC,354",BI=592$
 $LK,"ARGT_DS",A="FL:::/Kernel/KernelA.HH,1939"$
 $LK,"ARGT_R8",A="FL:::/Kernel/KernelA.HH,1904"$
+$LK,"EXT_DEBUG_RESUME",A="FL:::/Kernel/KernelA.HH,600"$
 $LK,"JOBf_DONT_FILTER",A="FL:::/Kernel/KernelA.HH,3132"$
 $LK,"ISOT_PRI_VOL_DESC",A="FL:::/Kernel/KernelA.HH,2463"$
 $LK,"ARGT_ES",A="FL:::/Kernel/KernelA.HH,1940"$
diff --git a/src/Kernel/Kernel.PRJ b/src/Kernel/Kernel.PRJ
index cec1b58f..5feaa5af 100755
--- a/src/Kernel/Kernel.PRJ
+++ b/src/Kernel/Kernel.PRJ
@@ -29,10 +29,10 @@
 #include "KMathB"
 #include "Sched"
 #include "Memory/MakeMemory"
-#include "FontStd"
+#include "FontStd"
 #include "StrB"
 #include "KHashA"
-#include "KInts"
+#include "KInterrupts"
 #include "KDataTypes"
 #include "Compress"
 #include "KHashB"
diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH
index ac8b8e8c..987fdf32 100755
--- a/src/Kernel/KernelA.HH
+++ b/src/Kernel/KernelA.HH
@@ -307,7 +307,7 @@ public class CMathODE
 //Software Interrupts
 #define I_MP_CRASH		0x30
 #define I_WAKE			0x31
-#define I_DBG			0x32
+#define I_DEBUG			0x32
 //See $LK,"ST_INT_NAMES",A="MN:ST_INT_NAMES"$
 
 //You might want to start backward from
@@ -597,7 +597,7 @@ class CRAXRBCRCXRDX
 #define EXT_WIN_FOCUS		1
 #define EXT_HEAPLOG_MALLOC	2
 #define EXT_HEAPLOG_FREE	3
-#define EXT_DBG_RESUME		4
+#define EXT_DEBUG_RESUME		4
 #define EXT_EXTS_NUM		5
 
 #help_index "Processor"
@@ -612,7 +612,7 @@ class CSema
 #define SEMA_RECORD_MACRO	1
 #define SEMA_SYS_TIMER		2
 #define SEMA_SYS_DATE		3
-#define SEMA_DBG_MODE		4
+#define SEMA_DEBUG_MODE		4
 #define SEMA_SOUND		5
 #define SEMA_HEAPLOG_ACTIVE	6
 #define SEMA_HEAPLOG_LOCK	7
@@ -2770,9 +2770,9 @@ public class CFile //See $LK,"::/Demo/Disk/DataBase.CC"$.
 };
 
 #help_index "Memory/Heap"
-#define _CONFIG_HEAP_DBG FALSE
+#define _CONFIG_HEAP_DEBUG FALSE
 
-#if _CONFIG_HEAP_DBG
+#if _CONFIG_HEAP_DEBUG
 class CMemUnused
 {
   CHeapCtrl *hc;
@@ -3239,7 +3239,7 @@ public class CTaskSettings
 #define TASKf_BREAK_LOCKED	10
 #define TASKf_PENDING_BREAK	11
 #define TASKf_BREAK_TO_SHIFT_ESC 12
-#define TASKf_KILL_AFTER_DBG	13
+#define TASKf_KILL_AFTER_DEBUG	13
 
 #define TASKf_NONTIMER_RAND	14
 
@@ -3457,7 +3457,7 @@ public class CSysFixedArea
 #define CH_SPACE	0x20
 
 #define ST_ERR_ST   "$$RED$$$$BK,1$$ERROR:$$FG$$$$BK,0$$ "
-#define ST_WARN_ST  "$$LTRED$$$$BK,1$$WARNING:$$FG$$$$BK,0$$ "
+#define ST_WARN_ST  "$$LTRED$$$$BK,1$$WARNING:$$FG$$$$BK,0$$ "
 
 //Scan code flags
 #define SCf_E0_PREFIX	7
diff --git a/src/Kernel/KernelB.HH b/src/Kernel/KernelB.HH
index e0c2aad9..26bce42a 100755
--- a/src/Kernel/KernelB.HH
+++ b/src/Kernel/KernelB.HH
@@ -166,7 +166,7 @@ public _extern _D3_ZERO CD3 *D3Zero(CD3 *dst); //To zero
 public _extern _MEMCOMPARE I64 MemCompare(
 	U8 *ptr1,U8 *ptr2,I64 count); //Compare chunk of memory.
 public _extern _MEMCOPY U8 *MemCopy(
-	U8 *dst,U8 *src,I64 count); //Copy chunk of memory. Only goes forward.
+	U8 *dst,U8 *src,I64 count); //Copy chunk of memory. Only goes forward.
 public _extern _MEMSET U8 *MemSet(
 	U8 *dst,I64 val,I64 count); //Set chunk of U8s to value.
 public _extern _MEMSET_I64 I64 *MemSetI64(
@@ -174,7 +174,7 @@ public _extern _MEMSET_I64 I64 *MemSetI64(
 public _extern _MEMSET_U16 U16 *MemSetU16(
 	U16 *dst,I64 val,I64 U16count); //Set chunk of U16s to value.
 public _extern _MEMSET_U32 U32 *MemSetU32(U32 *dst,I64 val,I64 U32count); //Set chunk of U32s to value.
-_extern SYS_HEAP_DBG_FLAG	U8 sys_heap_debug;
+_extern SYS_HEAP_DEBUG_FLAG	U8 sys_heap_debug;
 _extern SYS_HEAP_INIT_FLAG	U8 sys_heap_init_flag;
 _extern SYS_HEAP_INIT_VAL	U8 sys_heap_init_val;
 _extern SYS_MEM_INIT_FLAG	U8 sys_mem_init_flag;
diff --git a/src/Kernel/Memory/MAllocFree.CC b/src/Kernel/Memory/MAllocFree.CC
index e0a74fca..9d9eaaeb 100755
--- a/src/Kernel/Memory/MAllocFree.CC
+++ b/src/Kernel/Memory/MAllocFree.CC
@@ -150,7 +150,7 @@ MALLOC_ALMOST_DONE:
 //RDX=HeapCtrl
 	ADD	U64 CHeapCtrl.used_u8s[RDX],RAX
 
-#if _CONFIG_HEAP_DBG
+#if _CONFIG_HEAP_DEBUG
 //QueueInsert
 	MOV	RDI,U64 CHeapCtrl.last_um[RDX]
 	MOV	U64 CMemUsed.next[RDI],RSI
@@ -248,7 +248,7 @@ _FREE::
 @@15:	MOV	RSI,U64 SF_ARG1[RBP]
 	TEST	RSI,RSI
 
-#if _CONFIG_HEAP_DBG
+#if _CONFIG_HEAP_DEBUG
 	JZ	I32 FREE_DONE
 #else
 	JZ	FREE_DONE
@@ -277,7 +277,7 @@ _FREE::
 	BTS	U32 CHeapCtrl.locked_flags[RDX],HClf_LOCKED
 	PAUSE
 	JC	@@30
-#if _CONFIG_HEAP_DBG
+#if _CONFIG_HEAP_DEBUG
 //QueueRemove
 	MOV	RDX,U64 CMemUsed.next[RSI]
 	MOV	RDI,U64 CMemUsed.last[RSI]
diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso
index d5f6fc3d..0479d904 100755
Binary files a/src/Tmp/MyDistro.iso and b/src/Tmp/MyDistro.iso differ
diff --git a/src/Zenith/Utils/Profiler.CC b/src/Zenith/Utils/Profiler.CC
index 93a2e5de..fc403e2d 100755
--- a/src/Zenith/Utils/Profiler.CC
+++ b/src/Zenith/Utils/Profiler.CC
@@ -9,7 +9,7 @@ I64 pf_buf_in_ptr=0,pf_depth;
 I64 pf_prof_active=0;
 
 U0 ProfTimerInt(CTask *task)
-{//See $LK,"profiler_timer_irq",A="FF:::/Kernel/KInts.CC,profiler_timer_irq"$.
+{//See $LK,"profiler_timer_irq",A="FF:::/Kernel/KInterrupts.CC,profiler_timer_irq"$.
   I64 i,k;
   if (Bt(&pf_prof_active,0))
     for (k=0;k<=pf_depth;k++) {
diff --git a/src/Zenith/ZMemory.CC b/src/Zenith/ZMemory.CC
index f8d3a1fb..49e77525 100755
--- a/src/Zenith/ZMemory.CC
+++ b/src/Zenith/ZMemory.CC
@@ -135,7 +135,7 @@ public Bool HeapCtrlWalk(CHeapCtrl *hc)
     uum=uum->next;
   }
 
-  #if _CONFIG_HEAP_DBG
+  #if _CONFIG_HEAP_DEBUG
   CMemUsed *um,*um1;
   um1=(&hc->next_um)(U8 *)-offset(CMemUsed.next);
   um=um1->next;