diff --git a/Makefile b/Makefile
index 2136581..e4392aa 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BOOTDSK=~/vii_hd.2mg
 CA65=ca65
 LD65=utils/auto_origin.sh ld65
 GENHELP=utils/gen_help.sh
-MG_CMDS=at.info.p8c at.zones.p8c afp.userprefix.p8c afp.sessions.p8c alias.p8c at.boot.p8c deschw.p8c dmem.p8c nbp.lookup.p8c tardis.p8c nbp.parse.p8c iie.card.p8c idemu.p8c mig.insp.p8c fastchip.p8c afp.timezone.p8c setyear.p8c
+MG_CMDS=at.info.p8c at.zones.p8c afp.userprefix.p8c afp.sessions.p8c alias.p8c at.boot.p8c deschw.p8c dmem.p8c nbp.lookup.p8c tardis.p8c nbp.parse.p8c iie.card.p8c idemu.p8c mig.insp.p8c fastchip.p8c afp.timezone.p8c setyear.p8c diskinfo.p8c
 
 .PHONY: all
 all: shk ;
diff --git a/afp.timezone.s b/afp.timezone.s
index 1ca90bc..3f84b58 100644
--- a/afp.timezone.s
+++ b/afp.timezone.s
@@ -12,7 +12,7 @@
 
 sptr      = xczpage
 
-prbyte		= $fdda
+;prbyte		= $fdda
 ;cout      = $fded
 
 pfxbuf    = filebuff2
diff --git a/davex-mg.inc b/davex-mg.inc
index 52ddfba..5d3e510 100644
--- a/davex-mg.inc
+++ b/davex-mg.inc
@@ -21,10 +21,11 @@ I_MG_MAC    = 1
 ; *********
 
 .include  "Common/2/Globals2.asm"
+.include  "Common/2/Apple.Globals2.asm"
 .include  "Common/2/MLI.Globals2.asm"
-.include  "Common/2/Macros2.asm"
+.include  "Common/Macros.asm"
 
-cout      = $fded               ; character out
+;cout      = $fded               ; character out
 checkmach	= $fe1f	              ; clears carry on IIgs, no effect on //e
 
 p8_mli    = $bf00
@@ -133,8 +134,18 @@ X_DX_DESC: .byte   .strlen(Desc)
 .assert   (* - ext_start) < 512, warning, "Description must end in the first 512 bytes"
 .endmacro
 
-.macro    DX_main
-          X_DX_EXEC = *
+.macro    DX_main   Addr
+          .ifnblank Addr
+            .out .sprintf("Note: main code address at %s", .string(Addr))
+            X_DX_EXEC = Addr
+          .else
+            .ifconst *
+              .out .sprintf("Note: implied main code at * = $%x", *)
+            .else
+              .out .sprintf("Note: implied main code at DX_main")
+            .endif
+            X_DX_EXEC = *
+          .endif
 .endmacro
 
 .macro    DX_end
diff --git a/fastchip.s b/fastchip.s
index 818f688..24bc4ba 100644
--- a/fastchip.s
+++ b/fastchip.s
@@ -20,6 +20,9 @@
 ; No options: List current settings
 ; %hend
 
+.p02
+.include  "davex-mg.inc"
+
 UNLOCKV   = $6a
 LOCKV     = $a6
 CFG_SPEED = $00
@@ -31,8 +34,6 @@ CFG_RFSLT = $05
 CFG_RWENA = $06
 CFG_LIGHT = $07
 
-ch        = $24
-
 fcbase    = $c06a
 fcenable  = fcbase+1
 fcslots   = fcbase+2
@@ -47,12 +48,6 @@ mytemp1   = mytemp+2            ; temp for Disk II check
 savex     = mytemp1+2           ; place to save x reg
 savey     = savex+1             ; place to save y reg
 
-;cout      = $fded
-prbyte    = $fdda
-
-.p02
-.include  "davex-mg.inc"
-
           DX_start dx_mg_auto_origin ; load address
           DX_info $01,$12,dx_cc_iie_or_iigs,$00
           DX_ptab
diff --git a/iie.card.s b/iie.card.s
index 36eb058..6ca5146 100644
--- a/iie.card.s
+++ b/iie.card.s
@@ -7,11 +7,12 @@
 ;   -x        Show experimental info, uses undocumented features.
 ; %hend
 
-curspeed  = xczpage
-
 .pc02
 .include  "davex-mg.inc"
 
+curspeed  = xczpage
+
+
           DX_start dx_mg_auto_origin ; load address
           DX_info $01,$12,dx_cc_iie_or_iigs,$00
           DX_ptab
diff --git a/nbp.lookup.s b/nbp.lookup.s
index 99e4cb5..66f3d2c 100644
--- a/nbp.lookup.s
+++ b/nbp.lookup.s
@@ -16,7 +16,7 @@
 .pc02     ; appletalk requires it anyway
 .include  "davex-mg.inc"
 
-ch        = $24                 ; cursor horizontal pos
+;ch        = $24                 ; cursor horizontal pos
 
 sptr      = xczpage
 sptr2     = sptr+2
diff --git a/nbp.parse.s b/nbp.parse.s
index 078515d..9ced556 100644
--- a/nbp.parse.s
+++ b/nbp.parse.s
@@ -7,7 +7,7 @@
 .pc02
 .include  "davex-mg.inc"
 
-ch        = $24                 ; cursor horizontal pos
+;ch        = $24                 ; cursor horizontal pos
 
 sptr      = xczpage
 sptr2     = sptr+2
diff --git a/setyear.s b/setyear.s
index 2e9edcb..734e459 100644
--- a/setyear.s
+++ b/setyear.s
@@ -17,7 +17,7 @@ tmp       = xczpage
 year      = tmp+1
 count     = year+1
 
-prbyte    = $fdda
+;prbyte    = $fdda
 ;cout      = $fded
 
           DX_start dx_mg_auto_origin ; load address
diff --git a/tardis.s b/tardis.s
index b894b63..f0c58bb 100644
--- a/tardis.s
+++ b/tardis.s
@@ -15,14 +15,14 @@
 .pc02
 .include  "davex-mg.inc"
 
-ch        = $24                 ; cursor horizontal pos
+;ch        = $24                 ; cursor horizontal pos
 
 entname   = filebuff2           ; buffer to build NBP entity name
 NBPBuf    = filebuff3           ; buffer for NBP request
 NBPBufSz  = $0400               ; size of the file buffer
 
 P8DtTm    = $bf90
-prbyte    = $fdda
+;prbyte    = $fdda
 
 sptr      = xczpage
 sptr2     = sptr+2