diff --git a/build/build.xml b/build/build.xml
index 936380e63..35a950f38 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -1022,6 +1022,11 @@
 
     <javadoc access="public" author="false" classpath="../core/library/jogl-all.jar:../core/bin:../core/library/gluegen-rt.jar" destdir="javadoc/core" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="false" use="false" version="false">
 
+      <!-- provide links for java.* classes. 
+	   also suppresses the java.lang prefix in the text.  --> 
+      <link href="http://docs.oracle.com/javase/7/docs/api/" />
+
+      <!-- prevent files from always appearing to have changed -->
       <arg value="-notimestamp" />
 
       <packageset dir="../core/src">
@@ -1042,9 +1047,11 @@
       <arg line="everything -type f -exec rm -rf {} ';'" />
     </exec>
 
-    <javadoc access="public" author="false" classpath="../java/libraries/video/library/jna.jar:../java/libraries/serial/bin:lib/antlr.jar:../core/library/jogl-all.jar:../java/libraries/video/bin:lib/apple.jar:lib/jna.jar:lib/ant-launcher.jar:../java/libraries/pdf/bin:lib/ant.jar:../core/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/video/library/gstreamer-java.jar:lib/org-netbeans-swing-outline.jar:../java/libraries/dxf/bin:bin:../java/libraries/net/bin:../java/libraries/serial/library/RXTXcomm.jar:../core/library/gluegen-rt.jar:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="false" use="false" version="false">
+    <javadoc access="public" author="false" classpath="../java/libraries/video/library/jna.jar:../java/libraries/serial/bin:lib/antlr.jar:../core/library/jogl-all.jar:../java/libraries/video/bin:lib/apple.jar:lib/jna.jar:lib/ant-launcher.jar:../java/libraries/pdf/bin:lib/ant.jar:../core/bin:../java/libraries/pdf/library/itext.jar:../java/libraries/video/library/gstreamer-java.jar:lib/org-netbeans-swing-outline.jar:../java/libraries/dxf/bin:bin:../java/libraries/net/bin:../java/libraries/serial/library/RXTXcomm.jar:../core/library/gluegen-rt.jar:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="false" use="false" version="false" noqualifier="all">
 
       <arg value="-notimestamp" />
+
+      <link href="http://docs.oracle.com/javase/7/docs/api/" />
       
       <packageset dir="../app/src">
 	<include name="antlr/**" />
diff --git a/build/javadoc/everything/package-list b/build/javadoc/everything/package-list
index 324f2b779..cd4505a9e 100644
--- a/build/javadoc/everything/package-list
+++ b/build/javadoc/everything/package-list
@@ -3,12 +3,10 @@ japplemenubar
 processing.app
 processing.app.contrib
 processing.app.exec
-processing.app.linux
-processing.app.macosx
+processing.app.platform
 processing.app.syntax
 processing.app.syntax.im
 processing.app.tools
-processing.app.windows
 processing.core
 processing.data
 processing.event
