diff --git a/src/id/advent.a b/src/id/advent.a
index e44b8f0..4c23647 100644
--- a/src/id/advent.a
+++ b/src/id/advent.a
@@ -33,7 +33,7 @@ IDAdvent
          !byte $D0,$F5          ;BNE $-8
          !byte $A6,$2B          ;LDX $2B
          !byte $4C,$00          ;JMP $xx00
-         rts
+         rts              ; passport-test-suite/Borrowed Time.woz [C=0] matches
 
 foundadvent
 ;
diff --git a/src/id/d5d5f7.a b/src/id/d5d5f7.a
index 648e6ea..27235e1 100644
--- a/src/id/d5d5f7.a
+++ b/src/id/d5d5f7.a
@@ -30,5 +30,5 @@ IDD5D5F7
          clc
          !byte $24
 .no      sec
-         rts
+         rts              ; passport-test-suite/RoboMath.woz [C=0] matches
 }
diff --git a/src/id/datasoft.a b/src/id/datasoft.a
index b2c718c..e0a8e91 100755
--- a/src/id/datasoft.a
+++ b/src/id/datasoft.a
@@ -7,6 +7,10 @@
 ;      C set otherwise
 ;      all registers clobbered
 ;      all other flags clobbered
+;
+; tested with
+; - Tomahawk
+; - Video Title Shop
 ;-------------------------------
 IDDatasoft
          lda   #$00
@@ -29,4 +33,4 @@ IDDatasoft
          !byte $04,$45,$0C,$63,$04,$90,$94,$D0
          !byte $D4,$23,$04,$91,$A1,$EB,$CD,$06
          !byte $95,$A1,$E1,$98,$97,$86
-         rts
+         rts              ; passport-test-suite/Tomahawk.woz [C=0] matches
diff --git a/src/id/daviddos.a b/src/id/daviddos.a
index 2d9f84f..a8f58c5 100644
--- a/src/id/daviddos.a
+++ b/src/id/daviddos.a
@@ -28,5 +28,5 @@ IDDavid
          !byte $9D,WILDCARD,$04; STA $04**,X
          !byte $CA        ; DEX
          !byte $10,$F7    ; BPL -
-.exit    rts
+.exit    rts              ; passport-test-suite/Horses.woz [C=0] matches
 }
diff --git a/src/id/davidson.a b/src/id/davidson.a
index 995e0ba..0897791 100644
--- a/src/id/davidson.a
+++ b/src/id/davidson.a
@@ -23,7 +23,8 @@ IDDavidson
          jsr   ReadSector
          lda   #$13
          sta   $B92E
-         bcs   .exit      ; didn't work, give up
+         bcs   .exit      ; passport-test-suite/Word Attack Plus Spanish.woz [C=0] matches
+                          ; if the read didn't work, give up
          lda   #s_davidson
          jsr   PrintByID
          lda   #TRUE
diff --git a/src/id/encode44.a b/src/id/encode44.a
index 1027b62..eb1d7a0 100755
--- a/src/id/encode44.a
+++ b/src/id/encode44.a
@@ -14,8 +14,9 @@
 IDEncoded44
          ldy   #$07
          jsr   SearchTrack
-         !byte $BD,$8C,$C0,$10,$FB,$38,$2A
-;;         bcs   .exit
-.exit
-         rts
+         !byte $BD,$8C,$C0
+         !byte $10,$FB
+         !byte $38
+         !byte $2A
+         rts              ; passport-test-suite/Sneakers.woz [C=0] matches
 }
diff --git a/src/id/encode53.a b/src/id/encode53.a
index 6891225..f9f5b3b 100755
--- a/src/id/encode53.a
+++ b/src/id/encode53.a
@@ -2,6 +2,7 @@
 ; IDEncoded53
 ; identify bootloader that loads
 ; 5-3-encoded data from track 0
+; but our DOS 3.2 tracer didn't work
 ; (these disks are unsupported)
 ;
 ; in:  track buffer contains T00,S00
@@ -16,7 +17,5 @@ IDEncoded53
          jsr   SearchTrack
          !byte $BD,$8C,$C0,$10,$FB,$C9,$B5,$F0
          !byte $09,$28,$90,$DF,$49,$AD,$F0,$1F
