diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 2fe19f0957..eb7b70e3f7 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,10 +1,6 @@
-- method ordering and interpreter algorithm sections need updates
-- another i/o bug: on factorcode eventually all i/o times out
-- get factor running on mac intel
-- remove F_USERENV rel
-
 + io:
 
+- another i/o bug: on factorcode eventually all i/o times out
 - gdb triggers 'mutliple i/o ops on port' error
 - stream server can hang because of exception handler limitations
 - better i/o scheduler
@@ -13,13 +9,18 @@
 
 + ui/help:
 
+- method ordering and interpreter algorithm sections need updates
+- run file dialog is broken
+- implement handlers for open, quit events, and whatever else
+- fix top level window positioning
+- changing window titles
+- reimplement clicking input
+- polish OS X menu bar code
 - clicks sent twice
 - speed up ideas:
   - only do clipping for certain gadgets
   - use glRect
-- polish OS X menu bar code
 - help search
-- reimplement clicking input
 - reimplement tab completion
 - x11 input methods
 - x11 title bars are funny
@@ -40,11 +41,12 @@
 - tabular formatting - for inspector, changes and $values in help
 - grid layout
 - variable width word wrap
-- fix top level window positioning
-- changing window titles
 
 + compiler/ffi:
 
+- get factor running on mac intel
+- remove F_USERENV rel
+- cocoa exceptions are broken
 - free up r11, r12 as a vreg on ppc
 - float= on powerpc doesn't consider nans equal
 - intrinsic fixnum>float float>fixnum
diff --git a/library/cocoa/application-utils.factor b/library/cocoa/application-utils.factor
index 8f825a0155..cdd89dc041 100644
--- a/library/cocoa/application-utils.factor
+++ b/library/cocoa/application-utils.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2006 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 IN: cocoa
-USING: alien errors gadgets io kernel namespaces
-objc objc-NSApplication objc-NSAutoreleasePool objc-NSException
-objc-NSNotificationCenter objc-NSObject objc-NSView threads ;
+USING: alien errors gadgets io kernel namespaces objc
+objc-NSApplication objc-NSAutoreleasePool objc-NSException
+objc-NSNotificationCenter objc-NSObject objc-NSView sequences
+threads ;
 
 : with-autorelease-pool ( quot -- )
     NSAutoreleasePool [new] slip [release] ; inline
@@ -45,5 +46,6 @@ objc-NSNotificationCenter objc-NSObject objc-NSView threads ;
 
 IN: errors
 
-: objc-error. ( alien -- )
-    "Objective C exception:" print  [reason] CF>string print ;
+: objc-error. ( error -- )
+    "Objective C exception:" print
+    third [reason] CF>string print ;
diff --git a/native/error.h b/native/error.h
index 6044c13783..b9bdafa785 100644
--- a/native/error.h
+++ b/native/error.h
@@ -12,9 +12,9 @@
 #define ERROR_USER_INTERRUPT (11<<3)
 #define ERROR_DS_UNDERFLOW (12<<3)
 #define ERROR_DS_OVERFLOW (13<<3)
-#define ERROR_CS_UNDERFLOW (14<<3)
+#define ERROR_RS_UNDERFLOW (14<<3)
 #define ERROR_RS_OVERFLOW (15<<3)
-#define ERROR_RS_UNDERFLOW (16<<3)
+#define ERROR_CS_UNDERFLOW (16<<3)
 #define ERROR_CS_OVERFLOW (17<<3)
 #define ERROR_OBJECTIVE_C (18<<3)