diff --git a/src/drifblim.tal b/src/drifblim.tal
index 1e8ec6c..fd30b51 100644
--- a/src/drifblim.tal
+++ b/src/drifblim.tal
@@ -426,6 +426,7 @@ JMP2r
 		OVR LIT "2 EQU ?&end DUP ADD
 		OVR LIT "r EQU ?&end DUP ADD
 		OVR LIT "k EQU ?&end DUP ADD
+		OVR #00 EQU ?&end ;err/opcode set-error
 		&end NIP STH ORAr
 		INC2 LDAk ?&w
 	POP2 STHr
@@ -538,15 +539,16 @@ JMP2r
 	&number "Number $1
 	&reference "Reference $1
 	&distance "Distance $1
-	&invalid "Invalid 20 "symbol 20 "name $1
+	&invalid "Invalid 20 "label $1
 	&rewind "Rewind $1
+	&opcode "Opcode $1
 
-@opcodes
+@opcodes [
 	"LIT "INC "POP "NIP "SWP "ROT "DUP "OVR
 	"EQU "NEQ "GTH "LTH "JMP "JCN "JSR "STH
 	"LDZ "STZ "LDR "STR "LDA "STA "DEI "DEO
 	"ADD "SUB "MUL "DIV "AND "ORA "EOR "SFT
-	&brk "BRK
+	&brk "BRK ]
 
 @runes [
 	"| =lib/padabs "$ =lib/padrel
@@ -566,10 +568,10 @@ JMP2r
 @memory
 
 @comment $100
-@token $20 &err $20
-@scope $20 &err $20
 @sublabel $20
 @include $30
+@token $20 &err $20
+@scope $20 &err $20
 
 @symbols ( addr*, refs, name[], 00 )