diff --git a/app/src/processing/mode/android/AVD.java b/app/src/processing/mode/android/AVD.java
index 3bb4e1d21..4f7d138de 100644
--- a/app/src/processing/mode/android/AVD.java
+++ b/app/src/processing/mode/android/AVD.java
@@ -145,6 +145,7 @@ public class AVD {
         // Just generally not working
 //        Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
         Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
+        System.out.println(createAvdResult);
 //        throw new IOException("Error creating the AVD");
       }
       //System.err.println(createAvdResult);
diff --git a/app/src/processing/mode/android/AndroidEditor.java b/app/src/processing/mode/android/AndroidEditor.java
index 0a8e97c33..ca35952ce 100644
--- a/app/src/processing/mode/android/AndroidEditor.java
+++ b/app/src/processing/mode/android/AndroidEditor.java
@@ -370,7 +370,7 @@ public class AndroidEditor extends JavaEditor {
   public void handleStop() {
     toolbar.deactivate(AndroidToolbar.RUN);
     stopIndeterminate();
-    amode.handleStop();
+    amode.handleStop(this);
   }
 
   
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 558a94178..2b85e99ab 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -9,12 +9,17 @@ import javax.swing.*;
 import javax.swing.border.*;
 
 import processing.app.*;
+import processing.mode.java.runner.Runner;
 
 
 public class JavaEditor extends Editor {
   JavaMode jmode;
+
   // TODO this needs prefs to be applied when necessary
   PdeKeyListener listener;
+  
+  // Runner associated with this editor window
+  private Runner runtime;
 
   
   protected JavaEditor(Base base, String path, int[] location, Mode mode) {
@@ -502,7 +507,11 @@ public class JavaEditor extends Editor {
     toolbar.activate(JavaToolbar.STOP);
 
     try {
-      jmode.handleStop();
+      //jmode.handleStop();
+      if (runtime != null) {
+        runtime.close();  // kills the window
+        runtime = null; // will this help?
+      }
     } catch (Exception e) {
       statusError(e);
     }
@@ -517,15 +526,15 @@ public class JavaEditor extends Editor {
   
   public void handleSave() {
     toolbar.activate(JavaToolbar.SAVE);
-    handleStop();
+    //handleStop();
     super.handleSave();
     toolbar.deactivate(JavaToolbar.SAVE);
   }
-  
-  
+
+
   public boolean handleSaveAs() {
     toolbar.activate(JavaToolbar.SAVE);
-    handleStop();
+    //handleStop();
     boolean result = super.handleSaveAs();
     toolbar.deactivate(JavaToolbar.SAVE);
     return result;
@@ -589,6 +598,7 @@ public class JavaEditor extends Editor {
   
   
   public void internalCloseRunner() {
-    jmode.handleStop();
+    //jmode.handleStop();
+    handleStop();
   }
 }
\ No newline at end of file
diff --git a/app/src/processing/mode/java/JavaMode.java b/app/src/processing/mode/java/JavaMode.java
index 5afcf735c..a1da853a9 100644
--- a/app/src/processing/mode/java/JavaMode.java
+++ b/app/src/processing/mode/java/JavaMode.java
@@ -38,8 +38,6 @@ import processing.mode.java.runner.Runner;
 
 
 public class JavaMode extends Mode {
-  private Runner runtime;
-
   // classpath for all known libraries for p5
   // (both those in the p5/libs folder and those with lib subfolders
   // found in the sketchbook)
@@ -173,32 +171,36 @@ public class JavaMode extends Mode {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
   
-  public void handleRun(Sketch sketch, RunnerListener listener) throws SketchException {
+  public Runner handleRun(Sketch sketch, RunnerListener listener) throws SketchException {
+    Runner runtime = null; 
     JavaBuild build = new JavaBuild(sketch);
     String appletClassName = build.build();
     if (appletClassName != null) {
       runtime = new Runner(build, listener);
       runtime.launch(false);
     }
+    return runtime;
   }
 
 
-  public void handlePresent(Sketch sketch, RunnerListener listener) throws SketchException {
+  public Runner handlePresent(Sketch sketch, RunnerListener listener) throws SketchException {
+    Runner runtime = null;
     JavaBuild build = new JavaBuild(sketch);
     String appletClassName = build.build();
     if (appletClassName != null) {
       runtime = new Runner(build, listener);
       runtime.launch(true);
     }
+    return runtime;
   }
 
 
-  public void handleStop() {
-    if (runtime != null) {
-      runtime.close();  // kills the window
-      runtime = null; // will this help?
-    }
-  }
+//  public void handleStop() {
+//    if (runtime != null) {
+//      runtime.close();  // kills the window
+//      runtime = null; // will this help?
+//    }
+//  }
   
   
   public boolean handleExportApplet(Sketch sketch) throws SketchException, IOException {
diff --git a/core/todo.txt b/core/todo.txt
index 1c41bda2b..4ab44712f 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -10,6 +10,8 @@ _   http://code.google.com/p/processing/issues/detail?id=332
 
 
 for 2.0
+_ rounded rectangle method 
+_   http://code.google.com/p/processing/issues/detail?id=265
 _ make sure that loadXxxx() methods are used after init()
 _   nasty errors when loadImage/Font/createFont/etc used outside
 _ selectInput() and selectOutput() freezes
diff --git a/todo.txt b/todo.txt
index d8401b0c7..110b27982 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,6 +2,26 @@
 X upgrade to Quaqua 7.3.4 on OS X
 X   fixes checkbox in mode menu smashing into things
 C build a new version of the reference
+X automatically add version numbers to Info.plist
+X   would help with beta releases, and not having to edit by hand
+X add another fix for text focus handling
+X   http://code.google.com/p/processing/issues/detail?id=627
+X file-save stops running sketch
+X   http://dev.processing.org/bugs/show_bug.cgi?id=810
+X   http://code.google.com/p/processing/issues/detail?id=100
+X fix bug in loadfile2 example 
+X   http://code.google.com/p/processing/issues/detail?id=522
+
+_ allow more than one sketch to run at a time
+_ help casey re-export all applets for the site
+_   remove .java files, use one central loading.gif and core.jar?
+_   use a custom applet.html template for the export
+_     the tool could copy this into the folder just before exporting
+_ remove all the 'applet' folders from svn
+_ remove opengl2 for 1.5 and examples for the final 1.5
+_ need to get a new stable release out there, the docs/ref are out of sync
+_ build is currently broken for p5 because of changes to the file layout
+_   something that gets fixed my 'make clean'
 
 from peter n lewis 
 X Use Selection For Find
@@ -21,31 +41,27 @@ o   http://dev.processing.org/bugs/show_bug.cgi?id=68
 o   only enable "find next" in menu after a find has happened
 X   http://code.google.com/p/processing/issues/detail?id=24
 
-_ sketch marked as modified too aggressively
+several changes to the undo setup
+X sketch marked as modified too aggressively
 o   http://dev.processing.org/bugs/show_bug.cgi?id=328
-_   http://code.google.com/p/processing/issues/detail?id=57
-_ "save" clears undo information
-_   http://code.google.com/p/processing/issues/detail?id=411
-The problem comes from Editor.java's UndoAction inner class. The updateUndoState() method marks a sketch as unmodified when the undo stack is exhausted. This made sense when the undo stack was cleared on save, but it is no longer correct.
-Fix: remove lines 985-987 from Editor.java
-_ PDE change indicator partially broken
-_   http://code.google.com/p/processing/issues/detail?id=620
+X   http://code.google.com/p/processing/issues/detail?id=57
+X "save" clears undo information
+X   http://code.google.com/p/processing/issues/detail?id=411
+X PDE change indicator partially broken
+X   http://code.google.com/p/processing/issues/detail?id=620
 
-
-_ help casey re-export all applets for the site
-_   remove .java files, use one central loading.gif and core.jar?
-_   use a custom applet.html template for the export
-_     the tool could copy this into the folder just before exporting
-
-
-_ remove opengl2 for 1.5 and examples
+fixed in 0195
+X rename/saveas doesn't properly have its focus set
+X   under windows, immediately typing after rename doesn't select
+X   the whole thing is selected, but not directly editable
+o   http://dev.processing.org/bugs/show_bug.cgi?id=31
+X   http://code.google.com/p/processing/issues/detail?id=13
 
 
 2.0
 _ colors for 2.0
 _ nurbs or other arch stuff for 2.0?
 
-
 _ Internationalization
 _   http://code.google.com/p/processing/issues/detail?id=593
 
@@ -146,10 +162,6 @@ _   (on mac os x, due to the change for no windows open)
 _ how to handle double-clicked files on windows?
 _   big deal for psk and others
 
-_ need to get a new stable release out there, the docs/ref are out of sync
-_ build is currently broken for p5 because of changes to the file layout
-_   something that gets fixed my 'make clean'
-
 _ Added some basic Emacs cursor navigator keybindings
 _   just implement these as a preference
 _   http://code.google.com/p/processing/issues/detail?id=555
@@ -277,9 +289,6 @@ _   or rather, why can't they be overridden?
 _   should fonts at least be in prefs.txt?
 _   http://dev.processing.org/bugs/show_bug.cgi?id=1444
 
-_ automatically add version numbers to Info.plist
-_   would help with beta releases, and not having to edit by hand
-
 _ for tools, maybe don't run on event thread? (makes the gui hang)
 _   but instead, things that affect gui need to be called w/ invokeLater?
 
@@ -937,8 +946,6 @@ _ go through other sketch-opening menus to check for disappearing sketches
 _ deal with isManagingFocus() warning in the editor src
 _ [LaunchRunner Error] processing.app.Base.main(String[]) threw an exception
 _   http://dev.processing.org/bugs/show_bug.cgi?id=821
-_ file-save stops running sketch
-_   http://dev.processing.org/bugs/show_bug.cgi?id=810
 _ strange NullPointerException problem prevents launch
 _   some kind of NPE in handleOpenInternal and friends
 _   appears to be a synchronization problem with the loading
@@ -972,10 +979,6 @@ _   option to export all the code as colored html
 _   http://dev.processing.org/bugs/show_bug.cgi?id=28
 _ "page setup" sucks in java
 _   http://dev.processing.org/bugs/show_bug.cgi?id=435
-_ rename/saveas doesn't properly have its focus set
-_   under windows, immediately typing after rename doesn't select
-_   the whole thing is selected, but not directly editable
-_   http://dev.processing.org/bugs/show_bug.cgi?id=31
 _ dim edit menus as appropriate during selection/no selection/etc
 _   http://dev.processing.org/bugs/show_bug.cgi?id=33
 _ fonts smaller than 10 cause problems in the editor
@@ -995,6 +998,8 @@ P5 _ problems with file/print
 P5 _   http://dev.processing.org/bugs/show_bug.cgi?id=1230
 P4 _ comments not always colored correctly
 P4 _   http://dev.processing.org/bugs/show_bug.cgi?id=1194
+_ program sometimes goes gray because it thinks everything is in a comment
+_   http://code.google.com/p/processing/issues/detail?id=564
 
 
 PDE / Editor Buttons