diff --git a/build/build.xml b/build/build.xml
index 69b2c0de4..aab82ec3b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,6 +40,14 @@
     <antcall target="${platform}-dist" />
   </target>
 
+  <target name="android-dist-check">
+    <!-- ensure that the android-core.zip file has been built -->
+    <available file="${target.path}/modes/android/android-core.zip" 
+	       property="android-core-present" />
+    <fail unless="android-core-present" 
+	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
+  </target>
+
   <!-- "§$§$&, ant doesn't have a built-in help target :(  -->
   <target name="help" description="Show project help">
     <java classname="org.apache.tools.ant.Main">
@@ -57,7 +65,6 @@
     <subant buildpath="../java/libraries/dxf" target="clean"/>
     <subant buildpath="../java/libraries/net" target="clean"/>
     <subant buildpath="../java/libraries/opengl" target="clean"/>
-    <subant buildpath="../java/libraries/opengl2" target="clean"/>    
     <subant buildpath="../java/libraries/pdf" target="clean"/>
     <subant buildpath="../java/libraries/serial" target="clean"/>
     <subant buildpath="../java/libraries/video" target="clean"/>
@@ -70,7 +77,6 @@
     <subant buildpath="../java/libraries/dxf" target="build"/>
     <subant buildpath="../java/libraries/net" target="build"/>
     <subant buildpath="../java/libraries/opengl" target="build"/>
-    <subant buildpath="../java/libraries/opengl2" target="build"/>    
     <subant buildpath="../java/libraries/pdf" target="build"/>
     <subant buildpath="../java/libraries/serial" target="build"/>
     <subant buildpath="../java/libraries/video" target="build"/>
@@ -101,8 +107,6 @@
 	<exclude name="**/cmd/**" />
 	<exclude name="reference.zip" />
 	<exclude name="**/._*" />
-	<!-- removing for the 1.5 release -->
-<!--	<exclude name="libraries/opengl2/**" />-->
 
 	<exclude name="examples/**/applet/**" />
       </fileset>
@@ -156,12 +160,6 @@
 	<exclude name="**/._*" />
       </fileset>
     </copy>
-
-    <!-- ensure that the android-core.zip file has been built -->
-    <available file="${target.path}/modes/android/android-core.zip" 
-	       property="android-core-present" />
-    <fail unless="android-core-present" 
-	  message="android-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
     
     <!-- copy libraries -->
 <!--
@@ -191,9 +189,6 @@
     <copy todir="${target.path}/modes/java/libraries/opengl">
       <fileset dir="../opengl" includes="library/**,src/**" />
     </copy>
-    <copy todir="${target.path}/modes/java/libraries/opengl2">
-      <fileset dir="../opengl2" includes="library/**,src/**" />
-    </copy>
     <copy todir="${target.path}/modes/java/libraries/pdf">
       <fileset dir="../pdf" includes="library/**,src/**" />
     </copy>
@@ -344,7 +339,7 @@
     <exec executable="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
   </target>
 
-  <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
+  <target name="macosx-dist" if="macosx" depends="macosx-build,android-dist-check" description="Create a downloadable .zip for the Mac OS X version">
 
     <!-- The ant copy command does not preserve permissions. -->
     <chmod file="macosx/work/Processing.app/Contents/MacOS/JavaApplicationStub*" perm="ugo+x" />
@@ -465,7 +460,7 @@
     <exec executable="./processing" dir="linux/work" spawn="true"/>
   </target>
   
-  <target name="linux-dist" depends="linux-build" 
+  <target name="linux-dist" depends="linux-build,android-dist-check" 
 	  description="Build .tar.gz of linux version">
 
     <get src="http://processing.googlecode.com/files/jre-tools-6u24-linux-i586.tgz" 
@@ -586,7 +581,7 @@ http://www.gnu.org/software/tar/manual/html_section/transform.html
 	  dir="windows/work" spawn="true"/>
   </target>
 
-  <target name="windows-dist" depends="windows-build" 
+  <target name="windows-dist" depends="windows-build,android-dist-check" 
 	  description="Create .zip files of windows version">
 
     <get src="http://processing.googlecode.com/files/jre-tools-6u24-windows-i586.zip" 
diff --git a/core/todo.txt b/core/todo.txt
index 3887c67c9..d21190f67 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -25,6 +25,9 @@ _   http://code.google.com/p/processing/issues/detail?id=184
 _ Can resize sketch with P3D, but not OPENGL
 _   http://code.google.com/p/processing/issues/detail?id=383
 
+_ jogl demos, NEWT examples crash on osx http://jogamp.org/jogl-demos/www/
+_   http://jogamp.org/jogl-demos/www/applettest-jnlp.html
+
 _ sleep time needs to be set *much* higher for dormant applets
 _   10s should be fine--no need to keep spinning (bad for android too)
 _   just call interrupt() when it's time to get back to work
@@ -35,13 +38,17 @@ _   http://code.google.com/p/processing/issues/detail?id=636
 _ font rotation (native font problem?) with natives?
 _   http://code.google.com/p/processing/issues/detail?id=692
 
-for 2.0
+ben
 _ PUtil -> move match(), lots of other non-gui functions into own class
 _   and merge it in statically via the methods code
+
+2.0
 _ PVector discussion with Dan
 _ have andres take over all current GL issues in the tracker
 _ sort out destroy(), stop(), pause() et al
 _   ColorSelector should stop/pause when not visible
+_   start()/stop() perform like onPause()/onResume()
+_     all of which call pause() and resume()
 _ decision on registered methods
 _ call reapplySettings() when using beginRecord()?
 _ binary() auto-sizes, hex() does not
