diff --git a/kodiak.tal b/kodiak.tal
index 8586b72..59f6200 100644
--- a/kodiak.tal
+++ b/kodiak.tal
@@ -39,14 +39,13 @@
             &mouse-y $2 ]   ( previous y-coordinate )
 
 |0100
-(    #2d8b .System/r DEO2 )
-(    #2d18 .System/g DEO2 )
-(    #2d14 .System/b DEO2 )
 
+    ( colors: gold, white, red, black )
     #bd82 .System/r DEO2
     #8d12 .System/g DEO2
     #4d12 .System/b DEO2
 
+    ( 256x192 )
     #0100 .Screen/w DEO2
     #00c0 .Screen/h DEO2
 
@@ -170,8 +169,9 @@
     DUP #13 ADD SWP                        ( lim=pos+19^ pos^ )
     &loop                                  ( lim^ pos^ )
         LDZk DUP ?&ok !&done               ( lim^ pos^ c^ )
-        &ok LIT2 [ &x $2 ] .Screen/x DEO2  ( lim^ pos^ ; s/x<-x )
-            LIT2 [ &y $2 ] .Screen/y DEO2  ( lim^ pos^ ; s/y<-y )
+        &ok LIT2 [ &x $2 ] .Screen/x DEO2  ( lim^ pos^ c^ ; s/x<-x )
+            LIT2 [ &y $2 ] .Screen/y DEO2  ( lim^ pos^ c^ ; s/y<-y )
+            DUP #80 AND ?&done             ( lim^ pos^ c^ )
             draw-c INC                     ( lim^ pos+1^ )
             ,&y LDR2 #0008 ADD2 ,&y STR2   ( lim^ pos+1^ )
             GTHk ?&loop                    ( lim^ pos+1^ )
@@ -275,7 +275,7 @@
     maybe-select-waste ?&found
     maybe-select-tableau ?&found
     ( not found ) .dragging #05 initialize
-    &found JMP2r
+    &found clear-prev-mouse !draw-curr-hold
 
 @release ( -> )
     clear-prev-hold