diff --git a/defines_cbm1.s b/defines_cbm1.s
index 911876d..7685f16 100644
--- a/defines_cbm1.s
+++ b/defines_cbm1.s
@@ -42,6 +42,7 @@ ZP_START4 = $65
 
 ; extra ZP variables
 CURDVC			:= $0003
+TISTR			:= $0200
 Z96				:= $020C
 USR				:= GORESTART
 
diff --git a/defines_cbm2.s b/defines_cbm2.s
index 0503e04..68c65fe 100644
--- a/defines_cbm2.s
+++ b/defines_cbm2.s
@@ -20,6 +20,7 @@ ZP_START4 = $13
 
 ; extra/override ZP variables
 CURDVC			:= $000E
+TISTR			:= $008D
 Z96				:= $0096
 POSX			:= $00C6
 TXPSV			:= LASTOP
diff --git a/microtan_loadsave.s b/microtan_loadsave.s
index 3fed232..908d9ad 100644
--- a/microtan_loadsave.s
+++ b/microtan_loadsave.s
@@ -14,8 +14,8 @@ LC74F:
         bpl     LC74F
         ldx     #$03
 LC757:
-        lda     $9A,x
-        sta     $1C,x
+        lda     TXTTAB,x
+        sta     GOSTROUT+2,x
         dex
         bpl     LC757
         jmp     LE219
@@ -49,9 +49,9 @@ LOAD:
         lda     #$4B
         jsr     LFE75
         jsr     LFE73
-        lda     $9C
+        lda     VARTAB
         tax
-        ldy     $9D
+        ldy     VARTAB+1
         jmp     FIX_LINKS
         nop
 LC7A5:
@@ -70,6 +70,6 @@ LC7AD:
         pla
         rts
         inc     $8A17
-        stx     $9C
-        sty     $9D
+        stx     VARTAB
+        sty     VARTAB+1
         jmp     FIX_LINKS
diff --git a/misc1.s b/misc1.s
index 89c8762..86bb5d1 100644
--- a/misc1.s
+++ b/misc1.s
@@ -102,21 +102,19 @@ LETSTRING:
 PUTSTR:
 .ifdef CONFIG_CBM_ALL
         ldy     FORPNT+1
-.ifdef CBM1
-        cpy     #$D0
-.else
+  .ifdef CBM1
+        cpy     #$D0	; TI$
+  .else
         cpy     #$DE
-.endif
+  .endif
         bne     LC92B
         jsr     FREFAC
         cmp     #$06
-.ifdef CBM2
+  .ifdef CBM2
         bne     IQERR1
-.else
-        beq     LC8E2
-        jmp     IQERR
-LC8E2:
-.endif
+  .else
+        jne     IQERR
+  .endif
         ldy     #$00
         sty     FAC
         sty     FACSIGN
@@ -144,11 +142,7 @@ LC902:
         sei
 LC912:
         lda     FAC+2,x
-.ifdef CBM2
-        sta     $8D,x
-.else
-        sta     $0200,x
-.endif
+        sta     TISTR,x
         dex
         bpl     LC912
         cli
diff --git a/misc3.s b/misc3.s
index 20ed1c1..04d2f72 100644
--- a/misc3.s
+++ b/misc3.s
@@ -59,10 +59,10 @@ LF45B:
         iny
         lda     (JMPADRS+1),y
         dey
-        cmp     $14
+        cmp     LINNUM+1
         bne     LF472
         lda     (JMPADRS+1),y
-        cmp     $13
+        cmp     LINNUM
 LF472:
         bcs     LF43A
         dey