diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index c928899e7..57f2a9f03 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -10025,6 +10025,24 @@ public class PApplet implements PConstants {
     // Remove 60fps limit on the JavaFX "pulse" timer
     System.setProperty("javafx.animation.fullspeed", "true");
 
+    // In an exported application, add the Contents/Java folder to the
+    // java.library.path, so that native libraries work properly.
+    // Without this, the library path is only set to Contents/MacOS
+    // where the launcher binary lives.
+    if (platform == MACOSX) {
+      URL coreJarURL =
+        PApplet.class.getProtectionDomain().getCodeSource().getLocation();
+      // The jarPath from above will/may be URL encoded (%20 for spaces)
+      String coreJarPath = urlDecode(coreJarURL.getPath());
+      if (coreJarPath.endsWith("/Contents/Java/core.jar")) {
+        // remove the /core.jar part from the end
+        String javaPath = coreJarPath.substring(0, coreJarPath.length() - 9);
+        String libraryPath = System.getProperty("java.library.path");
+        libraryPath += File.pathSeparator + javaPath;
+        System.setProperty("java.library.path", libraryPath);
+      }
+    }
+
     // Catch any HeadlessException to provide more useful feedback
     try {
       // Call validate() while resize events are in progress
diff --git a/core/todo.txt b/core/todo.txt
index 197a089d7..916daaf9a 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -2,7 +2,13 @@
 X Incomplete text rendering of strings with consecutive line breaks
 X   https://github.com/processing/processing/issues/3736
 X   https://github.com/processing/processing/pull/3737
+X add the Contents/Java folder to java.library.path on OS X
+X   allows exported applications to use the Sound library
 
+andres
+X P2D: error calling surface.setTitle()
+o   https://github.com/processing/processing/issues/3721
+X   https://github.com/processing/processing/commit/a384cbf0890a49dbf6e0fdd80e048de80e5d78d2
 
 jakub
 X FX - fix transformation stack NPE
@@ -39,6 +45,8 @@ X FX - normalize enter key
 X   https://github.com/processing/processing/pull/3730
 X Render text starting with space properly
 X   https://github.com/processing/processing/pull/3746
+X FX - smooth for the main surface
+X   https://github.com/processing/processing/pull/3749
 
 
 known issues
diff --git a/todo.txt b/todo.txt
index d18390f43..d4864ddd2 100644
--- a/todo.txt
+++ b/todo.txt
@@ -14,7 +14,10 @@ _   Code editor wrongly detects errors for libraries in code folder
 _   https://github.com/processing/processing/issues/3732
 _ remove old versions of processing-java when installing on OS X
 _ "color type detected! this shouldn't be happening! please report"
+_   happens when user does 'new color' instead of 'color'
 _   https://github.com/processing/processing/issues/3739
+_ confusion when // tweak is used
+_   https://github.com/processing/processing/issues/3742
 
 gsoc
 X CM: Category dropdown alignment