@@ -108,6 +115,7 @@ _ how much of com.benfry.* should go in?
 _   Table? StringIntPairs? JSON? MD5? Integrator? ColorIntegrator?
 _ actual shape api for things like rectangles and whatnot?
 _ PShape api to handle internal vertex stuff
+_ size() and resize() and whatever? 
 
 _ hitting ESC in a running noLoop()ed sketch won't close the sketch?
 _   work through serial examples
diff --git a/todo.txt b/todo.txt
index f1567d1eb..255327cbb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -3,45 +3,62 @@ X incorporate RXTXcomm.jar and others from Dave
 X Serial.list() cannot find /dev/ttyACM0
 X   http://code.google.com/p/processing/issues/detail?id=634
 
+cleanup
+X how is autoformat doing? good now
+X catch 1.5 code in libraries - is this still an issue for 1.6 on 1.5? 
+X   Exception in thread "main" java.lang.UnsupportedClassVersionError: quicktime/QTException (Unsupported major.minor version 49.0) 
+o javascript and liveconnect to preload applets
+o   http://code.google.com/p/processing/issues/detail?id=66
+X   let's not bother
+o warn the user that the applet/application folders will be replaced
+X   nope, people not seeing this much
+o firmata as a core library (read/write to/from arduino)?
+o   package cc.arduino.*
+X   no thanks, they've abandoned it
+o add page numbers and file name to printing in p5
+o   also add something to control the font & font size
+X   -> jer: "can we put fax support in there too?" 
+o prevent people from setting the font size too small in the editor
+o   how do we figure out what "too small" is?
+X   -> everyone thinks this is funny
 
-2.0
-_ colors for 2.0
-_ nurbs or other arch stuff for 2.0?
+
+pnode: look more closely at json and xml compatibility
+
+frequent requests/projects
+_ nurbs or other architecture stuff
+_ force indentation - implement an option for beginners especially
+_ indents and loops
+_   or make the area light up gray as it's being worked on
+_ fix autoformat to indent like the p5 book/examples
+_ common error messages
+_   with a proper list, we can add links when throwing an error in the PDE
+
+
+casey
+_ colors for 2.0 - casey working on it, presenting sunday
+
+ben
 _ build is currently broken for fresh checkout due to changes to file layout
 _   something that gets fixed by 'make clean'
-_ require Java 6 (and with that, OS X 10.5 plus Core 2 Intel Mac)?
-_   though we need a 64-bit browser before applets will run...
-_   http://www.ornl.gov/~t6p/Main/Utilities.html
-_ get rid of static mode? only setup/draw mode? or create project that way?
+_   also test on windows and linux
 _ use launch4j for export and p5 app itself
 _   perhaps even calling it through an ant task
-_ do examples need to be installed as bundles? 
-_ add === for String.equals()
-_   might be problematic since it might be opposite the javascript meaning
 _ l10n, i18n of environment/core - arduino pushing on this one
-_ indents and loops
-_   really, should just enforce this
-_   or make the area light up gray as it's being worked on
 _ eclipse import/export
 _   simple mechanism to export to eclipse
 _     don't worry about subversion stuff, just export with libraries
 _   something clever to import back from eclipse
 _   could keep the .svn files in with the libs and all
 _   then when exporting for eclipse, people can update as necessary
-_ catch 1.5 code in libraries - is this still an issue for 1.6 on 1.5? 
-_   Exception in thread "main" java.lang.UnsupportedClassVersionError: quicktime/QTException (Unsupported major.minor version 49.0) 
-_ javascript and liveconnect to preload applets
-_   http://code.google.com/p/processing/issues/detail?id=66
-_ warn the user that the applet/application folders will be replaced
-_ firmata as a core library (read/write to/from arduino)?
-_   package cc.arduino.*
-_ how is autoformat doing?
+_   -> dan et al say better to do fixed versions and have it work simply
 _ errors that cannot be placed (i.e. missing brace) 
 _   this makes things to jump to the last tab
-_ add page numbers and file name to printing in p5
-_   also add something to control the font & font size
-_ prevent people from setting the font size too small in the editor
-_   how do we figure out what "too small" is?
+_   also happens with stray characters sometimes...
+_   casey: accidentally typing a letter at the top of the tab
+_     throws you onto the end of the last tab... exactly the worst location
+_ jer: omitting a semicolon shows the error on the line after it...
+_ find across all tabs
 
 reference/examples
 _ import p5 reference into the javadoc
@@ -54,6 +71,11 @@ _   in the book(s)? in the reference?
 _ improve documentation of the pdf stuff
 _   be clearer about the font setup stuff
 _   fonts by default not working that well?
+_ jer: opengl2 tutorial
+_ jer: android tutorial
+_ probably later: examples into categories based on difficulty
+_   add ratings/difficult level to examples online and in the pde
+_ go through examples, figure out how to do many on the site w/ js instead
 
 opengl
 _ new opengl2
@@ -74,11 +96,23 @@ _ fast java2d video?
 
 gsoc
 _ "install library" menu option
+_ see how library installation goes, then possibly do same w/ examples
+
 
 3.0
 _ better text editor / live debugging (integrate Eclipse JDT)
+_   line numbers
 _ it's too difficult for students to debug their code
 _   can the jdt be hooked in somewhat easily?
+_ require Java 6 (and with that, OS X 10.5 plus Core 2 Intel Mac)?
+_   though we need a 64-bit browser before applets will run...
+_   http://www.ornl.gov/~t6p/Main/Utilities.html
+_ get rid of static mode? only setup/draw mode? or create project that way?
+_   pro: simplify internal code, fixes some of the worst errors
+_   con: people love it, most of the books use it heavily
+_ add === for String.equals()
+_   might be problematic since it might be opposite the javascript meaning
+_   jer: it's a decent time to start talking abt references/vars
 
 
 _ Closing applet window in Processing 1.5 causes serial crash