diff --git a/scans/bi.s b/scans/bi.s
index eb4dd2a..f8abd9d 100644
--- a/scans/bi.s
+++ b/scans/bi.s
@@ -247,11 +247,11 @@ call:
    isz 8
    -1
    tad sp
-   sad B
+   sad 8
    skp
    jmp 1b
    lac ap i
-   img
+   lmq
    lac dp
    dac ap i
    lac ap
diff --git a/src/cmd/adm.s b/src/cmd/adm.s
index f747395..c78e67b 100644
--- a/src/cmd/adm.s
+++ b/src/cmd/adm.s
@@ -54,7 +54,7 @@ floop1:
    tad d4
    dac name
 
-   sys open; name; ..; 0
+   sys open; name: ..; 0
    spa
    jmp ferror
    dac fi
@@ -189,7 +189,7 @@ ferror:
    sys write; 1:..; 4
    lac d1
    sys write; 1f; 1
-   fmp floop1
+   jmp floop1
 1: 077012
 
 hangup:
diff --git a/src/cmd/apr.s b/src/cmd/apr.s
index 464422b..255c003 100644
--- a/src/cmd/apr.s
+++ b/src/cmd/apr.s
@@ -62,7 +62,7 @@ floop1:
    tad d4
    dac name
 
-   sys open; name; ..; 0
+   sys open; name: ..; 0
    spa
    jmp ferror
    dac fi
@@ -72,7 +72,7 @@ ferror:
    lac name
    dac 1f
    lac d1
-   sys write; 1;..; 4
+   sys write; 1:..; 4
    lac d1
    sys write; 1f; 1
    jmp floop1
@@ -134,7 +134,7 @@ bksp:
    jmp cloop
 
 cret:
-   czm col
+   dzm col
    jmp cloop
 
 pass2:
@@ -278,6 +278,7 @@ hangup:
 abort:
    lac d1
    sys write; m2; m2s
+   jmp stop
 
 nofiles:
    lac d1
@@ -342,7 +343,7 @@ gcard: 0
    isz gcard
    sna
    jmp gcard i
-   irss 9
+   lrss 9
    sad o45
    jmp 1f
    jms putc
diff --git a/src/cmd/bc.s b/src/cmd/bc.s
index b176f2b..b857335 100644
--- a/src/cmd/bc.s
+++ b/src/cmd/bc.s
@@ -59,7 +59,7 @@ trace: 0
    jmp stop
    jmp trace i
 
-itrace: 0
+dtrace: 0
    lac pc
    dac 8
    lac 8 i
diff --git a/src/cmd/bi.s b/src/cmd/bi.s
index 322163f..f8abd9d 100644
--- a/src/cmd/bi.s
+++ b/src/cmd/bi.s
@@ -8,7 +8,7 @@ start:
 
 fetch:
    lac pc i
-   imq
+   lmq
    and o17777
    dac addr
    ecla lls 4
@@ -79,7 +79,7 @@ bor:
    jmp fetch
 
 band:
-   lac t2 i
+   lac t1 i
    and t2 i
    dac t4 i
    jmp fetch
@@ -185,7 +185,7 @@ consop:
    tad d1
    dac sp i
    isz sp
-   iac addr
+   lac addr
    dac sp i
    isz sp
    jmp fetch
@@ -206,13 +206,13 @@ mcall:
    dac t2
    -1
    tad t2 i
-   imq
+   lmq
    lac dp
    dac t1 i
    lac t1
    dac dp
    isz t1
-   iac pc
+   lac pc
    dac t1 i
    lacq
    dac pc
@@ -247,11 +247,11 @@ call:
    isz 8
    -1
    tad sp
-   sad B
+   sad 8
    skp
    jmp 1b
    lac ap i
-   img
+   lmq
    lac dp
    dac ap i
    lac ap
@@ -364,24 +364,24 @@ unaop:
    jmp . i
    uadr; umin; uind; unot
 
-badr:
+uadr:
    lac t1
    dac t3 i
    jmp fetch
 
-bmin:
+umin:
    -1
    tad t1 i
    cma
    dac t3 i
    jmp fetch
 
-bind:
+uind:
    lac t1 i
    dac t2 i
    jmp fetch
 
-bnot:
+unot:
    lac t1 i
    sna cla
    lac d1
@@ -412,22 +412,22 @@ s = n+a
 t = s+a
 u = t+a
 x = u+a
-f = x+a
+y = x+a
 
 d1: 1
 dm1: -1
 dm2: -2
 o17777: 017777
 
-:1: 0
-:2: 0
-:3: 0
-:4: 0
-:ddr: 0
+t1: 0
+t2: 0
+t3: 0
+t4: 0
+addr: 0
 
 pc = 017
 
 sp: stack
 dp: stack
-ip: stack
+ap: stack
 stack: 0
\ No newline at end of file