diff --git a/android/todo.txt b/android/todo.txt
index 869250cbd..5d549058a 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -20,6 +20,15 @@ P1 _ errors that happen inside events (e.g. keys) not highlighting lines
 P1 _   useful stack trace information not coming through.. why?
 P1 _   http://dev.processing.org/bugs/show_bug.cgi?id=1384
 
+
+P2 _ separate "PApplet" into separate View and Activity classes
+P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1398
+P2 _ too many temporary objects (particularly w/ color) created with A2D
+P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1399
+P2 _ size() command is currently ignored in Android
+P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1397
+P2 _ Implement P3D, OpenGL, A3D for Android
+P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1396
 P2 _ android mode is currently per-editor (and clunky)
 P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1379
 P2 _ save state re: whether sketches are android or java mode (or others?)
@@ -33,6 +42,12 @@ P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1386
 P2 _ implement method for selecting donut or eclair AVD
 P2 _   http://dev.processing.org/bugs/show_bug.cgi?id=1390
 
+P3 _ remove unnecessary processing.xml.* code from android-core
+P3 _   http://dev.processing.org/bugs/show_bug.cgi?id=1400
+P3 _ remove processing.opengl.* classes and finish PGraphicsAndroid3D
+P3 _   http://dev.processing.org/bugs/show_bug.cgi?id=1401
+P3 _ remove legacy PGraphics3D class from processing.core.android
+P3 _   http://dev.processing.org/bugs/show_bug.cgi?id=1402
 P3 _ remove the need for a "Reset Android" menu option
 P3 _   http://dev.processing.org/bugs/show_bug.cgi?id=1392
 P3 _ don't require android tools to be installed already
diff --git a/build/linux/dist.sh b/build/linux/dist.sh
index 1dd9533fb..6a6a6fc62 100755
--- a/build/linux/dist.sh
+++ b/build/linux/dist.sh
@@ -32,6 +32,8 @@ cp -r ../shared/tools processing/
 cp ../../app/lib/antlr.jar processing/lib/
 cp ../../app/lib/ecj.jar processing/lib/
 cp ../../app/lib/jna.jar processing/lib/
+cp ../../app/lib/ant.jar processing/lib/
+cp ../../app/lib/ant-launcher.jar processing/lib/
 cp ../shared/revisions.txt processing/
 
 if [ $1 ]
diff --git a/build/windows/dist.sh b/build/windows/dist.sh
index 12b6a4d0c..fb27c3aee 100755
--- a/build/windows/dist.sh
+++ b/build/windows/dist.sh
@@ -40,6 +40,8 @@ fi
 cp ../../app/lib/antlr.jar processing/lib/
 cp ../../app/lib/ecj.jar processing/lib/
 cp ../../app/lib/jna.jar processing/lib/
+cp ../../app/lib/ant.jar processing/lib/
+cp ../../app/lib/ant-launcher.jar processing/lib/
 
 cp ../shared/revisions.txt processing/
 
diff --git a/core/done.txt b/core/done.txt
index a1c16f64a..e7c44e11c 100644
--- a/core/done.txt
+++ b/core/done.txt
@@ -1,3 +1,9 @@
+0173 core (private)
+X Re-enabled hack for temporary clipping. 
+X   Clipping still needs to be implemented properly, however. Please help!
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1393
+
+
 0172 core (private)
 X no changes to the core (or were there?) 
 
diff --git a/core/todo.txt b/core/todo.txt
index a02f556c8..aa598d004 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,7 +1,4 @@
-0173 core
-X Re-enabled hack for temporary clipping. 
-X   Clipping still needs to be implemented properly, however. Please help!
-X   http://dev.processing.org/bugs/show_bug.cgi?id=1393
+0174 core (private)
 
 
 _ open up the pdf library more (philho)
diff --git a/done.txt b/done.txt
index 10afa6725..9e8e3de97 100644
--- a/done.txt
+++ b/done.txt
@@ -1,3 +1,11 @@
+0173 pde (private)
+X change build scripts to use UTF-8 for encoding with javac
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1394
+X fix problem with Android HTML dialog box
+X   several <BR> items showing up when first loading
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1395
+
+
 0172 pde (private)
 X use xdg-open as launcher on linux
 X   http://dev.processing.org/bugs/show_bug.cgi?id=1358
diff --git a/todo.txt b/todo.txt
index eaf48598b..a33514b66 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,8 +1,6 @@
-0173 pde (private)
-X change build scripts to use UTF-8 for encoding with javac
-X   http://dev.processing.org/bugs/show_bug.cgi?id=1394
-X fix problem with Android HTML dialog box
-X   several <BR> items showing up when first loading
+0137 pde (private)
+X fix ant.jar/ant-launcher.jar error in the windows/linux build scripts
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1403
 
 _ automatically add version numbers to Info.plist
 _   would help with beta releases, and not having to edit by hand