diff --git a/build/build.xml b/build/build.xml
index 736f95f26..60f2540b3 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -152,7 +152,7 @@
   </condition>
 
   <!-- Set the version of Java that must be present to build. -->
-  <property name="jdk.update.macosx" value="45" />
+  <property name="jdk.update.macosx" value="51" />
   <property name="jdk.path.macosx" value="/Library/Java/JavaVirtualMachines/jdk1.7.0_${jdk.update.macosx}.jdk" />
 
   <available file="${jdk.path.macosx}" property="macosx_jdk_found" />
@@ -542,10 +542,11 @@
       <option value="-Xmx256M" />
       -->
 
+      <option value="-Dapple.awt.application.name=Processing" />
+
       <option value="-Dapple.laf.useScreenMenuBar=true" />
       <option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
       <option value="-Dcom.apple.macos.useScreenMenuBar=true" />
-      <option value="-Dcom.apple.mrj.application.apple.menu.about.name=${bundle.name}" />
       <option value="-Dcom.apple.smallTabs=true" />
 
 <!--
diff --git a/core/todo.txt b/core/todo.txt
index dd6ba5ec5..04a3f85fc 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -6,14 +6,48 @@ X remove println() from dataPath()
 X add special case for 'null' to println()
 X added print() method to IntList
 X   do for the others as well
+X fix esoteric typo with alpha and color
+X   https://github.com/processing/processing/issues/2230
+A pushStyle/popStyle should save/restore blendMode
+A   https://github.com/processing/processing/issues/2232
+
+opengl
+A PImage copy() function used with P2D flips the image
+A   https://github.com/processing/processing/issues/2171
+A filter shaders don't need to use the texture uniform
+A   https://github.com/processing/processing/issues/2204
+A texture() bug with stroke() in P2D
+A   https://github.com/processing/processing/issues/2205
+A allow sharing of GL context amongst multiple windows
+A   https://github.com/processing/processing/issues/1698
+A texture sampling setting is ignored when creating an offscreen PGraphics
+A   https://github.com/processing/processing/issues/1900
+A rounded rect broken with Processing 2.1 P3D renderer
+A   https://github.com/processing/processing/issues/2193
+X Clear the global PGL on dispose() (from JDF)
+X   https://github.com/processing/processing/pull/2279
+
+video
+A get() + video requires loadPixels in P2D/P3D
+A   https://github.com/processing/processing/issues/2202
+
+
+_ run window border color changed in 2.1
+_   https://github.com/processing/processing/issues/2297
 
 _ text looks lousy compared to the Apple JVM
 _   mess with rendering hints? (notes in PGraphicsJava2D)
+_ point() rendering differently in 2.0.3 and 2.1
+_   https://github.com/processing/processing/issues/2278
+
+_ Sketch runs with default size if size() is followed by large memory allocation
+_   https://github.com/processing/processing/issues/2039
 
 fixed in 2.1
 X draw() called again before finishing on OS X (retina issue)
 X   https://github.com/processing/processing/issues/1709
-
+X get() not always setting alpha channel when used with point()
+X   https://github.com/processing/processing/issues/1756
 
 high
 _ zero alpha values still a problem with retina renderer
@@ -25,6 +59,8 @@ _   String as a key, int/float/string list as values
 _ blendMode(ADD) is broken with default renderer
 _   https://github.com/processing/processing/issues/2012
 _   may have been introduced between 2.0b7 and 2.0b8
+_   https://github.com/processing/processing/issues/2275
+_   https://github.com/processing/processing/issues/2276
 _ add option to have full screen span across screens
 _   display=all in cmd line
 _   sketchDisplay() -> 0 for all, or 1, 2, 3...
diff --git a/todo.txt b/todo.txt
index 7431403e1..c3aefc30d 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,10 +1,44 @@
 0224 pde
-X readStringUntil() missing from new serial library
-X   https://github.com/processing/processing/issues/2174
+M fix infinite loop in Find/Replace
+M   https://github.com/processing/processing/issues/2082
+X updated to Minim 2.2
+X   https://github.com/processing/processing/pull/2250
+X minor change to bracket handling
+X   https://github.com/processing/processing/pull/2313
+X app is called procesing.app.Base
+X   https://github.com/processing/processing/issues/2217
+
+_ right-click on selection is a problem on Windows
+_   https://github.com/processing/processing/issues/2210
+_   https://github.com/GKFX/processing/commit/e1a50a8f984430048bf63a57f580e8940ed46cf9
+
+serial
+G readStringUntil() missing from new serial library
+G   https://github.com/processing/processing/issues/2174
+G updates to serial library
+G   https://github.com/processing/processing/pull/2265
+G serial running slowly
+G   https://github.com/processing/processing/issues/2249
+G   https://github.com/processing/processing/issues/2214
+G Only read a single character at a time to emulate RXTX behavior
+G   https://github.com/processing/processing/pull/2240
+G Add basic tests for throughput and latency
+G   https://github.com/processing/processing/pull/2225
+G Add a debug() method to Serial
+G   https://github.com/processing/processing/pull/2237
+G Switch the examples over to printArray()
+G   https://github.com/processing/processing/pull/2226
+
 _ noJavaArg set to --export
 _   https://github.com/processing/processing/issues/2182
-_ decision to be made on nextTabStop() inside TextAreaPainter
 
+_ jnilib not loading on OS X because Contents/Java needs to be added to path
+_   https://github.com/processing/processing/pull/2269 (from gohai)
+
+_ export not working on Windows
+_   https://github.com/processing/processing/issues/2219
+_ exported apps reporting as "damaged"
+_   https://github.com/processing/processing/issues/2095
 
 fixed in 2.1
 X init() not called on tools until later 
@@ -16,10 +50,13 @@ X   https://github.com/processing/processing/issues/1840
 high
 _ sketchPath() returns user.home in exported apps on OSX
 _   https://github.com/processing/processing/issues/2181
+_ QuickReference tool was able to bring down the environment
+_   https://github.com/processing/processing/issues/2229
 _ tab characters not recognized/drawn in the editor (2.1)
 _   https://github.com/processing/processing/issues/2180
 _   https://github.com/processing/processing/issues/2183
 _   udp library has tabs in the text
+_   decision to be made on nextTabStop() inside TextAreaPainter
 _ Chinese text is overlapped in Processing 2.1 editor
 _   https://github.com/processing/processing/issues/2173
 _ check on why 2x core.jar inside the Java folder
@@ -27,6 +64,10 @@ _   maybe OS X Java can't look in subfolders? (just auto-adds things)
 
 
 medium
+_ JNA conflicts can be avoided with a -D option
+_   https://github.com/processing/processing/issues/2239
+_ dataPath() not working when app is not run from app dir
+_   https://github.com/processing/processing/issues/2195
 _ should default to the local Java on Windows and Linux
 _   have export apps default to the local JRE
 _   Linux is probably using the system JRE if available