diff --git a/processing/core/PSound.java b/processing/core/PSound.java
index a7d16d419..0c25af8d5 100755
--- a/processing/core/PSound.java
+++ b/processing/core/PSound.java
@@ -39,6 +39,9 @@ public class PSound {
   PApplet applet;
 
 
+  public PSound() { }  // for subclass
+
+
   public PSound(PApplet applet, InputStream input) {
     this.applet = applet;
 
diff --git a/processing/core/PSound2.java b/processing/core/PSound2.java
index be1095cf2..637a2230e 100755
--- a/processing/core/PSound2.java
+++ b/processing/core/PSound2.java
@@ -37,7 +37,9 @@ import javax.sound.sampled.*;
 
 public class PSound2 extends PSound {
   PApplet applet;
+
   Clip clip;
+  FloatControl gainControl;
 
 
   public PSound2(PApplet applet, InputStream input) {
@@ -47,6 +49,8 @@ public class PSound2 extends PSound {
       AudioInputStream stream =
         AudioSystem.getAudioInputStream(input);
 
+      // *** this code appears as though it may just be faulty ***
+
       // At present, ALAW and ULAW encodings must be converted
       // to PCM_SIGNED before it can be played
       AudioFormat format = stream.getFormat();
@@ -59,6 +63,8 @@ public class PSound2 extends PSound {
                                  format.getFrameRate(),
                                  true);  // big endian
         stream = AudioSystem.getAudioInputStream(format, stream);
+        //} else {
+        //System.out.println("no conversion necessary");
       }
 
       int frameLength = (int) stream.getFrameLength();
@@ -67,7 +73,11 @@ public class PSound2 extends PSound {
         new DataLine.Info(Clip.class, stream.getFormat(),
                           frameLength * frameSize);
 
-      Clip clip = (Clip) AudioSystem.getLine(info);
+      clip = (Clip) AudioSystem.getLine(info);
+
+      // seems that you can't make more than one of these
+      gainControl =
+        (FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN);
 
       // This method does not return until completely loaded
       clip.open(stream);
@@ -83,6 +93,8 @@ public class PSound2 extends PSound {
         });
       */
 
+      applet.registerDispose(this);
+
     } catch (Exception e) {
       error("<init>", e);
     }
@@ -126,11 +138,24 @@ public class PSound2 extends PSound {
    * Stops the audio and rewinds to the beginning.
    */
   public void stop() {
+    // clip may become null in the midst of this method
+    //if (clip != null) clip.stop();
+    //if (clip != null) clip.setFramePosition(0);
     clip.stop();
     clip.setFramePosition(0);
   }
 
 
+  /**
+   * This is registered externally so that the host applet
+   * will kill off the playback thread.
+   */
+  public void dispose() {
+    stop();
+    clip = null;
+  }
+
+
   /**
    * current position inside the clip (in seconds, just like video)
    */
@@ -150,10 +175,7 @@ public class PSound2 extends PSound {
 
 
   public void volume(float v) {  // ranges 0..1
-    FloatControl gainControl =
-      (FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN);
-    double gain = .5D;    // number between 0 and 1 (loudest)
-    float dB = (float)(Math.log(gain)/Math.log(10.0)*20.0);
+    float dB = (float)(Math.log(v)/Math.log(10.0)*20.0);
     gainControl.setValue(dB);
   }