diff --git a/src/main.tal b/src/main.tal
index e84be19..d1f7291 100644
--- a/src/main.tal
+++ b/src/main.tal
@@ -35,9 +35,6 @@
 	#00f0 .Screen/height DEO2
 	( vectors )
 	;on-console .Console/vector DEO2
-	;on-button .Controller/vector DEO2
-	;on-mouse .Mouse/vector DEO2
-	;on-frame .Screen/vector DEO2
 	( set defaults )
 	#0108 .frame/width STZ2
 	#00c8 .frame/height STZ2
@@ -61,27 +58,28 @@
 	( static drawings )
 	;load-theme JSR2
 	;draw-once JSR2
-	( let's begin! )
+	( begin )
 	;file-new JSR2
 	;draw-menu JSR2
+	;untrap JSR2
 
 BRK
 
 @manifest
 
 	08 "Nasu $1
-		01 'n :file-new "New $1
-		01 'r :trap "Rename $1
-		01 'o :file-open "Open $1
+		01 "n :file-new "New $1
+		01 "r :trap "Rename $1
+		01 "o :file-open "Open $1
 		00 00 :file-open-mono "OpenMono $1
-		01 's :file-save "Save $1
+		01 "s :file-save "Save $1
 		00 00 :file-save-mono "SaveMono $1
-		01 'p :save-theme "SaveTheme $1
-		01 'q :exit "Exit $1
+		01 "p :save-theme "SaveTheme $1
+		01 "q :exit "Exit $1
 	04 "Edit $1
-		01 'c :edit-copy "Copy $1
-		01 'v :edit-paste "Paste $1
-		01 'x :edit-cut "Cut $1
+		01 "c :edit-copy "Copy $1
+		01 "v :edit-paste "Paste $1
+		01 "x :edit-cut "Cut $1
 		00 08 :edit-erase "Erase $1
 	01 "View $1
 		02 00 :toggle-zoom "Zoom $1
@@ -96,13 +94,13 @@ BRK
 		84 00 :move-incw "Incr.W $1
 		00 1b :move-reset "Reset $1
 	07 "Tool $1
-		00 'q :tool-brush "Brush $1
-		00 'w :tool-selector "Selector $1
-		00 'e :tool-zoom "Zoom $1
-		00 '1 :pick-color1 "Background $1
-		00 '2 :pick-color2 "ColorA $1
-		00 '3 :pick-color3 "ColorB $1
-		00 '4 :pick-color4 "ColorC $1
+		00 "q :tool-brush "Brush $1
+		00 "w :tool-selector "Selector $1
+		00 "e :tool-zoom "Zoom $1
+		00 "1 :pick-color1 "Background $1
+		00 "2 :pick-color2 "ColorA $1
+		00 "3 :pick-color3 "ColorB $1
+		00 "4 :pick-color4 "ColorC $1
 	$1
 
 (
diff --git a/src/manifest.tal b/src/manifest.tal
index a6e4b8f..ee8cf23 100644
--- a/src/manifest.tal
+++ b/src/manifest.tal
@@ -35,7 +35,7 @@ BRK
 			&no-touch-sub
 		BRK
 		&no-sub
-	( don't leave if menu is active )
+	( do not leave if menu is active )
 	;draw-menu/sel LDA #ff NEQ ,&no-leave JCN
 	.Mouse/y DEI2 #000c LTH2 ,&no-leave JCN
 		,menu-close JSR
@@ -287,7 +287,7 @@ JMP2
 	POP2
 	( mix )
 	DUP #00 NEQ STHr #00 NEQ #0101 NEQ2 ,&no-mod JCN
-		LIT '+ ;&buf ;sput JSR2
+		LIT "+ ;&buf ;sput JSR2
 		&no-mod
 	( key )
 	DUP #08 NEQ ,&no-bsp JCN ;&bsp ,&cat JMP &no-bsp