diff --git a/core/todo.txt b/core/todo.txt
index a675ac470..05875f583 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,5 +1,13 @@
 0261 (3.3.4 or 3.4)
 
+_ set the application name to sketch name (not processing.core.PApplet)
+_   System.setProperty("com.apple.mrj.application.apple.menu.about.name", ...)
+_   -Xdock:name=<application name>
+_   -Xdock:icon=<path to icon file>
+
+_ WARNING: GL pipe is running in software mode (Renderer ID=0x1020400)
+_   is this coming from us? if so, need to provide actions
+
 
 high
 _ implement sketch scaling into PApplet
@@ -533,14 +541,6 @@ _ InvScreenX, Y, Z to convert screen (mouse) coordinates to model coordinates
 _   https://github.com/processing/processing/issues/1609
 
 
-CORE / Mac OS X
-
-_ set the application name to sketch name (not processing.core.PApplet)
-_   System.setProperty("com.apple.mrj.application.apple.menu.about.name", ...)
-_   -Xdock:name=<application name>
-_   -Xdock:icon=<path to icon file>
-
-
 CORE / Events
 
 _ touch events.. can't do MouseEvent et al with Android
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
index 65058b881..0d0fb1bda 100644
--- a/java/src/processing/mode/java/runner/Runner.java
+++ b/java/src/processing/mode/java/runner/Runner.java
@@ -376,7 +376,9 @@ public class Runner implements MessageConsumer {
     } else {
       params.append("processing.core.PApplet");
 
-      // get the stored device index (starts at 1)
+      // Get the stored device index (starts at 1)
+      // By default, set to -1, meaning 'the default display',
+      // which is the same display as the one being used by the Editor.
       int runDisplay = Preferences.getInteger("run.display");
 
       // If there was a saved location (this guy has been run more than once)
@@ -395,23 +397,26 @@ public class Runner implements MessageConsumer {
 
         // Make sure the display set in Preferences actually exists
         GraphicsDevice runDevice = editorDevice;
-        if (runDisplay > 0 && runDisplay <= devices.length) {
-          runDevice = devices[runDisplay-1];
-        } else {
-          // If a bad display is selected, use the same display as the editor
-          if (runDisplay > 0) {  // don't complain about -1 or 0
-            System.err.println("Display " + runDisplay + " not available.");
-          }
-          runDevice = editorDevice;
-          for (int i = 0; i < devices.length; i++) {
-            if (devices[i] == runDevice) {
-              // Wasn't setting the pref to avoid screwing things up with
-              // something temporary. But not setting it makes debugging one's
-              // setup just too damn weird, so changing that behavior.
-              runDisplay = i + 1;
-              System.err.println("Setting 'Run Sketches on Display' preference to display " + runDisplay);
-              Preferences.setInteger("run.display", runDisplay);
-              break;
+        if (runDisplay > 0) {
+          if (runDisplay <= devices.length) {
+            runDevice = devices[runDisplay-1];
+
+          } else {
+            // If a bad display is selected, use the same display as the editor
+            if (runDisplay > 0) {  // don't complain about -1 or 0
+              System.err.println("Display " + runDisplay + " not available.");
+            }
+            runDevice = editorDevice;
+            for (int i = 0; i < devices.length; i++) {
+              if (devices[i] == runDevice) {
+                // Wasn't setting the pref to avoid screwing things up with
+                // something temporary. But not setting it makes debugging one's
+                // setup just too damn weird, so changing that behavior.
+                runDisplay = i + 1;
+                System.err.println("Setting 'Run Sketches on Display' preference to display " + runDisplay);
+                Preferences.setInteger("run.display", runDisplay);
+                break;
+              }
             }
           }
         }
diff --git a/todo.txt b/todo.txt
index fc3671e07..a33303a6f 100755
--- a/todo.txt
+++ b/todo.txt
@@ -4,17 +4,18 @@ o   https://github.com/processing/processing/pull/4935
 X   https://github.com/processing/processing/issues/4825
 X clean up error message for sketchbook location
 X   https://github.com/processing/processing/issues/4942
+X Application Exports report as "Damaged" on macOS Sierra
+X   https://github.com/processing/processing/issues/4705
+X   could provide script to un-quarrantine
+X   xattr -d -r com.apple.quarantine
+X   https://github.com/steakknife/unsign
+X   https://developer.apple.com/library/content/technotes/tn2318
+X 'run sketches on display' message shows up on clean install
 
 gohai
 X IO library updates
 X   https://github.com/processing/processing/pull/5044
 
-_ Application Exports report as "Damaged" on macOS Sierra
-_   https://github.com/processing/processing/issues/4705
-_   could provide script to un-quarrantine
-_   xattr -d -r com.apple.quarantine
-_   https://github.com/steakknife/unsign
-
 _ should ant run launch the .app so that launchsvcs stuff works properly?
 
 _ sketch.properties not being written if initial mode is p5.js?
@@ -85,7 +86,6 @@ _   https://github.com/processing/processing/issues/4805
 
 _ "error during export" message, but no error message contents come through
 _   e.g. https://github.com/processing/processing/issues/4792
-_ 'run sketches on display' message shows up on clean install
 
 _ report of a library or tool (probably includes 2.x? 1.x?) breaking things
 _   NoSuchFieldError: useNativeSelect