diff --git a/core/PApplet.java b/core/PApplet.java
index 19eb1c966..067669fab 100644
--- a/core/PApplet.java
+++ b/core/PApplet.java
@@ -1188,12 +1188,12 @@ public class PApplet extends Applet
     mouseY = event.getY();
     mouseEvent = event;
 
-    int button = event.getButton();
-    if (button == 1) {
+    int modifiers = event.getModifiers();
+    if ((modifiers & MouseEvent.BUTTON1_MASK) != 0) {
       mouseButton = LEFT;
-    } else if (button == 2) {
+    } else if ((modifiers & MouseEvent.BUTTON2_MASK) != 0) {
       mouseButton = CENTER;
-    } else if (button == 3) {
+    } else if ((modifiers & MouseEvent.BUTTON3_MASK) != 0) {
       mouseButton = RIGHT;
     }
     // if running on macos, allow ctrl-click as right mouse
diff --git a/core/todo.txt b/core/todo.txt
index aa0594a43..ecbb06439 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,4 +1,30 @@
 0086 core
+X java 1.4 getButton() was inside the mouse handler
+X   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1114147314;start=3
+
+_ the draw() method must exist, otherwise the sketch won't run
+
+_ point appears to be broken
+_   could be a problem with java 1.5? (was using win2k)
+noStroke();
+colorMode(RGB, 100);  
+for(int i=0; i<100; i++) {  
+  for(int j=0; j<100; j++) {  
+    stroke(i, j, 0);  
+    point(i, j);  
+  }  
+}  
+As an aside, set() is at least 10x faster, and 
+perhaps should be used in these examples anyway. 
+_   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1114204116;start=0
+
+_ textMode(RIGHT) etc causing trouble.. tell ppl to use textAlign()
+_   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=Syntax;action=display;num=1114219121;start=4
+
+_ polygon rendering bug?
+_   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1114158993;start=1
+
+_ video wrong device name crashes things
 
 X typed version of expand() and contract()
 _   need to complete for the others: