diff --git a/build/build.xml b/build/build.xml
index 0bade17c2..073345de6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -69,9 +69,14 @@
   <!-- Switching to 8 because updates for 7 ended April 2015 -->
   <property name="jdk.version" value="8" />
   <!-- moving back to 8u51 because of Oracle bug in OS X and Linux smoothing
-       https://github.com/processing/processing/issues/3795 -->
+       https://github.com/processing/processing/issues/3795
+       https://bugs.openjdk.java.net/browse/JDK-8136495 -->
+  <property name="jdk.update" value="74" />
+  <property name="jdk.build" value="2" />
+  <!--
   <property name="jdk.update" value="51" />
   <property name="jdk.build" value="16" />
+  -->
   <!--
   <property name="jdk.update" value="60" />
   <property name="jdk.build" value="27" />
@@ -499,7 +504,7 @@
     <!-- Require that a JDK be installed, but call this on build, so that
          the download-jdk-macosx target can be called. -->
     <fail unless="macosx_jdk_found"
-          message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.short} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again.${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop." />
+          message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop.${line.separator}Note that only ${jdk.short} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
 
     <mkdir dir="macosx/work" />
     
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 04330a5e6..1cd75bd41 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -11138,9 +11138,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/src/processing/javafx/PSurfaceFX.java b/core/src/processing/javafx/PSurfaceFX.java
index f1572f6c7..29fa59861 100644
--- a/core/src/processing/javafx/PSurfaceFX.java
+++ b/core/src/processing/javafx/PSurfaceFX.java
@@ -313,7 +313,8 @@ public class PSurfaceFX implements PSurface {
       // https://github.com/processing/processing/issues/3823
       if ((PApplet.platform == PConstants.MACOSX ||
            PApplet.platform == PConstants.LINUX) &&
-          PApplet.javaVersionName.compareTo("1.8.0_60") >= 0) {
+          PApplet.javaVersionName.compareTo("1.8.0_60") >= 0 &&
+          PApplet.javaVersionName.compareTo("1.8.0_72") < 0) {
         System.err.println("smooth() disabled for JavaFX with this Java version due to Oracle bug");
         System.err.println("https://github.com/processing/processing/issues/3795");
         smooth = 0;
diff --git a/core/todo.txt b/core/todo.txt
index b1fa91ad8..590391f45 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -3,6 +3,8 @@ X Fix another "Zero length string passed to TextLayout constructor" error
 X Ambiguity on where to call smooth()
 X   https://github.com/processing/processing/issues/4211
 X   add additional clarification for Eclipse users
+X Flipped Y-axis in JavaFX is now done (JDK bug)
+X   https://github.com/processing/processing/issues/3795
 
 _ textAlign(CENTER) and pixelDensity(2) aligning incorrectly with Java2D
 _   https://github.com/processing/processing/issues/4020
diff --git a/todo.txt b/todo.txt
index 09000be77..e973019e3 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,5 @@
 0248 (3.0.2)
+X move to Java 8u74, also fixes JavaFX issue
 
 contribs
 X add "full screen" option to the Editor on OS X
@@ -33,6 +34,10 @@ X   https://github.com/processing/processing/issues/4098
 X   https://github.com/processing/processing/pull/4103
 X message when reference is find out on nothing selected
 X   https://github.com/processing/processing/pull/4296
+X better handling of quotes in command line args
+X   https://github.com/processing/processing/pull/4145
+X   https://github.com/processing/processing/issues/3996
+X   https://github.com/processing/processing/issues/4119
 
 jakub
 X Workaround for JRE bug freezing the PDE during code completion