diff --git a/controlsSetup.pde b/controlsSetup.pde
index 8295b5e..0e77554 100644
--- a/controlsSetup.pde
+++ b/controlsSetup.pde
@@ -1076,9 +1076,9 @@ Set<String> buildControlNames()
 //  result.add(MODE_STOP_SWIRLING);
 //  result.add(MODE_START_MARKING);
 //  result.add(MODE_STOP_MARKING);
-  result.add(MODE_START_SPRITE);
-  result.add(MODE_START_RANDOM_SPRITES);
-  result.add(MODE_STOP_RANDOM_SPRITES);
+//  result.add(MODE_START_SPRITE);
+//  result.add(MODE_START_RANDOM_SPRITES);
+//  result.add(MODE_STOP_RANDOM_SPRITES);
   result.add(MODE_DRAW_NORWEGIAN_DIALOG);
   
   result.add(MODE_LIVE_BLUR_VALUE);
diff --git a/gamepad.pde b/gamepad.pde
deleted file mode 100644
index c288673..0000000
--- a/gamepad.pde
+++ /dev/null
@@ -1,234 +0,0 @@
-//ControllIO controllIO;
-//ControllDevice joypad;
-//
-//ControllButton buttonA;
-//ControllButton buttonB;
-//ControllButton buttonX;
-//ControllButton buttonY;
-//ControllButton buttonL;
-//ControllButton buttonR;
-//ControllButton buttonStart;
-//
-//ControllCoolieHat dpad;
-//
-//List<String> devices = new ArrayList<String>(
-//  Arrays.asList("Controller (Xbox 360 Wireless Receiver for Windows)", 
-//                "Controller (XBOX 360 For Windows)"));
-//
-//String signalFromGamepad = null;
-//
-//static final String BUTTON_A_RELEASED = "ButtonAReleased";
-//static final String BUTTON_B_RELEASED = "ButtonBReleased";
-//static final String BUTTON_L_RELEASED = "ButtonLReleased";
-//static final String BUTTON_R_RELEASED = "ButtonRReleased";
-//static final String BUTTON_START_RELEASED = "ButtonStartReleased";
-//
-//void gamepad_init()
-//{
-//  controllIO = ControllIO.getInstance(this);
-//
-//  try
-//  {
-//    controllIO.printDevices();
-//    for (int i = 0; i<devices.size(); i++)
-//    {
-//      try
-//      {
-//        println("trying " + i + ": " + devices.get(i));
-//        joypad = controllIO.getDevice(devices.get(i));
-//        break;
-//      }
-//      catch (RuntimeException e)
-//      {
-//        println("Requested device (" + devices.get(i) + ") not found.");
-//        joypad = null;
-//      }   
-//    }
-//    
-//    if (joypad != null)
-//    {
-//      joypad.printButtons();
-//    
-//      buttonA = joypad.getButton("Button 0");
-//      buttonB = joypad.getButton("Button 1");
-//      buttonX = joypad.getButton("Button 2");
-//      buttonY = joypad.getButton("Button 3");
-//      
-//      buttonL = joypad.getButton("Button 4");
-//      buttonR = joypad.getButton("Button 5");
-//      
-//      buttonStart = joypad.getButton("Button 7");
-//      
-//      buttonA.plug(this, "buttonARelease", ControllIO.ON_RELEASE);
-//      buttonB.plug(this, "buttonBRelease", ControllIO.ON_RELEASE);
-//      buttonX.plug(this, "buttonXPress", ControllIO.ON_PRESS);
-//      buttonX.plug(this, "buttonXRelease", ControllIO.ON_RELEASE);
-//      buttonY.plug(this, "buttonYRelease", ControllIO.ON_RELEASE);
-//      
-//      buttonL.plug(this, "buttonLRelease", ControllIO.ON_RELEASE);
-//      buttonR.plug(this, "buttonRRelease", ControllIO.ON_RELEASE);
-//      
-//      buttonStart.plug(this, "buttonStartRelease", ControllIO.ON_RELEASE);
-//      
-//      dpad = joypad.getCoolieHat(10);
-//      dpad.setMultiplier(4);
-//      dpad.plug(this, "dpadPress", ControllIO.ON_PRESS);
-//    }
-//  }
-//  catch (RuntimeException e)
-//  {
-//    println("Exception occurred while initialising gamepad: " + e.getMessage());
-//  }
-//}
-//
-//public void buttonARelease()
-//{
-//  signalFromGamepad = BUTTON_A_RELEASED;
-//}
-//public void buttonBRelease()
-//{
-//  signalFromGamepad = BUTTON_B_RELEASED;
-//}
-//public void buttonLRelease()
-//{
-//  signalFromGamepad = BUTTON_L_RELEASED;
-//}
-//public void buttonRRelease()
-//{
-//  signalFromGamepad = BUTTON_R_RELEASED;
-//}
-//public void buttonStartRelease()
-//{
-//  signalFromGamepad = BUTTON_START_RELEASED;
-//}
-//
-//void buttonXPress()
-//{
-//  drawingLiveVideo = true;
-//}
-//void buttonXRelease()
-//{
-//  drawingLiveVideo = false;
-//}
-//void buttonYRelease()
-//{
-//  flipWebcamImage = !flipWebcamImage;
-//}
-//
-//void dpadPress(float x, float y)
-//{
-//  float val = dpad.getValue();
-//  if (val == 6.0)
-//  {
-//    liveSimplification--;
-//    if (liveSimplification < LIVE_SIMPLIFICATION_MIN)
-//      liveSimplification = LIVE_SIMPLIFICATION_MIN;
-//  }
-//  else if (val == 2.0)
-//  {
-//    liveSimplification++;
-//    if (liveSimplification > LIVE_SIMPLIFICATION_MAX)
-//      liveSimplification = LIVE_SIMPLIFICATION_MAX;
-//  }
-//  if (val == 8.0) // left
-//  {
-//    pathLengthHighPassCutoff--;
-//    if (pathLengthHighPassCutoff < PATH_LENGTH_HIGHPASS_CUTOFF_MIN)
-//      pathLengthHighPassCutoff = PATH_LENGTH_HIGHPASS_CUTOFF_MIN;
-//  }
-//  else if (val == 4.0) // right
-//  {
-//    pathLengthHighPassCutoff++;
-//    if (pathLengthHighPassCutoff > PATH_LENGTH_HIGHPASS_CUTOFF_MAX)
-//      pathLengthHighPassCutoff = PATH_LENGTH_HIGHPASS_CUTOFF_MAX;
-//  }
-//
-//  Numberbox n = (Numberbox) getAllControls().get(MODE_LIVE_SIMPLIFICATION_VALUE);
-//  n.setValue(liveSimplification);
-//  n.update();
-//
-//  n = (Numberbox) getAllControls().get(MODE_VECTOR_PATH_LENGTH_HIGHPASS_CUTOFF);
-//  n.setValue(pathLengthHighPassCutoff);
-//  n.update();
-//
-//}
-//
-//void processGamepadInput()
-//{
-//  if (signalFromGamepad != null)
-//  {
-//    println("Signal from gamepad:  " + signalFromGamepad);
-//    if (signalFromGamepad == BUTTON_A_RELEASED)
-//    {
-//      if (captureShape == null && !confirmedDraw)
-//        button_mode_liveCaptureFromLive(); 
-//      else if (captureShape != null && !confirmedDraw)
-//        button_mode_liveClearCapture();
-//      else if (captureShape != null && confirmedDraw)
-//      {
-//        button_mode_liveClearCapture();
-//        button_mode_clearQueue();
-//        confirmedDraw = false;
-//      }
-//    }
-//    else if (signalFromGamepad == BUTTON_B_RELEASED)
-//    {
-//      if (captureShape != null && !confirmedDraw)
-//        button_mode_liveConfirmDraw();
-//    }
-//    else if (signalFromGamepad == BUTTON_L_RELEASED)
-//    {
-//      commandQueueRunning = !commandQueueRunning;
-//    }
-//    else if (signalFromGamepad == BUTTON_R_RELEASED)
-//    {
-//    }
-//    else if (signalFromGamepad == BUTTON_START_RELEASED)
-//    {
-//      preLoadCommandQueue();
-//      button_mode_setPositionHome();
-//    }
-//    
-//      
-//    // clear the signal  
-//    signalFromGamepad = null;
-//  }
-//  
-//}
-
-//void displayGamepadOverlay()
-//{
-//  textSize(40);
-//  fill(255);
-//  
-//  if (captureShape == null)
-//  {
-//    image(aButtonImage, width-400, height-180, 128, 128);
-//    text("SNAP!", width-400, height-200);
-//
-//    textSize(30);
-//    image(dpadYImage, width-600, height-180, 128, 128);
-//    text("Simplify", width-600, height-200);
-//
-//    image(dpadXImage, width-600, height-400, 128, 128);
-//    text("Filter short paths", width-600, height-420);
-//  }
-//  else
-//  {
-//    if (confirmedDraw)
-//    {
-//      image(aButtonImage, width-400, height-180, 128, 128);
-//      text("CANCEL!", width-385, height-200);
-//    }
-//    else
-//    {
-//      image(aButtonImage, width-400, height-180, 128, 128);
-//      text("BACK", width-400, height-200);
-//      image(bButtonImage, width-190, height-180, 128, 128);
-//      text("DRAW!", width-180, height-200);
-//    }
-//  }
-//  
-//  
-//  textSize(12);
-//}
diff --git a/polargraphcontroller.pde b/polargraphcontroller.pde
index cca1874..a7aeeb2 100644
--- a/polargraphcontroller.pde
+++ b/polargraphcontroller.pde
@@ -55,7 +55,7 @@ import java.lang.reflect.Method;
 
 int majorVersionNo = 2;
 int minorVersionNo = 0;
