diff --git a/app/AvrdudeUploader.java b/app/AvrdudeUploader.java
index 65e255480..2166d004e 100755
--- a/app/AvrdudeUploader.java
+++ b/app/AvrdudeUploader.java
@@ -65,6 +65,9 @@ public class AvrdudeUploader extends Uploader  {
     if (!Preferences.getBoolean("upload.verify"))
       commandDownloader.add("-V");
     commandDownloader.add("-Uflash:w:" + buildPath + File.separator + className + ".hex:i");
+
+    flushSerialBuffer();
+
     return uisp(commandDownloader);
   }
 
@@ -119,8 +122,6 @@ public class AvrdudeUploader extends Uploader  {
   }
   
   public boolean uisp(Collection params) throws RunnerException {
-    flushSerialBuffer();
-
     List commandDownloader = new ArrayList();
     commandDownloader.add("avrdude");
 
diff --git a/app/Editor.java b/app/Editor.java
index 3002813ee..f1a6a3f59 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -764,16 +764,16 @@ public class Editor extends JFrame
       });
     menu.add(burnBootloader168DiecimilaItem);
     
-    if (!Base.isMacOS()) {
-      burnBootloader168DiecimilaParallelItem =
-        new JMenuItem("Burn Diecimila Bootloader (parallel port)");
-      burnBootloader168DiecimilaParallelItem.addActionListener(new ActionListener() {
-          public void actionPerformed(ActionEvent e) {
-            handleBurnBootloader("atmega168-diecimila", true);
-          }
-        });
-      menu.add(burnBootloader168DiecimilaParallelItem);
-    }
+//    if (!Base.isMacOS()) {
+//      burnBootloader168DiecimilaParallelItem =
+//        new JMenuItem("Burn Diecimila Bootloader (parallel port)");
+//      burnBootloader168DiecimilaParallelItem.addActionListener(new ActionListener() {
+//          public void actionPerformed(ActionEvent e) {
+//            handleBurnBootloader("atmega168-diecimila", true);
+//          }
+//        });
+//      menu.add(burnBootloader168DiecimilaParallelItem);
+//    }
     
     burnBootloader168NGItem = new JMenuItem("Burn NG/Mini Bootloader");
     burnBootloader168NGItem.addActionListener(new ActionListener() {
@@ -783,16 +783,16 @@ public class Editor extends JFrame
       });
     menu.add(burnBootloader168NGItem);
     
-    if (!Base.isMacOS()) {
-      burnBootloader168NGParallelItem =
-        new JMenuItem("Burn NG/Mini Bootloader (parallel port)");
-      burnBootloader168NGParallelItem.addActionListener(new ActionListener() {
-          public void actionPerformed(ActionEvent e) {
-            handleBurnBootloader("atmega168-ng", true);
-          }
-        });
-      menu.add(burnBootloader168NGParallelItem);
-    }
+//    if (!Base.isMacOS()) {
+//      burnBootloader168NGParallelItem =
+//        new JMenuItem("Burn NG/Mini Bootloader (parallel port)");
+//      burnBootloader168NGParallelItem.addActionListener(new ActionListener() {
+//          public void actionPerformed(ActionEvent e) {
+//            handleBurnBootloader("atmega168-ng", true);
+//          }
+//        });
+//      menu.add(burnBootloader168NGParallelItem);
+//    }
     
     showBootloaderMenuItemsForCurrentMCU();
     
diff --git a/app/Sketch.java b/app/Sketch.java
index 4613bfc53..19dab5b9f 100644
--- a/app/Sketch.java
+++ b/app/Sketch.java
@@ -1672,10 +1672,16 @@ public class Sketch {
 
   protected String upload(String buildPath, String suggestedClassName)
     throws RunnerException {
+    
+    Uploader uploader;
 
     // download the program
     //
-    Uploader uploader = new AvrdudeUploader();
+    if ("uisp".equals(Preferences.get("upload.application"))) {
+      uploader = new UispUploader();
+    } else {
+      uploader = new AvrdudeUploader();
+    }
     // macos9 now officially broken.. see PdeCompilerJavac
     //PdeCompiler compiler =
     //  ((PdeBase.platform == PdeBase.MACOS9) ?
diff --git a/app/UispUploader.java b/app/UispUploader.java
index d26064715..fbd2d1ae6 100755
--- a/app/UispUploader.java
+++ b/app/UispUploader.java
@@ -69,6 +69,9 @@ public class UispUploader extends Uploader  {
     if (Preferences.getBoolean("upload.verify"))
       commandDownloader.add("--verify");
     commandDownloader.add("if=" + buildPath + File.separator + className + ".hex");
+    
+    flushSerialBuffer();
+
     return uisp(commandDownloader);
   }
 
@@ -120,8 +123,6 @@ public class UispUploader extends Uploader  {
   }
   
   public boolean uisp(Collection params) throws RunnerException {
-      flushSerialBuffer();
-
       List commandDownloader = new ArrayList();
       commandDownloader.add("uisp");
       if (Preferences.getBoolean("upload.verbose"))