diff --git a/src/mon_m65/,imports_monitor.s b/src/mon_m65/,imports_monitor.s
index 30e6b316..49073c70 100644
--- a/src/mon_m65/,imports_monitor.s
+++ b/src/mon_m65/,imports_monitor.s
@@ -7,9 +7,7 @@
 ;; #ALIAS# SETMSG            = KERNAL_0.SETMSG
 ;; #ALIAS# STOP              = KERNAL_0.STOP
 
-;; #ALIAS# map_NORMAL        = KERNAL_0.map_NORMAL
-;; #ALIAS# map_MON_1         = KERNAL_0.map_MON_1
-;; #ALIAS# m65_shadow_BZP    = KERNAL_0.m65_shadow_BZP
+;; #ALIAS# monitor_exit      = KERNAL_0.m65_shadow_BZP
 
 ;; #ALIAS# CHRIN             = KERNAL_0.proxy_M1_CHRIN
 ;; #ALIAS# CHROUT            = KERNAL_0.proxy_M1_CHROUT
diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index 348f0d57..0f750789 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -16,7 +16,7 @@
 ; * Register storage *
 ; ********************
 
-!addr Bank        =  2 ; $00 = C64 address space, $FF = M65 flat address space  XXX adapt the implementation
+!addr Bank        =  2         ; $00 = C64 address, $FF = M65 flat address ; XXX adapt the implementation
 !addr PCH         =  3
 !addr PCL         =  4
 !addr SR          =  5
@@ -67,7 +67,7 @@
 
                                ; $32-$3F - free space, unused for now
 
-!addr Disk_Msg    = $40        ; 40 bytes, disk status as text message
+!addr Disk_Msg    = $40        ; 40 bytes, disk status as text message ; XXX rework code to make it not needed
 !addr Mon_Data    = $68        ; 40 bytes, buffer for hunt and filename
 
 
@@ -116,8 +116,8 @@ Mon_Call
 
 ;        set default PC to monitor exit point
 
-         LDA  #<m65_shadow_BZP
-         LDX  #>m65_shadow_BZP
+         LDA  #<monitor_exit
+         LDX  #>monitor_exit
          STA  PCL
          STA  X_Vector
          STX  PCH