-;;         bcs   .exit
-.exit
          rts
 }
diff --git a/src/id/holle.a b/src/id/holle.a
index 22c1560..306336c 100644
--- a/src/id/holle.a
+++ b/src/id/holle.a
@@ -25,5 +25,5 @@ IDHolle
          STA   $03F3
          SEI
 @searchend
-         rts
+         rts              ; passport-test-suite/Crime Wave.woz [C=0] matches
 }
diff --git a/src/id/inspect0.a b/src/id/inspect0.a
index 8445e38..eb25a90 100755
--- a/src/id/inspect0.a
+++ b/src/id/inspect0.a
@@ -381,8 +381,9 @@ VerifyInfocom18
          jsr   Read4x4
          lda   #$12       ; all 18 sectors when in verify mode
          ldx   gIsInfocom18
-         beq   .setcount
-         lda   #$02       ; only two sectors when in ID mode
+         beq   .setcount  ; passport-test-suite/Trinity - Side B.woz [Z=1] here
+         lda   #$02       ; passport-test-suite/Time Lord.woz [Z=0] here
+                          ; only two sectors when in ID mode
 .setcount
          sta   tmp        ; sector counter
 
diff --git a/src/id/jsr8b3.a b/src/id/jsr8b3.a
index c5d265a..0f33a43 100755
--- a/src/id/jsr8b3.a
+++ b/src/id/jsr8b3.a
@@ -43,5 +43,5 @@ ID8b3
          !byte $C6,$01,$A9,$08,$C5,$01,$D0,$EC
          !byte $60
 .exit
-         rts
+         rts              ; passport-test-suite/Ardy The Aardvark.woz [C=0] matches
 }
diff --git a/src/id/laureate.a b/src/id/laureate.a
index 8b4b91a..0ebd9d3 100644
--- a/src/id/laureate.a
+++ b/src/id/laureate.a
@@ -24,7 +24,6 @@ IDLaureate
          !byte $A9,$BF    ; LDA #$BF
          !byte $8D,$FE,$08; STA $08FE
          bcs   .exit
-         lda   #$00
          ldx   #$F8
          ldy   #$08
          jsr   compare    ; and T00,S00,$F8 ==
@@ -32,7 +31,7 @@ IDLaureate
          !byte $00,$00,$00
          !byte $FF,$0B
 .exit
-         rts
+         rts              ; passport-test-suite/Sound Ideas- Word Attack - Disk 1 - Ending Consonants.woz [C=0] matches
 }
 
 ;-------------------------------
diff --git a/src/id/mecc.a b/src/id/mecc.a
index ab978dc..24e893d 100755
--- a/src/id/mecc.a
+++ b/src/id/mecc.a
@@ -22,8 +22,7 @@ IDMECC
          !byte $01,$4C,$1A,$08,$17,$0F,$00,$00
          !byte $0D,$0B,$09,$07,$05,$03,$01,$0E
          !byte $0C,$0A,$08,$06,$04,$02,$0F
-.exit
-         rts
+         rts              ; passport-test-suite/Clock Works v1.0.woz [C=0] matches
 }
 
 ;-------------------------------
@@ -74,7 +73,7 @@ IDMECC1
          !byte $D0,$F2,$EA,$BD,$8C,$C0,$10,$FB
          !byte $C9
 .exit
-         rts
+         rts              ; passport-test-suite/Coordinate Math v1.0.woz [C=0] matches
 
 foundmecc1
 ;
@@ -170,7 +169,7 @@ foundmecc2
          lda   #$07
 foundmecc4a
          clc
-         adc   #BASEPAGE
+         adc   #BASEPAGE  ; passport-test-suite/Clock Works v1.0.woz [C=0] reaches here
          sta   modsrc+1
          lda   #$00
          sta   modsrc
@@ -241,7 +240,7 @@ IDMECC3
          jsr   compare    ; and T00,S0B,$7A ==
          !byte $D0,$F2,$EA,$BD,$8C,$C0,$10,$FB,$C9
 .exit
-         rts
+         rts              ; passport-test-suite/Number Munchers v1.0.woz [C=0] matches
 
 foundmecc3
 ;
