diff --git a/app/Editor.java b/app/Editor.java
index 45e4e7f5e..48ae36f34 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -103,7 +103,7 @@ public class Editor extends JFrame
   RunButtonWatcher watcher;
   Runner runtime;
 
-  JMenuItem exportAppItem;
+  //JMenuItem exportAppItem;
   JMenuItem saveMenuItem;
   JMenuItem saveAsMenuItem;
   
@@ -496,13 +496,13 @@ public class Editor extends JFrame
       });
     menu.add(item);
 
-    exportAppItem = newJMenuItem("Export Application", 'E', true);
-    exportAppItem.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          handleExportApp();
-        }
-      });
-    menu.add(exportAppItem);
+//    exportAppItem = newJMenuItem("Export Application", 'E', true);
+//    exportAppItem.addActionListener(new ActionListener() {
+//        public void actionPerformed(ActionEvent e) {
+//          handleExportApp();
+//        }
+//      });
+//    menu.add(exportAppItem);
 
     menu.addSeparator();
 
@@ -774,15 +774,15 @@ public class Editor extends JFrame
     JMenu menu = new JMenu("Help");
     JMenuItem item;
 
-    item = new JMenuItem("Environment");
-    item.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          Base.openURL(System.getProperty("user.dir") + File.separator +
-                          "reference" + File.separator + "environment" +
-                          File.separator + "index.html");
-        }
-      });
-    menu.add(item);
+//    item = new JMenuItem("Environment");
+//    item.addActionListener(new ActionListener() {
+//        public void actionPerformed(ActionEvent e) {
+//          Base.openURL(System.getProperty("user.dir") + File.separator +
+//                          "reference" + File.separator + "environment" +
+//                          File.separator + "index.html");
+//        }
+//      });
+//    menu.add(item);
 
     item = new JMenuItem("Reference");
     item.addActionListener(new ActionListener() {
@@ -1653,7 +1653,7 @@ public class Editor extends JFrame
 
       sketch = new Sketch(this, path);
       // TODO re-enable this once export application works
-      exportAppItem.setEnabled(false);
+      //exportAppItem.setEnabled(false);
       //exportAppItem.setEnabled(false && !sketch.isLibrary());
       //buttons.disableRun(sketch.isLibrary());
       header.rebuild();
diff --git a/build/macosx/Arduino.xcodeproj/project.pbxproj b/build/macosx/Arduino.xcodeproj/project.pbxproj
index 15c7b94ca..f06c12244 100644
--- a/build/macosx/Arduino.xcodeproj/project.pbxproj
+++ b/build/macosx/Arduino.xcodeproj/project.pbxproj
@@ -128,6 +128,9 @@
 
 /* Begin PBXBuildFile section */
 		330B21540968180400345666 /* librxtxSerial.jnilib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 330B21530968180400345666 /* librxtxSerial.jnilib */; };
+		339514EE097AEB5900193C89 /* STDCTokenTypes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 33FFFE420965BD110016AC38 /* STDCTokenTypes.txt */; };
+		339514FA097AEB8000193C89 /* license.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FF02B60965BD170016AC38 /* license.txt */; };
+		339514FB097AEB8000193C89 /* readme.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FF02B70965BD170016AC38 /* readme.txt */; };
 		33AF61760965C54B00B514A9 /* PreprocessorInfoChannel.java in Sources */ = {isa = PBXBuildFile; fileRef = 33FFFE3D0965BD110016AC38 /* PreprocessorInfoChannel.java */; };
 		33AF61770965C54B00B514A9 /* EditorListener.java in Sources */ = {isa = PBXBuildFile; fileRef = 33FFFE2C0965BD110016AC38 /* EditorListener.java */; };
 		33AF61780965C54B00B514A9 /* LineObject.java in Sources */ = {isa = PBXBuildFile; fileRef = 33FFFE3A0965BD110016AC38 /* LineObject.java */; };
@@ -196,7 +199,6 @@
 		33CF03CE09662DC000F2C9A9 /* antlr.jar in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33AF620A0965D67800B514A9 /* antlr.jar */; settings = {JAVA_ARCHIVE_SUBDIR = ../shared/lib; }; };
 		33CF03CF09662DC000F2C9A9 /* registry.jar in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33AF620E0965D67A00B514A9 /* registry.jar */; settings = {JAVA_ARCHIVE_SUBDIR = ../shared/lib; }; };
 		33CF03D009662DC000F2C9A9 /* oro.jar in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33AF620D0965D67900B514A9 /* oro.jar */; settings = {JAVA_ARCHIVE_SUBDIR = ../shared/lib; }; };
