diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index b93820530c..acf2b26a3f 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,6 +1,3 @@
-- return type stack effects show "void"
-- httpd fep
-
 + portability:
 
 - win64 port
@@ -17,6 +14,7 @@
 
 + io:
 
+- httpd fep
 - stream server can hang because of exception handler limitations
 - better i/o scheduler
 - out of memory error when printing global namespace
@@ -33,14 +31,11 @@
 
 - menu drag retarget broken
 - hang when scrolling
+- hang with multiple windows
 - C+k binding does not work
 - incremental layout flicker
 - expired aliens in view hash
-- try launchpad with bevel buttons replaced by buttons: there's
-  overpainting
-- artifacts while resizing
 - unregister notifications and the view in dealloc
-- segfault when closing window
 - changelog in the UI
 - make the UI look better, something like this:
   http://twb.ath.cx/~twb/darcs/OBSOLETE/factor/final.html
@@ -78,6 +73,7 @@
 
 + misc:
 
+- clean up stack effect generation code
 - code walker & exceptions
 - slice: if sequence or seq start is changed, abstraction violation
 - make 3.4 bits>double an error
diff --git a/library/ui/paint.factor b/library/ui/paint.factor
index a88cad6a8f..f81bd9884c 100644
--- a/library/ui/paint.factor
+++ b/library/ui/paint.factor
@@ -15,7 +15,8 @@ SYMBOL: clip
     glLoadIdentity
     { 0 0 0 } over <rect> clip set
     dup first2 0 0 2swap glViewport
-    0 swap first2 0 gluOrtho2D
+    0 over first2 0 gluOrtho2D
+    first2 0 0 2swap glScissor
     GL_SMOOTH glShadeModel
     GL_BLEND glEnable
     GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA glBlendFunc
@@ -64,7 +65,7 @@ DEFER: draw-gadget
 
 : draw-world ( world -- )
     [
-        dup rect-dim init-gl dup world set draw-gadget
+        dup rect-dim init-gl dup world set draw-gadget gl-error
     ] with-scope ;
 
 ! Pen paint properties