diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 0b5b113b..3773112a 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -945,11 +945,13 @@ HB_START1:				; BNKCALL ARRIVES HERE, BUT NOW RUNNING IN RAM BANK
 	LD	HL,MSG_HBVER
 	CALL	DSKY_SHOWSEG
 #ENDIF
-
-#IF	(WBWDEBUG=USEMIO)		; BUFFER OUTPUT UNTIL
+;
+#IF (WBWDEBUG == USEMIO)		; BUFFER OUTPUT UNTIL
 	CALL	MIO_INIT		; WE GET TO BOOT MESSAGE
 #ENDIF
 ;
+#IF 0
+;
 ; TEST DEBUG ***************************************************************************************
 ;
 	PRTS("DEBUG-IVT$")
@@ -959,6 +961,7 @@ HB_START1:				; BNKCALL ARRIVES HERE, BUT NOW RUNNING IN RAM BANK
 ;
 ; TEST DEBUG ***************************************************************************************
 ;
+#ENDIF
 ;
 ; DISCOVER CPU TYPE
 ;
@@ -1031,7 +1034,8 @@ HB_CPU1:
 ;
 ; PRE-CONSOLE INITIALIZATION
 ;
-
+#IF 0
+;
 ; TEST DEBUG ***************************************************************************************
 ;
 	CALL	NEWLINE
@@ -1039,6 +1043,8 @@ HB_CPU1:
 ;
 ; TEST DEBUG ***************************************************************************************
 ;
+#ENDIF
+;
 #IF (ASCIENABLE)
 	CALL	ASCI_PREINIT
 #ENDIF
@@ -1054,12 +1060,17 @@ HB_CPU1:
 #IF (PIO_4P | PIO_ZP)
 	CALL	PIO_PREINIT
 #ENDIF
+;
+#IF 0
+;
 ; TEST DEBUG ***************************************************************************************
 ;
 	CALL	NEWLINE
 	CALL	REGDMP
 ;
 ; TEST DEBUG ***************************************************************************************
+;
+#ENDIF
 ;
 	DIAG(%01111111)
 ;
@@ -1070,7 +1081,7 @@ HB_CPU1:
 	XOR	A			; INITIALLY, FIRST SERIAL UNIT IS CONSOLE
 	LD	(CB_CONDEV),A		; SAVE IT, ACTIVATES CONSOLE ON HBIOS
 
-#IF	(WBWDEBUG=USEMIO)		; OUTPUT ANY CACHED DEBUG TEXT
+#IF (WBWDEBUG == USEMIO)		; OUTPUT ANY CACHED DEBUG TEXT
 	LD	HL,MIOOUTPTR
 	LD	E,(HL)
 	INC	HL
@@ -1088,6 +1099,8 @@ NXTMIO:	LD	A,(HL)
 ;	CALL	WRITESTR		; WRITESTR WILL WORK WILL ONLY PRINT UP TO FIRST $
 #ENDIF
 ;
+#IF 0
+;
 ; TEST DEBUG ***************************************************************************************
 ;
 	CALL	NEWLINE2
@@ -1097,6 +1110,8 @@ NXTMIO:	LD	A,(HL)
 ;
 ; TEST DEBUG ***************************************************************************************
 ;
+#ENDIF
+;
 ; ANNOUNCE HBIOS
 ;
 	CALL	NEWLINE2
@@ -1322,16 +1337,34 @@ PSCNX	.EQU	$ + 1
 ;
 	CALL	NEWLINE2
 	PRTX(STR_PLATFORM)
+;
+	LD	A,(HB_CPUTYPE)		; GET CPU TYPE
+	OR	A			; SET FLAGS
+	LD	DE,HB_STRZ80		; Z80
+	JR	Z,HB_PCPU		; IF Z80, PRINT IT
+	DEC	A			; NEXT CPU TYPE
+	LD	DE,HB_STRZ180		; Z80180
+	JR	Z,HB_PCPU		; IF Z80180, PRINT IT
+	DEC	A			; NEXT CPU TYPE
+	LD	DE,HB_STRZS180K		; Z8S180 REV K
+	JR	Z,HB_PCPU		; IF Z8S180-K, PRINT IT
+	LD	DE,HB_STRZS180N		; Z8S180 REV N
+	JR	HB_PCPU			; PRINT Z8S180-N
+;
+HB_STRZ80	.TEXT	" Z80$"
+HB_STRZ180	.TEXT	" Z80180$"
+HB_STRZS180K	.TEXT	" Z8S180-K$"
+HB_STRZS180N	.TEXT	" Z8S180-N$"
+;
+HB_PCPU:
+	CALL	WRITESTR		; PRINT IT
+;
 	PRTS(" @ $")
 	LD	HL,(CB_CPUKHZ)
 	CALL	PRTD3M			; PRINT AS DECIMAL WITH 3 DIGIT MANTISSA
 	PRTS("MHz$")
 ;
 #IF ((PLATFORM == PLT_N8) | (PLATFORM == PLT_MK4) | (PLATFORM == PLT_RCZ180))
