diff --git a/core/PApplet.java b/core/PApplet.java
index 325384c2a..2ff0f2b24 100644
--- a/core/PApplet.java
+++ b/core/PApplet.java
@@ -1226,7 +1226,7 @@ public class PApplet extends Applet
   }
 
 
-  synchronized public void display() {
+  synchronized public void handleDisplay() {
     if (PApplet.THREAD_DEBUG) println(Thread.currentThread().getName() +
                                       " formerly nextFrame()");
     if (looping || redraw) {
diff --git a/core/PGraphics.java b/core/PGraphics.java
index 39b06dc91..ea59f4eb7 100644
--- a/core/PGraphics.java
+++ b/core/PGraphics.java
@@ -535,7 +535,7 @@ public class PGraphics extends PImage implements PConstants {
    * Parent thread has requested that visual action be taken.
    */
   public void requestDisplay(PApplet parent) {  // ignore
-    parent.display();
+    parent.handleDisplay();
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
index d28e938f2..aa5e8ec76 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -4,14 +4,17 @@ X   use ByteOrder class in jdk 1.4, since issue is local to JOGL
 X   security ex when run as an applet
 X   also can no longer assume that macosx is big endian
 X   http://dev.processing.org/bugs/show_bug.cgi?id=309
+o making 'run' synchronized caused a freeze on start w/ opengl
+X display() as a function name is problematic
+X   causes nothing to show up.. either rename or mark it final
+X   http://dev.processing.org/bugs/show_bug.cgi?id=213
 
-_ making 'run' synchronized caused a freeze on start w/ opengl
-_ sonia is locking up on load in rev 91
+_ sonia (and anything awt) is locking up on load in rev 91
 _   prolly something w/ the threading issues
+_   paint is synchronized in 0091
+_     however this is a necessity, otherwise nasty flickering ensues
+_     and using a "glock" object seems to completely deadlock
 _   http://dev.processing.org/bugs/show_bug.cgi?id=46
-_ display() as a function name is problematic
-_   causes nothing to show up.. either rename or mark it final
-_   http://dev.processing.org/bugs/show_bug.cgi?id=213
 
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
diff --git a/opengl/PGraphicsGL.java b/opengl/PGraphicsGL.java
index b141c2a7e..88d19b0c4 100644
--- a/opengl/PGraphicsGL.java
+++ b/opengl/PGraphicsGL.java
@@ -124,7 +124,7 @@ public class PGraphicsGL extends PGraphics3 {
           // need to get a fresh opengl object here
           //gl = canvas.getGL();
           gl = drawable.getGL();
-          parent.display();  // this means it's time to go
+          parent.handleDisplay();  // this means it's time to go
         }
 
         public void init(GLAutoDrawable drawable) { }
diff --git a/todo.txt b/todo.txt
index a44541ff7..2831f7561 100644
--- a/todo.txt
+++ b/todo.txt
@@ -5,6 +5,11 @@ X   http://dev.processing.org/bugs/show_bug.cgi?id=308
 X   also add esc/ctrl-w for closing the picker
 X update information on mactels in the faq, also java 1.6
 
+_ make multiple jar files thing work as an option
+_   http://dev.processing.org/bugs/show_bug.cgi?id=62
+_   applet default is one file, application default is multiple
+_   buttons on side of sketch do default (last) behavior
+
 _ svg loader is on the list for 1.0
 _   maybe include as part of PApplet (casey thinks so)
 _ svg output, make simple version of PGraphicsSVG based on PGraphicsPDF
@@ -400,10 +405,6 @@ _   http://dev.processing.org/bugs/show_bug.cgi?id=194
 _ include a note that 'applet' folder will get emptied/rewritten
 _   or rename the old applet folder to something else? (too messy)
 _   http://dev.processing.org/bugs/show_bug.cgi?id=61
-_ make multiple jar files thing work as an option
-_   http://dev.processing.org/bugs/show_bug.cgi?id=62
-_   applet default is one file, application default is multiple
-_   buttons on side of sketch do default (last) behavior
 _ need to decide how to handle "stop" button in present mode
 _   http://dev.processing.org/bugs/show_bug.cgi?id=63
 _   when running externally, people need to write their own stop function
@@ -658,6 +659,7 @@ _   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=Syntax;action=displ
 LIBRARIES / Serial
 
 _ find/build universal version of rxtx
+_   http://dev.processing.org/bugs/show_bug.cgi?id=311
 _ port buffering not working properly
 _   may just be a problem with thread starvation
 _   bufferUntil() fires an event but continues to fill up the buffer