diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index c26691f25..1d5cbf59f 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -997,7 +997,7 @@ public class PApplet implements PConstants {
                                           JOptionPane.WARNING_MESSAGE);
           }
         });
-      } else if (!result.equals("1")) {
+      } else if (!"1".equals(result)) {
         System.err.println("Could not check the status of “Displays have separate spaces.”");
         System.err.format("Received message '%s' and result code %d.%n", trim(stderr.toString()), resultCode);
       }
@@ -10224,6 +10224,9 @@ public class PApplet implements PConstants {
     // used inside settings(). Sets a terrible precedent, but the alternative
     // of not being able to size a sketch to an image is driving people loopy.
     // A handful of things that need to be set before init/start.
+//    if (folder == null) {
+//      folder = calcSketchPath();
+//    }
     sketch.sketchPath = folder;
 
     // Call the settings() method which will give us our size() call
@@ -11140,9 +11143,9 @@ public class PApplet implements PConstants {
   /**
    * ( begin auto-generated from clip.xml )
    *
-   * Limits the rendering to the boundaries of a rectangle defined
-   * by the parameters. The boundaries are drawn based on the state
-   * of the <b>imageMode()</b> fuction, either CORNER, CORNERS, or CENTER.
+   * Limits the rendering to the boundaries of a rectangle defined 
+   * by the parameters. The boundaries are drawn based on the state 
+   * of the <b>imageMode()</b> fuction, either CORNER, CORNERS, or CENTER. 
    *
    * ( end auto-generated )
    *
diff --git a/core/todo.txt b/core/todo.txt
index 9170e7549..3812dc453 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -9,6 +9,11 @@ _   simple test case: using size() inside setup() from Eclipse
 X figure our size(img.width, img.height) situation
 X   just make loadImage() work in settings
 _   update the wiki and reference
+_ menu bar not hiding properly in exported applications with FX2D
+_   hideMenuBar() called from setup() works fine
+_ see if 8u65 or 8u66 fix the JavaFX problem
+_   if not, need to add them to the block list
+_ --hide-stop not working
 
 jakub
 X Fix depth sorter ordering when two triangles in a plane share vertices
@@ -30,6 +35,13 @@ X   https://github.com/processing/processing/issues/4027
 X   https://github.com/processing/processing/issues/4012
 X line loops incorrectly closed in P3D
 X   https://github.com/processing/processing/issues/4031
+X pixelDensity() and createGraphics()
+X   https://github.com/processing/processing/issues/4039
+X   https://github.com/processing/processing/commit/1d163197c970947bf5be17049bddbe8e444f759d
+X GL related crashes when closing the display window on Ubuntu (Intel)
+X   https://github.com/processing/processing/issues/4041
+X GL related crashes when closing window on MacBook Air (Intel) running 10.9.5
+X   https://github.com/processing/processing/issues/3977
 
 jogl
 X Update to JogAmp JOGL 2.3.2
diff --git a/todo.txt b/todo.txt
index e82136bd4..35f9c2177 100644
--- a/todo.txt
+++ b/todo.txt
@@ -44,6 +44,15 @@ X Export - fix java not being embedded on 64bit
 X   https://github.com/processing/processing/pull/4005
 X Add error checker document listeners to all tabs
 X   https://github.com/processing/processing/pull/4009
+X Fix memory leak in Recent
+X   https://github.com/processing/processing/pull/4044
+X Error checker update (also enables switch on String objects)
+X   https://github.com/processing/processing/issues/4034
+X   https://github.com/processing/processing/pull/4042
+X Fix occasional exception while editing text
+X   https://github.com/processing/processing/pull/4043
+X Prevent preprocessor from crashing when setup() has no body
+X   https://github.com/processing/processing/pull/4045
 
 arm/pi
 X Medium-sized I/O updates