-	LD	A,(HB_CPUTYPE)		; GET CPU TYPE
-	PRTS(" REV=$")
-	ADD	A,$30			; MAKE DISPLAYABLE DIGIT
-	CALL	COUT
 	PRTS(" IO=0x$")
 	LD	A,Z180_BASE
 	CALL	PRTHEXBYTE
@@ -1339,8 +1372,6 @@ PSCNX	.EQU	$ + 1
 ;
 ; DISPLAY CPU CONFIG
 ;
-	;CALL	PRTSTRD
-	;.TEXT	", $"
 	CALL	NEWLINE
 #IF ((PLATFORM == PLT_N8) | (PLATFORM == PLT_MK4) | (PLATFORM == PLT_RCZ180))
 	LD	A,Z180_MEMWAIT
@@ -2746,10 +2777,10 @@ SIZ_PIO		.EQU	$ - ORG_PIO
 #INCLUDE "bcd.asm"
 #INCLUDE "decode.asm"
 ;
-#IF	WBWDEBUG=USEXIO
+#IF (WBWDEBUG == USEXIO)
 #INCLUDE "xio.asm"
 #ENDIF
-#IF	WBWDEBUG=USEMIO
+#IF (WBWDEBUG == USEMIO)
 #INCLUDE "mio.asm"
 #ENDIF
 ;
@@ -3544,11 +3575,12 @@ COUT:
 ;
 COUT1:
 ;	
-#IF	WBWDEBUG=USEXIO
+#IF (WBWDEBUG == USEXIO)
 	LD	A,E			; GET OUTPUT CHAR BACK TO ACCUM
 	CALL	XIO_OUTC		; OUTPUT VIA XIO
 #ENDIF
-#IF	WBWDEBUG=USEMIO
+;
+#IF (WBWDEBUG == USEMIO)
 	LD	A,E
 	CALL	MIO_OUTC		; OUTPUT VIA MIO
 #ENDIF
@@ -3582,10 +3614,11 @@ CIN:
 ;
 CIN1:
 ;
-#IF	WBWDEBUG=USEXIO
+#IF (WBWDEBUG == USEXIO)
 	CALL	XIO_INC			; GET CHAR
 #ENDIF
-#IF	WBWDEBUG=USEMIO
+;
+#IF (WBWDEBUG == USEMIO)
 	CALL	MIO_INC			; GET CHAR
 #ENDIF
 ;
@@ -3617,10 +3650,11 @@ CST:
 ;
 CST1:
 ;
-#IF	WBWDEBUG=USEXIO
+#IF (WBWDEBUG == USEXIO)
 	CALL	XIO_IST			; GET STATUS
 #ENDIF
-#IF	WBWDEBUG=USEMIO
+;
+#IF (WBWDEBUG == USEMIO)
 	CALL	MIO_IST			; GET STATUS
 #ENDIF
 ;
diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm
index 371c5299..e7822b92 100644
--- a/Source/HBIOS/std.asm
+++ b/Source/HBIOS/std.asm
@@ -276,31 +276,31 @@ IVT_PIO3	.EQU	24
 ; SET PLATFORM NAME STRING
 ;
 #IF (PLATFORM == PLT_SBC)
-  #DEFINE 	PLATFORM_NAME	"SBC Z80"
+  #DEFINE 	PLATFORM_NAME	"SBC"
 #ENDIF
 #IF (PLATFORM == PLT_ZETA)
-  #DEFINE 	PLATFORM_NAME	"ZETA Z80"
+  #DEFINE 	PLATFORM_NAME	"ZETA"
 #ENDIF
 #IF (PLATFORM == PLT_ZETA2)
-  #DEFINE 	PLATFORM_NAME	"ZETA Z80 V2"
+  #DEFINE 	PLATFORM_NAME	"ZETA V2"
 #ENDIF
 #IF (PLATFORM == PLT_N8)
-  #DEFINE 	PLATFORM_NAME	"N8 Z180"
+  #DEFINE 	PLATFORM_NAME	"N8"
 #ENDIF
 #IF (PLATFORM == PLT_MK4)
-  #DEFINE 	PLATFORM_NAME	"MARK IV Z180"
+  #DEFINE 	PLATFORM_NAME	"MARK IV"
 #ENDIF
 #IF (PLATFORM == PLT_UNA)
   #DEFINE	PLATFORM_NAME	"UNA"
 #ENDIF
 #IF (PLATFORM == PLT_RCZ80)
-  #DEFINE	PLATFORM_NAME	"RC2014 Z80"
+  #DEFINE	PLATFORM_NAME	"RC2014"
 #ENDIF
 #IF (PLATFORM == PLT_RCZ180)
-  #DEFINE	PLATFORM_NAME	"RC2014 Z180"
+  #DEFINE	PLATFORM_NAME	"RC2014"
 #ENDIF
 #IF (PLATFORM == PLT_EZZ80)
-  #DEFINE	PLATFORM_NAME	"EASY Z80"
+  #DEFINE	PLATFORM_NAME	"EASY"
 #ENDIF
 ;
 ; INCLUDE PLATFORM SPECIFIC HARDWARE DEFINITIONS