diff --git a/NOTES.txt b/NOTES.txt
index 8437e4b..d014413 100644
--- a/NOTES.txt
+++ b/NOTES.txt
@@ -5,5 +5,5 @@ AppleSoft I           1977     1.1            N      Y        Apple      CONFIG_
 KIM BASIC             1977     1.1            N      Y          -        CONFIG_11A
 AppleSoft II          1978                    Y      Y        Apple      CONFIG_2
 Commodore BASIC 2     1979                    Y      Y         CBM       CONFIG_2A
-KBD BASIC             1980                    Y      N         KBD
+KBD BASIC             1980                    Y      N         KBD       CONFIG_2B
 MicroTAN              1979                    Y      Y          -
diff --git a/defines_cbm.s b/defines_cbm.s
index b30f28a..7585082 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -15,7 +15,7 @@ CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
 CBM2_KBD := 1 ; 2 weird instances
-CBM2_MICROTAN := 1
+CONFIG_PEEK_SAVE_LINNUM := 1
 CBM2_KIM := 1
 CBM2_APPLE := 1
 CONFIG_DATAFLAG := 1
diff --git a/defines_kbd.s b/defines_kbd.s
index fd50170..dcacd2f 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -1,11 +1,12 @@
 .define CONFIG_SCRTCH_ORDER 3
 CONFIG_SMALL := 1
 CBM2_KBD := 1 ; 2 weird instances
-KBD_MICROTAN := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
+CONFIG_2B := 1
+
 CONFIG_SAFE_NAMENOTFOUND := 1
 ; INPUTBUFFER > $0100
 CONFIG_NO_POKE := 1
diff --git a/defines_microtan.s b/defines_microtan.s
index 464742e..475d65a 100644
--- a/defines_microtan.s
+++ b/defines_microtan.s
@@ -1,14 +1,14 @@
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
-CBM2_MICROTAN := 1
-KBD_MICROTAN := 1
+CONFIG_PEEK_SAVE_LINNUM := 1
 CONFIG_ROR_WORKAROUND := 1
 CONFIG_MONCOUT_DESTROYS_Y := 1
 APPLE_MICROTAN := 1
 
 CONFIG_2 := 1
 CONFIG_2A := 1
+CONFIG_2B := 1
 
 CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
diff --git a/eval.s b/eval.s
index df5792e..e71d757 100644
--- a/eval.s
+++ b/eval.s
@@ -240,13 +240,13 @@ FRM_STACK2:
         tay
         pla
         sta     INDEX
-.ifndef KBD_MICROTAN
+.ifndef CONFIG_2B
         inc     INDEX ; bug: assumes not on page boundary
 ; bug exists on AppleSoft II
 .endif
         pla
         sta     INDEX+1
-.ifdef KBD_MICROTAN
+.ifdef CONFIG_2B
         inc     INDEX
         bne     LEB69
         inc     INDEX+1
@@ -474,10 +474,13 @@ LCE3B:
         jmp     LD353
 LCE53:
 .endif
-.ifdef KBD_MICROTAN ; also AppleSoft II
+.ifdef CONFIG_2
+  .ifndef CBM2
 ; bugfix?
+; fixed on AppleSoft II, not on any CBM
         ldx     #$00
         stx     STRNG1+1
+  .endif
 .endif
         rts
 L2DB1:
diff --git a/float.s b/float.s
index fb74589..4400a97 100644
--- a/float.s
+++ b/float.s
@@ -169,7 +169,7 @@ L36C7:
 .endif
         sty     FACEXTENSION
         adc     #$08
-.ifdef KBD_MICROTAN
+.ifdef CONFIG_2B
 ; bugfix?
 ; fix does not exist on AppleSoft 2
         cmp     #(MANTISSA_BYTES+1)*8
diff --git a/poke.s b/poke.s
index c576abe..66cc59e 100644
--- a/poke.s
+++ b/poke.s
@@ -44,7 +44,7 @@ GETADR:
 ; "PEEK" FUNCTION
 ; ----------------------------------------------------------------------------
 PEEK:
-.ifdef CBM2_MICROTAN
+.ifdef CONFIG_PEEK_SAVE_LINNUM
         lda     LINNUM+1
         pha
         lda     LINNUM
@@ -71,7 +71,7 @@ LD6F3:
 .endif
         lda     (LINNUM),y
         tay
-.ifdef CBM2_MICROTAN
+.ifdef CONFIG_PEEK_SAVE_LINNUM
         pla
         sta     LINNUM
         pla