diff --git a/build/javadoc/stylesheet.css b/build/javadoc/stylesheet.css
deleted file mode 100644
index 88654c77d..000000000
--- a/build/javadoc/stylesheet.css
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 120% }
-
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCCC } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEEE } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* 
- * /* Font used in left-hand frame lists */
- * .FrameTitleFont   { font-size: 90%; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif }
- * .FrameHeadingFont { font-size:  90%; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif }
- * .FrameItemFont    { font-size:  90%; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif }
- */
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEEE;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-
-.NavBarFont1    { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
-
-
-/*
- * Processing - Styling
- *
- * fjenett - mail@florianjenett.de - 2005.08.14
- * Updated by REAS 2011.09.02
- *
- */
-
-
-/* first let's restyle what's there .. */
-
-/* Table colors */
-.TableHeadingColor     { 
-	background: #CCCCCC;
-	color: #5A5A5A;
- }
-.TableSubHeadingColor  { background: #EEEEEE } /* Gray */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { 
-	font-size: 1.0em;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif 
-}
-.FrameHeadingFont {
-	font-size: 1.0em;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color: #5A5A5A;
-}
-.FrameItemFont    {
-	font-size: 1.0em;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif 
-}
-
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#CCCCCC;} /* Light */
-.NavBarCell1Rev { background-color:#5A5A5A;} /* Dark */
-
-.NavBarFont1    {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color:#5A5A5A;
-}
-.NavBarFont1Rev {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color:#FFFFFF;
-}
-
-.NavBarCell2    { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
-
-/* try to style some more ... */
-
-body,
-html
-{
-	font-size: small;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-	
-h1, h2, h3, h4, h5, h6 {
-
-	color: #5A5A5A; 
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; 
-	font-weight: normal;
-	line-height: normal;
-}
-
-h1, h2, h3, h4 {
-	word-spacing: 0.2em;
-	font-weight: bold;
-}
-
-h4, h5, h6 {
-	font-weight: bold; 
-}
-/* Font Sizes */
-h1 { font-size: 1.5em; }
-h2 { font-size: 1.4em; }
-h3 { font-size: 1.3em; }
-h4 { font-size: 1.2em; }
-h5 { font-size: 1.1em; }
-h6 { font-size: 1em; }
-p { font-size: 1em; }
-
-dl, dd, dt,
-dt > b
-{
-	color: #666666;
-	font-size: 1.0em;
-}
-
-code,
-pre
-{
-	font-size: 1.2em;
-	color:#333333;
-}
-
-pre
-{
-	font-size: 1.2em;
-}
-
-
-/* force the table-headers small .. */
-b
-{
-	font-size: small;
-}
-
-
-tr,
-td
-{
-	border-top: 0px solid;
-	border-left: 0px solid;
-	border-color: #999999;
-}
-
-table
-{
-	border: 0px;
-}
-
-img
-{
-	border: 0px solid #000000;
-}
-
-a {
-	text-decoration: underline;
-	font-weight: normal;
-	color: #3399CC;
-}
-
-a:hover
-a:active {
-	text-decoration: underline;
-	font-weight: normal;
-	color: #3399CC;
-}
-
-a:visited,
-a:link:visited {
-	text-decoration: underline;
-	font-weight: normal;
-	color: #3399CC;
-}
\ No newline at end of file
diff --git a/core/todo.txt b/core/todo.txt
index f5891d7f2..187a6ccc1 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -5,12 +5,11 @@ X   https://github.com/processing/processing/pull/2072
 X add desktopPath() and desktopFile() methods for testing
 X screen stops updating sometimes with retina
 X   https://github.com/processing/processing/issues/1699
-
-_ Unicode NLF causing problems in XML files
-_   https://github.com/processing/processing/issues/2100
-_   not handled by BufferedReader (or XML parser)
-_   http://stackoverflow.com/questions/10556875/list-of-unicode-characters-that-should-be-filtered-in-output
-_   http://stackoverflow.com/questions/3072152/what-is-unicode-character-2028-ls-line-separator-used-for
+X Unicode NLF causing problems in XML files
+X   https://github.com/processing/processing/issues/2100
+X   not handled by BufferedReader (or XML parser)
+X   http://stackoverflow.com/questions/10556875/list-of-unicode-characters-that-should-be-filtered-in-output
+X   http://stackoverflow.com/questions/3072152/what-is-unicode-character-2028-ls-line-separator-used-for
 
 _ Sort out blending differences with P2D/P3D
 _   https://github.com/processing/processing/issues/1844
diff --git a/todo.txt b/todo.txt
index b5b17f66d..dc2fd832a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -52,6 +52,9 @@ X   add MinimumSystemVersion for 10.7.3
 X   https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/20001431-113253
 X copy GenericDocumentIcon.icns for placeholder icon
 X   from /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
+X the javadoc includes java.io.* and java.lang.* prefixes.. why?
+X   re-run and and check in
+X   upload javadoc updates
 _ remove JAVA_HOME requirement from build.xml
 _   what's needed on OS X? just the JDK 7u40?