-int buildNo = 0;
+int buildNo = 3;
 
 String programTitle = "Polargraph Controller v" + majorVersionNo + "." + minorVersionNo + " build " + buildNo;
 ControlP5 cp5;
@@ -539,7 +539,10 @@ void setup()
   }
   loadFromPropertiesFile();
   
-  size(windowWidth, windowHeight, JAVA2D );
+//  size(400, 400, JAVA2D );
+//  surface.setResizable(true);
+//  surface.setSize(windowWidth, windowHeight);
+  size(windowWidth, windowHeight, JAVA2D);
   this.cp5 = new ControlP5(this);
   initTabs();
 
@@ -589,7 +592,6 @@ void setup()
 
   addEventListeners();
 
-  //gamepad_init();
   frameRate(8);
 }
 void addEventListeners()
@@ -604,7 +606,8 @@ void addEventListeners()
         }
       }
     }
-  ); 
+  );
+  
   addMouseWheelListener(new java.awt.event.MouseWheelListener() 
     { 
       public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) 
@@ -3096,25 +3099,6 @@ void initLogging()
   }
 }
 
-void initImages()
-{
-//  try
-//  {
-//    yButtonImage = loadImage("y.png");
-//    xButtonImage = loadImage("x.png");
-//    aButtonImage = loadImage("a.png");
-//    bButtonImage = loadImage("b.png");
-//    dpadXImage = loadImage("dpadlr.png");
-//    dpadYImage = loadImage("dpadud.png");
-//  }
-//  catch (Exception e)
-//  {
-//    yButtonImage = makeColourImage(64,64,color(180,180,0));
-//    xButtonImage = makeColourImage(64,64,color(0,0,180));
-//    aButtonImage = makeColourImage(64,64,color(0,180,0));
-//    bButtonImage = makeColourImage(64,64,color(180,0,0));
-//  }
-}
 
 PImage makeColourImage(int w, int h, int colour)
 {