diff --git a/scans/s1.s b/scans/s1.s
index 3a8fead..80bc1c0 100644
--- a/scans/s1.s
+++ b/scans/s1.s
@@ -31,18 +31,18 @@ orig:
    dac u.rq+1
    jms copy; 10; u.rq+2; 6
    lac 1b
-   dac u.rq+9
+   dac u.rq+8
    -1
    dac .savblk
    dac .insys
    lac uquant
-   jms betwen; 40; maxquant
+   jms betwen; d0; maxquant
       jms swap
    ion
    -1
    tad u.rq+8
    jms laci
-   jms betwen; o20001; swp
+   jms betwen; o20001; swn
       jmp badcal
    tad swp
    dac .+1
@@ -61,7 +61,7 @@ sysexit:
    jmp 1f
    jms copy; sysdata; dskbuf; 64
    cla
-   jms dskio; o7000
+   jms dskio; 07000
 1:
    dzm .insys
    jms chkint
@@ -92,6 +92,7 @@ swap: 0
    jms lookfor; 2 " in/notready
       jmp 1f
    jms lookfor; 1 " in/ready
+      jmp 1f
    jmp 2f
 1:
    lac swap
@@ -101,7 +102,7 @@ swap: 0
    tad u.ulistp i
    dac u.ulistp i
    ion
-   jmp dskswap; 07000
+   jms dskswap; 07000
    lac u.dspbuf
    sna
    jmp 2f
@@ -135,7 +136,7 @@ swp:
    .chdir; .chmod; .chown; badcal; .sysloc; badcal; .capt; .rele
    .status; badcal; .smes; .rmes; .fork
 swn:
-    .-swp-1 i
+   .-swp-1 i
 
 .intrp:
    lac u.ac
@@ -174,7 +175,6 @@ chkint: 0
    lac .int2
    sna
    jmp chkint i
-   sad chkint i
    sad u.ofiles+2
    skp
    jmp chkint i
diff --git a/scans/s2.s b/scans/s2.s
index 3847776..9d7af58 100644
--- a/scans/s2.s
+++ b/scans/s2.s
@@ -18,6 +18,7 @@
       jms error
    dac .+3
    jms copy; inode; ..; 12
+   lac d.i
    dac 9 i
    jmp okexit
 
@@ -115,7 +116,7 @@
    lac u.base
    jms iget
    lac ii
-   dac d.i	"** ??
+   dzm d.i
    jms copy; name; d.name; 4
    lac i.uniq
    dac d.uniq
@@ -125,7 +126,7 @@
 "** 01-s1.pdf page 9
    jms iput
    jms dput
-   jms okexit
+   jmp okexit
 
 .unlink:
    jms argname
@@ -136,7 +137,6 @@
    dac d.i
    jms dput
    lac u.base
-   jms u.base
    jms iget
    isz i.nlks
    jmp 1f
@@ -331,4 +331,4 @@ exitrw:
    dac f.badd
    jms iput
    jms fput
-    jmp sysexit
+   jmp sysexit
diff --git a/scans/s3.s b/scans/s3.s
index 742c0a3..e031c88 100644
--- a/scans/s3.s
+++ b/scans/s3.s
@@ -22,6 +22,7 @@ searchu: 0
    jmp 1b
    isz searchu
    jmp searchu i
+t = t+2
 
 lookfor: 0
    jms searchu; 1f
@@ -41,7 +42,7 @@ lookfor: 0
    jmp lookfor i
 
 .fork:
-   jms lookfor; 0 " not-user
+   jms lookfor; 0 " not-used
       skp
       jms error
    dac 9f+t
@@ -115,7 +116,7 @@ badcal:
    cma
    dac u.ac
    dzm 9f+t i
-   isz 9f+t i
+   isz 9f+t
    lac 9f+t i
    dac u.mq
    dzm 9f+t i
@@ -205,8 +206,8 @@ rttyi:
    jms getchar
       jmp 1f
    and o177
-   jms betwen o101; o132
-   skp
+   jms betwen; o101; o132
+      skp
    tad o40
    alss 9
    jmp passone
@@ -224,7 +225,7 @@ wttyo:
    lac sfiles+1
    spa
    jmp 1f
-   xor 0400000
+   xor o400000
    dac sfiles+1
    lacq
    tls
@@ -244,7 +245,7 @@ wttyo:
 
 rkbdi:
    jms chkint1
-   lac d2
+   lac d3
    jms getchar
 "** 01-s1.pdf page 18
       jmp 3f
@@ -255,9 +256,7 @@ rkbdi:
    lacq
    and o137
    sad o134
-   lacq
-   xor o40
-   lmq
+   skp
    jmp 2f
 1:
    lacq
@@ -347,7 +346,7 @@ error: 0
 
 chkint1: 0
    dzm .insys
-   jmp chkint
+   jms chkint
       skp
    jmp .save
    -1
diff --git a/scans/s5.s b/scans/s5.s
index 8f12620..bc69bb9 100644
--- a/scans/s5.s
+++ b/scans/s5.s
@@ -16,7 +16,7 @@ t = t+1
 
 access: 0
    lac i.flags
-   idunno	"** ???
+   lmq
    lac u.uid
    spa
    jmp access i
@@ -74,7 +74,7 @@ fget: 0
 fput: 0
    lac 9f+t
    dac .+3
-   jms copy; ; fnode; ..; 3
+   jms copy; fnode; ..; 3
    jmp fput i
 t = t+1
 
@@ -103,7 +103,7 @@ sleep: 0
    law ulist-1
    dac 8
    lac o200000
-   lmq		"** ???
+   lmq
 1:
    lac u.ulistp i
    sad 8 i
diff --git a/scans/s7.s b/scans/s7.s
index 6d12062..8029670 100644
--- a/scans/s7.s
+++ b/scans/s7.s
@@ -87,14 +87,14 @@ dsprestart:
    lac d1
    dac .dspb
    lac dspbufp
-   beg		"** ???
+   beg
    -10
    dac .dsptm
    jmp piret
 
 1: sna ral
    jmp .+3
-   racf
+   dpcf
    jmp piret
    sma
    jmp 1f
diff --git a/scans/sx.s b/scans/sx.s
deleted file mode 100644
index 6b08758..0000000
--- a/scans/sx.s
+++ /dev/null
@@ -1,4 +0,0 @@
-" For now, this stuff is defined so that
-" the assembler doesn't complain about it
-
-o7000: 07000