-		33FF07020965BEE60016AC38 /* jikes in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FFFEB60965BD110016AC38 /* jikes */; };
 		33FF07050965BEE60016AC38 /* macosx_setup.command in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FFFEB90965BD110016AC38 /* macosx_setup.command */; };
 		33FF07100965BF8A0016AC38 /* burn.command in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FFFEAF0965BD110016AC38 /* burn.command */; };
 		33FF07150965BFC10016AC38 /* FTDIUSBSerialDriver_v2_0_1.dmg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 33FFFEB30965BD110016AC38 /* FTDIUSBSerialDriver_v2_0_1.dmg */; };
@@ -317,7 +319,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 16;
 			files = (
-				33FF07020965BEE60016AC38 /* jikes in CopyFiles */,
+				339514FA097AEB8000193C89 /* license.txt in CopyFiles */,
+				339514FB097AEB8000193C89 /* readme.txt in CopyFiles */,
 				33FF07050965BEE60016AC38 /* macosx_setup.command in CopyFiles */,
 				330B21540968180400345666 /* librxtxSerial.jnilib in CopyFiles */,
 			);
@@ -986,6 +989,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				33CF03B209662CB700F2C9A9 /* arduino.icns in Resources */,
+				339514EE097AEB5900193C89 /* STDCTokenTypes.txt in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/readme.txt b/readme.txt
index 725ec5444..1209c134a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,11 +1,12 @@
 Arduino is an open-source Physical Computing platform based on a simple
 i/o board and a development environment that implements the Processing/Wiring
-language.
+language.  Arduino can be used to develop stand-alone interactive objects or
+can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
 
 Arduino is an open source project, owned by nobody and supported by many.
 
 For more information, see the website at: http://arduino.berlios.de/ or the
-forums at arduino.berlios.de/cgi-bin/yabb/YaBB.cgi
+forums at http://arduino.berlios.de/cgi-bin/yabb/YaBB.cgi
 
 The Team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
 David A. Mellis and Nicholas Zambetti.
@@ -22,24 +23,36 @@ from Processing and Wiring.
 UPDATES
 
 0003
-millis() now updates every millisecond instead of every second.
-Keyspan and FTDI USB drivers included with Mac and Windows distributions.
-Bootloader included with Windows distribution (it was already in the Mac dist).
+
+API Changes
 Reversed the analog input pins to correspond to newer boards.  This means
 a call, for example, to analogRead(0) must be changed to analogRead(5) in
 order to read the same physical pin.
-Now flushing the serial port before uploading (should fix some errors).
-Added a printNewline() function.
-Updated icon of the Windows executable.
-Improved accuracy of the delayMicroseconds() function.
+Added a printNewline() function (which sends '\n' = ASCII 10).
+
+New Stuff
+Reference is included (features native to C not yet documented).
+Serial monitor added (click the toolbar button to turn it on or off).  Baud
+rate is controlled by the Serial Monitor Baud Rate Menu, defaults to 9600.  Icon
+and implementation from Wiring.
+Serial port menu now automatically refreshes when opened.
 New blue color scheme and icons courtesy of Noah Shibley (colors are hardcoded
 into the source to ensure consistency with image files).
-Serial monitor added (click the toolbar button to turn it on or off).  Baud
-rate is controlled by the serial.debug_rate field in preferences.txt, defaults
-to 9600.  Icon and implementation from Wiring.
-Serial port menu now automatically refreshes when opened.
+Keyspan and FTDI USB drivers included with Mac and Windows distributions.
+
+Bug Fixes
+millis() now updates every millisecond instead of every second.
+Bootloader included with Windows distribution (it was already in the Mac dist).
+Updated icon of the Windows executable.
+Now flushing the serial port before uploading (should fix some errors).
+Improved accuracy of the delayMicroseconds() function.
+
+Other
+Upload rate no longer selectable from a menu within the IDE.  Instead, edit the
+serial.download_rate item in the preferences.txt file.
 Created Xcode project for building Arduino on the Mac (doesn't yet regenerate
 the grammar files or package the distribution); active target should be "App".
+Removed unused or unimplemented items from menus.
 
 0002 - 2005.10.05
 New build process no longer uses makefiles; now controlled by preferences.txt.