@@ -307,5 +306,5 @@ foundmecc4
 ; original disk.
 ;
          lda   #$08
-         jmp   foundmecc4a
+         jmp   foundmecc4a           ; passport-test-suite/Conquering Whole Numbers v1.1.woz [Z=0] reaches here
 }
diff --git a/src/id/micrograms.a b/src/id/micrograms.a
index b7deaf8..940b5d5 100644
--- a/src/id/micrograms.a
+++ b/src/id/micrograms.a
@@ -19,7 +19,7 @@ IDMicrograms
          !byte $D0,$12
          !byte $A9,$C6
          !byte $85,$3F
-         bcs   .exit
+         bcs   .exit      ; passport-test-suite/Shapes and Patterns.woz [C=0] matches
          ldx   #$42
          ldy   #$02
          jsr   compare
diff --git a/src/id/milliken.a b/src/id/milliken.a
index 0e94a30..97c137d 100644
--- a/src/id/milliken.a
+++ b/src/id/milliken.a
@@ -34,7 +34,7 @@ IDMilliken1
          jsr   compare
          !byte $A9,$AE,$8D,$00,$04,$4C,$99,$AD
          !byte $AE,$F8,$05,$BD,$89,$C0
-         bcs   +
+         bcs   +          ; passport-test-suite/Tangram Puzzler.woz [C=0] matches
          lda   #TRUE
          sta   gIsMilliken1
          bcc   .exit
diff --git a/src/id/panglosdos.a b/src/id/panglosdos.a
index fa9f8db..23a5bc4 100644
--- a/src/id/panglosdos.a
+++ b/src/id/panglosdos.a
@@ -39,7 +39,7 @@ PanglosDOS
          ldy   #$02
          jsr   CompareMemory
          !byte $20,$F9
-         bcc   +
+         bcc   +          ; passport-test-suite/Stepwise Multiple Regression.woz [C=0] matches
 .jmpexit1
          jmp   .exit
 
diff --git a/src/id/pascal.a b/src/id/pascal.a
index bd271ca..8f38ed2 100644
--- a/src/id/pascal.a
+++ b/src/id/pascal.a
@@ -24,16 +24,16 @@ IDPascal
          !byte $E0,$60
          !byte $F0,$03
          !byte $4C,WILDCARD,$08
-         bcc   .exit
+         bcc   .exit      ; passport-test-suite/Wizplus.woz [C=0] matches
 ;
 ; Apple Pascal 1.3 signature [thanks Marco V.]
 ;
-         ldy   #$08
+         ldy   #$08       ; passport-test-suite/Triangles Through Octagons.woz [C=1] reaches here
          jsr   compare    ; or if T00,S00,$00 ==
          !byte $01
          !byte $E0,$70
          !byte $B0,$04
          !byte $E0,$40
          !byte $B0
-.exit    rts
+.exit    rts              ; passport-test-suite/Triangles Through Octagons.woz [C=0] matches
 }
diff --git a/src/id/phoenix.a b/src/id/phoenix.a
index 8f1fe4f..5915b31 100644
--- a/src/id/phoenix.a
+++ b/src/id/phoenix.a
@@ -15,5 +15,5 @@ IDPhoenix
          ldy   #$03
          jsr   compare
          !byte $AC,$B7,$F6
-         rts
+         rts              ; passport-test-suite/Zoom Grafix 26-JAN-82.woz [C=0] matches
 }
diff --git a/src/id/prodos.a b/src/id/prodos.a
index 4878ab2..331c329 100644
--- a/src/id/prodos.a
+++ b/src/id/prodos.a
@@ -24,5 +24,5 @@ IDProDOS
          !byte $38        ; SEC
          !byte $B0,$03    ; BCS +3
          !byte $4C        ; JMP
-         rts
+         rts              ; passport-test-suite/Investigating Plant Growth.woz [C=0] matches
 }
diff --git a/src/id/prontodos.a b/src/id/prontodos.a
index eb6eebf..9030b7f 100644
--- a/src/id/prontodos.a
+++ b/src/id/prontodos.a
@@ -19,5 +19,5 @@ IDPronto
          !byte $B0,$50    ; BCS +$50
          !byte $AD,$CB,$B5; LDA $B5CB
          !byte $85,$42    ; STA $42
