diff --git a/piston.tidal b/piston.tidal
index fc2bb2d..4ac4100 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -189,65 +189,10 @@ d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:
 piston 2.a
 -}
 
-solo $ d8 $ slow 8 $ chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
-   |+| speed "0.2"
-   |+| vowel "e"
-
-d4 $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
-
-d2 $ sound "[wt(5,8)]/4"
-
-d1 $ (0.5 <~) $ stack [
-   whenmod 9 2 (0.25 <~) $ sound "~ k",
-   (0.75 ~>) $ sound "[~ sn]/2"
-]
-
-d9 $ (0.25 ~>) $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
-
-mapM_ ($ silence) [d4,d8]
-
-d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-
-d3 $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-
-d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
-   |+| cut "1"
-   |+| cutoff "0.01"
-   |+| resonance ((/3) <$> slow 4 saw1)
-   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
-
-d1 $ (0.5 <~) $ stack [
-   whenmod 4 3 (density 1.5) $ whenmod 9 2 ((0.25 <~)) $ sound "~ k",
-   whenmod 10 5 (superimpose (0.25 ~>)) $ (0.75 ~>) $ sound "[~ sn]/2"
-]
-
-d4 $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
-
-d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
-   |+| cutoff "0.02"
-   |+| resonance "0.001"
-   |+| speed "0.7"
-
-mapM_ ($ silence) [d1,d3,d4,d9]
-
-{-
-piston 2.b
--}
-
 d1 $ sound "{[~ ~ ~ k:1], [~ sn]/2}"
 
-mapM_ ($ silence) [d2,d7]
+mapM_ ($ silence) [d2,d3]
+mapM_ ($ silence) [d6,d8]
 
 d2 $ sound "~ wt wt wtsn/8"
    |+| shape ((/2) <$> density 1.2 saw1)
@@ -336,32 +281,91 @@ d3 $ (|+| gain ((*0.7) <$> saw1)) $ every 2 (density 2) $ whenmod 3 2 (density 1
 
 mapM_ ($ silence) [d1,d5]
 
+{-
+piston 2.b
+-}
+
+d4 $ (0.25 <~) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
+   |+| speed ((+1.3) <$> density 1.7 sinewave1)
+   |+| gain "0.8"
+
+d2 $ sound "[wt(5,8)]/4"
+
+d1 $ (0.5 <~) $ stack [
+   whenmod 9 2 (0.25 <~) $ sound "~ k",
+   (0.75 ~>) $ sound "[~ sn]/2"
+]
+
+d9 $ (0.25 ~>) $ sound "[~ ~ ~ [~ ~ [~ ~ ~ wtsn] [~ wtsn ~ wtsn]]]/16"
+
+mapM_ ($ silence) [d3,d4,d8]
+
+d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
+   |+| cutoff "0.02"
+   |+| resonance "0.001"
+   |+| speed "0.7"
+
+d3 $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
+   |+| cut "1"
+   |+| cutoff "0.01"
+   |+| resonance ((/3) <$> slow 4 saw1)
+
+d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
+   |+| cut "1"
+   |+| cutoff "0.01"
+   |+| resonance ((/3) <$> slow 4 saw1)
+
+d4 $ (0.25 <~) $ whenmod 5 4 (density 2) $ slow 16 . chop 32 $ sound (samples "bzl" (density 1.5 "0 1"))
+   |+| speed ((+1.3) <$> density 1.7 sinewave1)
+   |+| gain "0.8"
+
+mapM_ ($ silence) [d7,d9]
+
+d1 $ (0.5 <~) $ stack [
+   whenmod 4 3 (density 1.5) $ whenmod 9 2 ((0.25 <~)) $ sound "~ k",
+   (0.75 ~>) $ sound "[~ sn]/2"
+]
+
+d3 $ whenmod 5 3 (superimpose (0.25 ~>)) $ bassParams $ (0.5 ~>) $ chop 8 $ sound "[dubb dubb:1]/2"
+   |+| cut "1"
+   |+| cutoff "0.01"
+   |+| resonance ((/3) <$> slow 4 saw1)
+   |+| shape ((+0.25).(/2) <$> density 1.5 saw1)
+
+mapM_ ($ silence) [d1,d2]
+
+d7 $ whenmod 3 2 (slow 2) $ slow 8 $ every 2 rev $ striate 64 $ sound "ice"
+   |+| cutoff "0.02"
+   |+| resonance "0.001"
+   |+| speed "0.7"
+
+d7 silence
+
+mapM_ ($ silence) [d1,d3,d9]
+
 {-
 piston 2.c
 -}
 
+d4 silence
+
 d1 $ stack [
    sound "[[k k:1]*2 ~ ~ ~]/8",
    whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
 ]
 
-d2 $ sound "[~ [~ ~ ~ wt] wt*2 wt]/8"
-
 d4 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
 
-d2 $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
-   |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
+d8 $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
+   |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
 
 d1 $ stack [
    slow 2 $ sound "[[k k:1]*2 [~ k:1 ~ k] [~ k:1 k ~] [~ ~ ~ k]]/4",
    whenmod 8 4 (0.5 ~>) $ sound "[~ sn]/4"
 ]
 
-d2 $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
-   |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
-
-d2 $ jux (2 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
-   |+| speed ((+0.6).(/2) <$> density 1.8 sinewave1)
+d2 $ jux (3 ~>) $ within (0.25, 0.75) rev $ slowspread ($) [chop 16, chop 32] $ sound "[wtsn(3,8)]/2"
+   |+| speed ((+0.8).(/2) <$> density 1.8 sinewave1)
 
 {-
 piston 3.a