diff --git a/build/shared/lib/export/application.exe b/build/shared/lib/export/application.exe
index 66bd38902..43b88f3f2 100755
Binary files a/build/shared/lib/export/application.exe and b/build/shared/lib/export/application.exe differ
diff --git a/build/windows/launcher/application.exe b/build/windows/launcher/application.exe
index 73d16ca72..43b88f3f2 100755
Binary files a/build/windows/launcher/application.exe and b/build/windows/launcher/application.exe differ
diff --git a/build/windows/launcher/processing.exe b/build/windows/launcher/processing.exe
index 37ade8242..77c37b562 100755
Binary files a/build/windows/launcher/processing.exe and b/build/windows/launcher/processing.exe differ
diff --git a/build/windows/make.sh b/build/windows/make.sh
index cbb407334..6165c7ab5 100755
--- a/build/windows/make.sh
+++ b/build/windows/make.sh
@@ -83,25 +83,29 @@ cd ../..
 
 echo Building processing.core
 
-# move to bagel inside base 'processing' directory
-#cd bagel
+# move to core inside base 'processing' directory
 cd core
-rm -f processing/core/*.class
+#rm -f processing/core/*.class
 
-# new regular version
 CLASSPATH="..\\build\\windows\\work\\java\\lib\\rt.jar"
 export CLASSPATH
 
-perl preproc.pl
-../build/windows/work/jikes -d . +D -target 1.1 *.java
+./preproc.pl
+
+../build/windows/work/jikes -d . +D -target 1.1 src/processing/core/*.java
 # use this from time to time to test 1.1 savviness
-#/cygdrive/c/msjdk-4.0/bin/jvc /d . *.java
+#/cygdrive/c/msjdk-4.0/bin/jvc /d . src/processing/core/*.java
+
+# package this folder into core.jar
 zip -rq ../build/windows/work/lib/core.jar processing
 
+#rm -rf processing
 
 # back to base processing dir
 cd ..
 
+exit
+
 ### -- BUILD PREPROC ---------------------------------------------
 
 # i suck at shell scripting
diff --git a/core/.cvsignore b/core/.cvsignore
deleted file mode 100755
index 0c07f9a60..000000000
--- a/core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-processing
diff --git a/core/.svnignore b/core/.svnignore
deleted file mode 100755
index 5241a7220..000000000
--- a/core/.svnignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
\ No newline at end of file
diff --git a/core/preproc.pl b/core/preproc.pl
index a922705fe..f41e6fd00 100755
--- a/core/preproc.pl
+++ b/core/preproc.pl
@@ -1,21 +1,23 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+
+$basedir = 'src/processing/core';
 
 # PGraphics subclasses PImage.. so first get methods from bimage
-open(F, "PImage.java") || die $!;
+open(F, "$basedir/PImage.java") || die $!;
 @contents = <F>;
 close(F);
 
 # next slurp methods from PGraphics
-open(F, "PGraphics.java") || die $!;
+open(F, "$basedir/PGraphics.java") || die $!;
 #@contents = <F>;
 foreach $line (<F>) {
     # can't remember perl right now.. there must be a better way
-    @contents[$#contents++] = $line;
+    $contents[$#contents++] = $line;
 }
 close(F);
 
 
-open(APPLET, "PApplet.java") || die $!;
+open(APPLET, "$basedir/PApplet.java") || die $!;
 @applet = <APPLET>;
 close(APPLET);
 
@@ -23,7 +25,7 @@ close(APPLET);
 $insert = 'public functions for processing.core';
 
 # an improved version of this would only rewrite if changes made
-open(OUT, ">PApplet.new") || die $!;
+open(OUT, ">$basedir/PApplet.new") || die $!;
 foreach $line (@applet) {
     print OUT $line;
     last if ($line =~ /$insert/);
@@ -147,7 +149,7 @@ close(OUT);
 
 $oldguy = join(' ', @applet);
 
-open(NEWGUY, "PApplet.new") || die $!;
+open(NEWGUY, "$basedir/PApplet.new") || die $!;
 @newbie = <NEWGUY>;
 $newguy = join(' ', @newbie);
 close(NEWGUY);