diff --git a/app/PdeEditorHeader.java b/app/PdeEditorHeader.java
index 254b92271..f58ec24ff 100644
--- a/app/PdeEditorHeader.java
+++ b/app/PdeEditorHeader.java
@@ -212,8 +212,11 @@ public class PdeEditorHeader extends JComponent /*implements MouseListener*/ {
     for (int i = 0; i < sketch.codeCount; i++) {
       PdeCode code = sketch.code[i];
 
+      String codeName = (code.flavor == PdeSketch.PDE) ? 
+        code.name : code.file.getName();
+
       // if modified, add the li'l glyph next to the name
-      String text = "  " + code.name + (code.modified ? " \u00A7" : "  ");
+      String text = "  " + codeName + (code.modified ? " \u00A7" : "  ");
       //System.out.println("code " + i + " " + text);
 
       int textWidth = metrics.stringWidth(text);
diff --git a/app/PdePreferences.java b/app/PdePreferences.java
index cbbf545eb..39d1efbed 100644
--- a/app/PdePreferences.java
+++ b/app/PdePreferences.java
@@ -54,6 +54,10 @@ import javax.swing.undo.*;
  */
 public class PdePreferences extends JComponent {
 
+  // what to call the feller
+
+  static final String PREFS_FILE = "Processing Preferences.txt";
+
   // prompt text stuff
 
   static final String PROMPT_YES     = "Yes";
@@ -140,7 +144,7 @@ public class PdePreferences extends JComponent {
     // next load user preferences file
 
     File home = new File(System.getProperty("user.home"));
-    preferencesFile = new File(home, ".processing");
+    preferencesFile = new File(home, PREFS_FILE);
 
     if (!preferencesFile.exists()) {
       // create a new preferences file if none exists
diff --git a/todo.txt b/todo.txt
index dfd48936e..08851f4af 100644
--- a/todo.txt
+++ b/todo.txt
@@ -98,6 +98,7 @@ X export is badly broken, fix it.. file names were backwards
 X if 'applet.html' is in sketch folder, use that as the template
 X   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1083935144
 X   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1082124454;start=0
+X   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1074240197;start=0
 X get the console working again
 X   appendText is disabled due to NullPointerEx on startup
 X empty the console when a new sketch is opened
@@ -187,16 +188,14 @@ o   after using the popup menu once, it stops working
 X jikes errors are missing newline/linefeed ?
 o using run-expert.bat on 62 causes NullPointerException weirdness (?)
 
-_ bring this up for discussion on the board
-_   will splitting actually help.. can jars come from multiple places?
-_ add .java to file name in the tab
+040707 wednesday morning and early afternoon
+X bring this up for discussion on the board
+X   will splitting actually help.. can jars come from multiple places?
+X spend a bunch of time tracking down more issues on the board
+X add .java to file name in the tab
+
+_ api name changes for imaging functions
 _ change name of prefs to Processing Preferences.txt
-_ implement horizontal version of PdeEditorButtons
-o   is PdeEditorHeader one pixel too tall?
-_ write export-to-application
-_ write export-to-library
-_   need to be able to produce the serial, video, etc libs
-_   see if sonia project can compile
 _ put bagel into its own package
 _   processing.app -> PdeBase, PdeEditor..
 _   processing.core -> PApplet, PGraphics, PLine, PTriangle, PPolygon
@@ -208,6 +207,16 @@ _   otherwise old prefs and new p5 will cause trouble
 _ api for file-based renderers
 _   size(0, 0) and then ai.size(10000, 20000)
 _   saveFrame(PRenderer) or saveFrame("name", PRenderer)
+_ make dynamically loaded plugins and "tools" menu
+_   break out beautify as its own plugin
+
+_ write export-to-application
+_ write export-to-library
+_   need to be able to produce the serial, video, etc libs
+_   see if sonia project can compile
+_ implement horizontal version of PdeEditorButtons
+_   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1076707944
+o   is PdeEditorHeader one pixel too tall?
 
 medium
 _ menu option for Renderer > to "Core" or "OpenGL"
@@ -233,6 +242,7 @@ _   what to do about anti-aliasing.. oversample 2x?
 
 waiting
 _ don't force everything into a single .jar on export
+_   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1067360903;start=0
 _ need showError/Message/Warning design from casey
 _   then implement new design (with exception trace)
 
@@ -252,6 +262,7 @@ _ texture mapping bugs in graphics engine
 1 _   java3d classes for vec3f and matrix
 
 2 _ comments -> embedding in applet text? (ala javadoc)
+2 _   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1076967353
 2 _   would this help casey with the examples?
 2 _ physics library
 2 _   look at the 'havoc' physics library
@@ -389,6 +400,7 @@ _ only first 20 entries visible?
 _ get code from revisionist in there
 _ zlib file becoming corrupt (not flushed after close?)
 _   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1080346981;start=0
+_   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1088333655;start=0
 
 
 licensing
@@ -541,6 +553,8 @@ PDE / Details
    1 _   ignores colons for case statements
    1 _   need to tie this to the parser instead
    1 _ do a better job of maintaining cursor during beautify 
+   1 _ only beautify a particular section of code
+   1 _   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_Software;action=display;num=1087227217
 
    1 _ find/replace
    1 _   add support for hitting 'ESC'