-         rts
+         rts              ; passport-test-suite/America Coast to Coast.woz [C=0] matches
 }
diff --git a/src/id/protecteddos.a b/src/id/protecteddos.a
index bcbc3ee..95e9472 100755
--- a/src/id/protecteddos.a
+++ b/src/id/protecteddos.a
@@ -16,7 +16,7 @@ ProtectedDOS
          !byte $00,$B7,$C8,$D0,$F5,$EE,$04,$B7
          !byte $EE,$09,$B7,$AD,$09,$B7,$C9,$C0
          !byte $D0,$E8
-         bcs   .exit
+         bcs   .exit      ; passport-test-suite/Ultima IV.woz [C=0] matches
 
          lda   $B706      ; decryption key
          sta   .key+1
diff --git a/src/id/quickdos.a b/src/id/quickdos.a
index 23eb0de..c149f57 100644
--- a/src/id/quickdos.a
+++ b/src/id/quickdos.a
@@ -20,5 +20,5 @@ IDQuickDOS
          !byte $D0,$27    ; BNE +$27
          !byte $78        ; SEI
          !byte $AD,$83,$C0; LDA $C083
-         rts
+         rts              ; passport-test-suite/Kid Niki.woz [C=0] matches
 }
diff --git a/src/id/rdos.a b/src/id/rdos.a
index 4371be7..5da71cd 100644
--- a/src/id/rdos.a
+++ b/src/id/rdos.a
@@ -22,5 +22,5 @@ IDRDOS
          !byte $A0,$1F    ; LDY #$1F
          !byte $B9,$00,$08; LDA $0800,Y
          !byte $49        ; EOR
-         rts
+         rts              ; passport-test-suite/Roadwar 2000.woz [C=0] matches
 }
diff --git a/src/id/trace32.a b/src/id/trace32.a
index e4c70d0..86ab9b4 100644
--- a/src/id/trace32.a
+++ b/src/id/trace32.a
@@ -157,7 +157,7 @@ TraceDOS32LO
          cmp   #$36
          beq   +
          cmp   #$B2 ;RDOS
-         bne   .fail
+         bne   .fail      ; passport-test-suite/Epidemic.woz [Z=1] matches
          clc
 +        php
 ;
@@ -199,7 +199,7 @@ TraceDOS32LO
          !byte $88         ;DEY
          !byte $A9,$EA     ;LDA #$EA
          !byte $20,$26,$03 ;JSR $0326
-         bcs   .fail
+         bcs   .fail      ; passport-test-suite/Eggs-It.woz [C=0] matches
          lda   #s_choplifter
          jsr   PrintByID
          lda   #s_diskrwts
@@ -320,7 +320,7 @@ TraceDOS32d
          ldy   #$02
          jsr   CompareMemory
          !byte $20,$DD
-         bcs   +
+         bcs   +          ; passport-test-suite/Robotwar.woz [C=0] matches
          lda   #s_muse
          jsr   PrintByID
 
diff --git a/src/id/trace33.a b/src/id/trace33.a
index dbb0d93..4f8aa69 100755
--- a/src/id/trace33.a
+++ b/src/id/trace33.a
@@ -139,7 +139,7 @@ _Inspect1a
          ldy   #$02
          jsr   CompareMemory
          !byte $20,00
-         bcc   .x5
+         bcc   .x5        ; passport-test-suite/Analogies Tutorial.woz [C=0] matches
          jmp   UseUniversal ; give up tracing; this RWTS is unsupported
 ;
 ; Check for RWTS variant that uses non-standard address for slot
@@ -151,7 +151,7 @@ _Inspect1a
          ldy   #$03
          jsr   CompareMemory
          !byte $AE,$E8,$1F
-         bcs   .x6
+         bcs   .x6        ; passport-test-suite/Pinball Construction Set (Budgeco).woz [C=0] matches
          jmp   UseUniversal ; give up tracing; this RWTS is unsupported
 ;
 ; Check for Milliken protection routine in late-stage boot
