diff --git a/src/left.tal b/src/left.tal
index 493d336..600194a 100644
--- a/src/left.tal
+++ b/src/left.tal
@@ -1250,13 +1250,6 @@
 	STH2r ADD2 .Screen/x DEO2
 	JMP2r
 
-@<draw-word> ( str* color -- str* )
-	;<draw-glyph>/color STA
-	&>w ( -- )
-		<draw-glyph>
-		next-glyph LDAk #20 GTH ?&>w
-	JMP2r
-
 @<draw-word-until> ( str* x* color -- str* )
 	;<draw-glyph>/color STA
 	,&x STR2
@@ -1267,7 +1260,7 @@
 		next-glyph LDAk #20 GTH ?&>w
 	JMP2r
 
-@<draw-short-glyph> ( length* addr* -- )
+@<draw-short-glyph> ( length* color addr* -- )
 	.Screen/addr DEO2
 	.Screen/x DEI2
 	( ) ;<draw-glyph>/color LDA .Screen/sprite DEO
@@ -1475,14 +1468,22 @@
 	[ LIT2 01 -Screen/sprite ] DEO
 	;tab-icn .Screen/addr DEO2
 	[ LIT2 01 -Screen/sprite ] DEO
-	!<draw-word>
+	.Screen/width DEI2 #0028 SUB2 ROT !<draw-word-until>
 
 @<draw-symbol-field> ( addr* -- next* )
 	.Screen/x DEI2k #0004 ADD2 ROT DEO2
-	LDAk [ LIT "( ] EQU ?&notation
-	#03 !<draw-word>
-	&notation ( addr* -- next* )
-	#03 !<draw-comment>
+	LDAk [ LIT "( ] EQU ?&comment
+	.Screen/width DEI2 #0018 SUB2 #03 !<draw-word-until>
+	&comment ( addr* -- next* )
+	.Screen/width DEI2 #0018 SUB2 #03 ;<draw-chr>/color STA
+	,&x STR2
+	&>w ( -- )
+		.Screen/x DEI2 [ LIT2 &x $2 ] LTH2 ?{
+			( ) #0006 ;dotdot-icn !<draw-short-glyph> }
+		LDAk <draw-chr>
+		LDAk [ LIT 29 ] EQU ?{ INC2 LDAk ?&>w
+		INC2 }
+	#20 !<draw-chr>
 
 @<draw-symbol-fill> ( -- )
 	( to ) [ LIT2 00 -Screen/width ] DEI2 #03 SFT2 NIP #02 SUB
@@ -1527,14 +1528,6 @@
 		POP2 #000a DIV2 SWPr INCr STHkr ?&>w
 	POP2r POP2 POP2 JMP2r
 
-@<draw-comment> ( str* color -- str* )
-	;<draw-chr>/color STA
-	&>w ( -- )
-		LDAk <draw-chr>
-		LDAk [ LIT 29 ] EQU ?{ INC2 LDAk ?&>w
-		INC2 }
-	#20 !<draw-chr>
-
 (
 @|theme )
 
diff --git a/untitled.txt b/untitled.txt
index e6ff114..62c990c 100644
--- a/untitled.txt
+++ b/untitled.txt
@@ -17,7 +17,7 @@ a very long line that doesn't quite display on a single screen to test the scrol
 
 @a-long-truncated-label-too-long
 @b-label ( with a definition that is too long )
-@c-label &with-a-field-that-is-too-long
+@c-label &with-a-field-that-is-way-too-long
 @d-label &field ( with a definition that is too long )
 
 @Une-Étiquette