diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index e9d694b92..b1f18d223 100755
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -4324,6 +4324,9 @@ public class PApplet extends Applet
    * @param kind either ARROW, CROSS, HAND, MOVE, TEXT, or WAIT
    */
   public void cursor(int kind) {
+    if (platform == MACOSX && kind == MOVE) {
+      kind = HAND;
+    }
     setCursor(Cursor.getPredefinedCursor(kind));
     cursorVisible = true;
     this.cursorType = kind;
diff --git a/core/todo.txt b/core/todo.txt
index 08fe9cd22..755126314 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -9,6 +9,8 @@ X XML.getChildren() throwing NPE when getInt() called on non-existent var
 X   https://github.com/processing/processing/issues/2367
 X   need to sort out with docs what's happening here
 X   just a reference issue
+X substitute MOVE cursor with HAND on OS X
+X   https://github.com/processing/processing/issues/2358
 
 cleaning
 o how much of com.benfry.* should go in? 
@@ -57,15 +59,6 @@ _   are they documented?
 _ make join() work with Iterable?
 _   will this collide with the current String[] version?
 
-retina
-_ saveFrame() with retina render is making black images
-_ zero alpha values still a problem with retina renderer
-_   https://github.com/processing/processing/issues/2030
-_ how to name the retina pixel stuff
-_   hint(ENABLE_RETINA_PIXELS) or hint(ENABLE_HIDPI_PIXELS)
-_   hint(ENABLE_2X_PIXELS)?
-_   hidpi is Apple's name as well
-_ no high-res display support for the renderers
 
 high
 _ Sketch runs with default size if size() is followed by large memory allocation
@@ -104,6 +97,24 @@ _   draw(s) doesn't work on the returned PShape
 _ TGA files writing strangely
 _   https://github.com/processing/processing/issues/2096
 
+hidpi
+_ saveFrame() with retina render is making black images
+_ zero alpha values still a problem with retina renderer
+_   https://github.com/processing/processing/issues/2030
+_ how to name the retina pixel stuff
+_   hint(ENABLE_RETINA_PIXELS) or hint(ENABLE_HIDPI_PIXELS)
+_   hint(ENABLE_2X_PIXELS)?
+_   hidpi is Apple's name as well
+_ no high-res display support for OpenGL
+_ no high-dpi support for core on Windows
+_   https://github.com/processing/processing/issues/2411
+_ retina sketches slow to start
+_   https://github.com/processing/processing/issues/2357
+
+cantfix
+_ crash on startup when "Mirror Displays" selected
+_   https://github.com/processing/processing/issues/2186
+
 table
 _ addRow() is not efficient, probably need to do the doubling
 _   or have a setIncrement() function?
diff --git a/todo.txt b/todo.txt
index 8ca39e606..08d006586 100644
--- a/todo.txt
+++ b/todo.txt
@@ -34,6 +34,18 @@ X   fix for OS X launcher
 X   fix for OS X export
 X   fix for OS X command line
 
+earlier (2.1.2)
+X added get/set methods for status lines (Manindra)
+X   https://github.com/processing/processing/issues/2430
+X   https://github.com/processing/processing/pull/2433
+X allow non-pde file extensions (JDF)
+X   https://github.com/processing/processing/issues/2420
+
+retina
+_ PDE and sketches are 2x smaller on high-res Windows 8 machines
+_   https://github.com/processing/processing/issues/2411
+
+
 export
 X incorporate new launch4j 3.4
 X   http://sourceforge.net/projects/launch4j/files/launch4j-3/3.4/