diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 93dbd045..18056e92 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -3870,7 +3870,7 @@ INITSYS4:
 	DIAG(0)				; CLEAR BOOT DIAG LED(S)
 	FPLEDS(DIAG_00)			; CLEAR FP LEDS
 ;
-; CHAIN TO LOADER
+; CHAIN TO ROM LOADER (ROMLDR)
 ;
 #IFDEF ROMBOOT
 	LD	A,BID_IMG0		; CHAIN TO OS IMAGES BANK
diff --git a/Source/HBIOS/invntdev.asm b/Source/HBIOS/invntdev.asm
index 980392cb..6647b8bb 100644
--- a/Source/HBIOS/invntdev.asm
+++ b/Source/HBIOS/invntdev.asm
@@ -505,6 +505,9 @@ PS_PAD1:
 ; Support Routines
 ;*****************************************************************************
 ;
+; TODO Ideally we wouldnt import all these here, as they take up quite a
+; bit of space. Util.asm needs to be broken up, or copy required code here
+;
 #include	"util.asm"
 #INCLUDE 	"decode.asm"
 #include	"bcd.asm"
diff --git a/Source/HBIOS/layout.inc b/Source/HBIOS/layout.inc
index cd177e0e..c2c7af62 100644
--- a/Source/HBIOS/layout.inc
+++ b/Source/HBIOS/layout.inc
@@ -76,6 +76,9 @@ MON_END		.EQU	MON_LOC + MON_SIZ	; ENDING ADDRESS OF RUNNING MONITOR
 MON_IMGLOC	.EQU	BNK_NXTLOC		; LOCATION OF BINARY LOAD IMAGE IN BANK
 BNK_NXTLOC	.SET	MON_IMGLOC + MON_SIZ	; IMG LOC OF NEXT COMPONENT
 ;
+MON_DSKY	.EQU	MON_LOC + (0 * 3)	; MONITOR ENTRY (DSKY)
+MON_SERIAL	.EQU	MON_LOC + (1 * 3)	; MONITOR ENTRY (SERIAL PORT)
+;
 ZSYS_BNK	.EQU	BNK_CUR
 ZSYS_LOC	.EQU	CPM_LOC			; RUNNING LOCATION OF ZSYSTEM
 ZSYS_SIZ	.EQU	CPM_SIZ			; SIZE OF ZSYSTEM BINARY IMAGE
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index 0aeab579..ffabb24f 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -866,7 +866,7 @@ help:
 	ld	hl,str_help1		; load first help string
 	call	pstr			; display it
 	ld	a,(bootmode)		; get boot mode
-	cp	BM_ROMBOOT		; ROM boot?	
+	cp	BM_ROMBOOT		; ROM boot?
 	jr	nz,help1		; if not, skip str_help2
 	ld	hl,str_help2		; load second help string
 	call	pstr			; display it
@@ -2334,9 +2334,6 @@ prtall:
 ;
 ; Print list of all drives (UNA)
 ;
-; TODO Ideally the following code should be moved into InvntDev.ASM
-; Rom application ("D") which is called from above.
-;
 prtall:
 	ld	hl,str_devlst		; device list header string
 	call	pstr			; display it
@@ -2595,7 +2592,7 @@ str_diaglvl	.db	"\r\n\r\nHBIOS Diagnostic Level: ",0
 ; Help text is broken into 3 pieces because an application mode boot
 ; does allow access to the ROM-hosted features.  The str_help2 portion
 ; is only displayed for a ROM boot.
-; 
+;
 str_help1:
 		.db	"\r\n"
 		.db	"\r\n  L           - List ROM Applications"
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index 7c05541c..80041767 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -329,11 +329,11 @@ SYQMODE_MG014	.EQU	2		; RCBUS MG014 STYLE INTERFACE
 ;
 ; PCF CLOCK CHIP FREQUENCIES
 ;
-PCFCLK_3   	.EQU	$00		;  3    MHz 
+PCFCLK_3   	.EQU	$00		;  3    MHz
 PCFCLK_443 	.EQU	$10            ;  4.43 MHz
-PCFCLK_6   	.EQU	$14            ;  6    MHz 
-PCFCLK_8   	.EQU	$18            ;  8    MHz 
-PCFCLK_12  	.EQU	$1C            ; 12    MHz 
+PCFCLK_6   	.EQU	$14            ;  6    MHz
+PCFCLK_8   	.EQU	$18            ;  8    MHz
+PCFCLK_12  	.EQU	$1C            ; 12    MHz
 ;
 ; PCF TRANSMISSION FREQUENCIES
 ;
@@ -978,9 +978,7 @@ APP_BNKS	.SET	0
 ;
 #INCLUDE "layout.inc"
 ;
-;
-MON_DSKY	.EQU	MON_LOC + (0 * 3)	; MONITOR ENTRY (DSKY)
-MON_SERIAL	.EQU	MON_LOC + (1 * 3)	; MONITOR ENTRY (SERIAL PORT)
+; ---------------------------
 ;
 ; INTERRUPT MODE 2 SLOT ASSIGNMENTS
 ;