diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 4810b82729..9938224d12 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -6,9 +6,7 @@
 - amd64 %box-struct
 - x86 %box-struct
 - x86 %write-barrier
-- OS X stuff:
-  - set resource path to bundle path
-  - link in freetype statically
+- statically link freetype on OS X
 - when generating a 32-bit image on a 64-bit system, large numbers which should
   be bignums become fixnums
 
@@ -23,6 +21,9 @@
 
 + ui/help:
 
+- finish x11 backend
+- sometimes clicks come through twice
+- hand is broken by design
 - speed up ideas:
   - only do clipping for certain gadgets
   - use glRect
@@ -30,7 +31,6 @@
 - add some padding to launchpad ui
 - saving the image should save window configuration
 - menu drag retarget broken
-- hang with multiple windows
 - incremental layout flicker
 - expired aliens in view hash
 - changelog in the UI
@@ -44,8 +44,9 @@
 - document tools
 - document conventions
 - new turtle graphics tutorial
-- better line spacing in ui and html=
+- better line spacing in ui and html
 - tabular formatting - for inspector and changes
+- grid layout
 - don't multiplex in the event loop if there is no pending i/o
 
 + compiler/ffi:
@@ -70,6 +71,7 @@
 
 + misc:
 
+- set resource path to image parent directory
 - clean up stack effect generation code
 - code walker & exceptions
 - slice: if sequence or seq start is changed, abstraction violation
diff --git a/library/cocoa/ui.factor b/library/cocoa/ui.factor
index 276ad70bd9..7fc6a9c9a9 100644
--- a/library/cocoa/ui.factor
+++ b/library/cocoa/ui.factor
@@ -161,7 +161,7 @@ H{ } clone views set-global
     [ over set-world-handle dup add-notify register-view ] keep ;
 
 : <FactorWindow> ( gadget title -- window )
-    >r <FactorView> r> <ViewWindow> ;
+    >r <FactorView> r> <ViewWindow> dup [contentView] [release] ;
 
 IN: gadgets
 
diff --git a/library/cocoa/view-utils.factor b/library/cocoa/view-utils.factor
index 2ff6cea4bd..fc0a77c746 100644
--- a/library/cocoa/view-utils.factor
+++ b/library/cocoa/view-utils.factor
@@ -7,7 +7,7 @@ objc-NSOpenGLView objc-NSView opengl sequences ;
 : <GLView> ( class dim -- view )
     >r [alloc] 0 0 r> first2 <NSRect>
     NSOpenGLView [defaultPixelFormat]
-    [initWithFrame:pixelFormat:] [autorelease]
+    [initWithFrame:pixelFormat:]
     dup 1 [setPostsBoundsChangedNotifications:]
     dup 1 [setPostsFrameChangedNotifications:] ;