@@ -162,7 +162,7 @@ _Inspect1a
          ldy   #$03
          jsr   CompareMemory
          !byte $4C,$03,$9B
-         bcs   .x6b
+         bcs   .x6b       ; passport-test-suite/Tangram Puzzler.woz [C=0] matches
          jsr   IDMilliken
          bcs   .x6b
          lda   #s_milliken
@@ -182,7 +182,7 @@ _Inspect1a
          !byte $9D,WILDCARD,WILDCARD
          !byte $9D,WILDCARD,WILDCARD
          !byte $20,$93
-         bcs   .x7
+         bcs   .x7        ; passport-test-suite/Super Taxman II.woz [C=0] matches
          ldy   #$07
 .x6c     lda   $B730,y
          sta   .trackpointer,y
@@ -204,7 +204,7 @@ _Inspect1a
          !byte $BD,$8C,$C0; LDA $C08C,X
          !byte $10,$FB    ; BPL -$FB
          !byte $C9,$00    ; CMP #$00
-         bcs   +
+         bcs   +          ; passport-test-suite/S.A.G.A. 6.woz [C=0] matches
          lda   #TRUE
          sta   gAdventureInternational
 ;
@@ -235,7 +235,7 @@ _Inspect1a
 ;
 +        lda   $08FE
          cmp   #$23
-         bne   +
+         bne   +          ; passport-test-suite/Planetfall r26.woz [Z=1] matches
          lda   #$AD       ; allow $AD..$FF for third data prologue nibble
          sta   $24FC
          lda   #$90
@@ -259,7 +259,7 @@ _Inspect1a
          !byte $A9,$B5
          !byte $8D,$FC,$B8
          !byte $60
-         bcs   +
+         bcs   +          ; passport-test-suite/Crown of Arthain.woz [C=0] matches
          jsr   $BC61
 ;
 ; Check for alternate RWTS entry point (e.g. Swordthrust)
@@ -282,7 +282,7 @@ _Inspect1a
          PLA
          JSR   $BD00
 @end_swordthrust
-         bcs   +
+         bcs   +          ; passport-test-suite/Swordthrust 1.woz [C=0] matches
          stx   jCallRWTS+1; set new RWTS entry point to $B775
          lda   #$B7
          sta   jCallRWTS+2
diff --git a/src/id/trace33p.a b/src/id/trace33p.a
index 8c56968..e31574e 100755
--- a/src/id/trace33p.a
+++ b/src/id/trace33p.a
@@ -62,8 +62,8 @@ TraceSpecDel3
          ldy   #$00
          lda   $10D1
          cmp   #$A2
-         beq   +
-         ldy   #$04
+         beq   +          ; passport-test-suite/Ernie's Quiz.woz [Z=1] matches
+         ldy   #$04       ; passport-test-suite/Kaves of Karkhan.woz [Z=0] matches
 +        lda   #$4C
          sta   $10D1,Y
          sta   $10EC,Y
diff --git a/src/id/trace8b3.a b/src/id/trace8b3.a
index 1bd6445..97a43f8 100644
--- a/src/id/trace8b3.a
+++ b/src/id/trace8b3.a
@@ -106,5 +106,5 @@ _restore3
 ;
          lda   #$01
          sta   gLastTrack
-         jmp   ADStyle
+         jmp   ADStyle    ; passport-test-suite/Ardy the Aardvark.woz [Z=0] reaches here
 }
diff --git a/src/id/volumename.a b/src/id/volumename.a
index 0500172..8abf0f3 100644
--- a/src/id/volumename.a
+++ b/src/id/volumename.a
@@ -39,7 +39,7 @@ IDVolumeName
          and   #$0F
          tax
          lda   #$05
-         sta   .offset+1
+         sta   .offset+1  ; passport-test-suite/Investigating Plant Growth.woz [Z=0] reaches here
          bne   .print     ; always branches
 
 .pascal
@@ -51,7 +51,7 @@ IDVolumeName
          lda   (cmp1), y
          beq   .error
          cmp   #$08
-         bcs   .error
+         bcs   .error     ; passport-test-suite/Notecard Maker.woz [C=0] reaches here
          tax
          lda   #$07
          sta   .offset+1