diff --git a/piston.tidal b/piston.tidal
index 1f5e999..326c3c5 100644
--- a/piston.tidal
+++ b/piston.tidal
@@ -134,12 +134,13 @@ d6 $ sound "[ff(3,8) [~ [ff bz]]]/4"
    |+| gain "0.7"
 
 d1 silence
-d1 $ sound "{k*2 [~ k], ~ sn}/2"
 
 d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| cut "1"
    |+| vowel "i"
 
+d1 $ sound "{k*2 [~ k], ~ sn}/2"
+
 d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:1]/2"
    |+| cut "1"
    |+| vowel "o i"
@@ -183,32 +184,20 @@ d3 $ every 2 (0.5 <~) $ slow 4 $ rev . chop 16 $ bassParams $ sound "[dubb dubb:
 piston 2.a
 -}
 
-mapM_ ($ silence) [d2,d3]
-
-d1 $ density 2 $ sound "[wt k:1 k]/3"
+mapM_ ($ silence) [d1,d3]
 
 --d4 $ rev . chop 32 $ sound "[bz(5,8)]/2"
-d4 $ whenmod 3 2 rev $ rev . chop 32 $ sound "[bz(3,8)]/2"
-   |+| gain "0.8"
+d4 $ whenmod 3 2 rev $ rev . chop 8 $ sound "[bz(3,8)]/2"
    |+| cut "1"
-   |+| vowel "a"
 
-d1 $ whenmod 9 6 rev $ density 2 $ sound "[wt k:1 k]/3"
-
-d2 $ sound "[~ sn]/2"
+d1 $ sound "[k sn k k:1]/2"
 
 d3 $ slow 6 $ chop 12 $ bassParams $ sound "[dubb dubb:1]/2"
 
-d2 silence
-
-d1 $ whenmod 9 6 rev $ density 2 $ sound "[sn k:1 k]/3"
-
 --d3 $ slow 6 $ chop 12 $ bassParams $ sound "[dubb dubb:1]/2"
 d3 $ every 3 (density 1.2) . slow 6 $ chop 12 $ bassParams $ sound "[dubb dubb:1]/2"
 |+| vowel "u"
 
-d1 $ whenmod 9 6 rev $ density 2 $ sound "[sn [k:1 wtsn] k]/3"
-
 hush
 
 --tbc
@@ -247,15 +236,13 @@ d3 $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1
 d3 $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
 
-d1 $ sound "k:1"
+d1 $ sound "k"
 
-d6 $ chop 16 $ sound "[~ ~ [~ plode] !]/4"
+d6 $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
-   |+| vowel "u"
 
-d6 $ whenmod 4 3 (density 1.8) $ chop 16 $ sound "[~ ~ [~ plode] !]/4"
+d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
-   |+| vowel "u"
 
 d3 $ every 2 (density 2) $ density 1.6 $ chop 16 $ bassParams $ sound (samples "[~ dubb]" (slow 4 "0 1"))
    |+| cut "1"
@@ -267,9 +254,8 @@ d3 $ within (0.5, 0.75) (|+| vowel "u o") $ every 2 (density 2) $ whenmod 3 2 (d
    |+| cut "1"
    |+| speed ((+0.75).(/2) <$> slow 1.3 sinewave1)
 
-d6 $ whenmod 4 3 (density 1.8) $ chop 16 $ sound "[~ ~ [~ plode] !]/4"
+d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
-   |+| vowel "u"
    |+| shape ((/3) <$> density 3 sinewave1)
 
 mapM_ ($ silence) [d1,d3]
@@ -290,9 +276,8 @@ d7 $ whenmod 5 3 (slow 1.5) $ rev $ stack [
    |+| pan ((0.5 <~) $ slow 4 sinewave1)
 ]
 
-d6 $ whenmod 4 3 (density 1.8) $ chop 16 $ sound "[~ ~ [~ plode] !]/4"
+d6 $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
-   |+| vowel "u"
    |+| shape ((/3) <$> density 3 sinewave1)
    |+| delay "0.3" |+| delayfeedback "0.2" |+| delaytime "0.2875" --(138/60)/8
 
@@ -300,9 +285,8 @@ d4 $ whenmod 5 3 rev $ brak $ slow 16 $ jux ((1.5 ~>).rev) $ chop 64 $ bassParam
    |+| speed "0.7"
    |+| shape ((/2) <$> density 2.1 saw1)
 
-d6 $ within (0, 0.5) rev $ whenmod 4 3 (density 1.8) $ chop 16 $ sound "[~ ~ [~ plode] !]/4"
+d6 $ within (0, 0.5) rev $ whenmod 4 3 (density 1.8) $ chop 12 $ sound "[~ ~ [~ k:1] !]/4"
    |+| speed "0.9"
-   |+| vowel "u"
    |+| shape ((/3) <$> density 3 sinewave1)
    |+| delay "0.3" |+| delayfeedback "0.2" |+| delaytime "0.2875" --(138/60)/8
 
@@ -326,6 +310,8 @@ mapM_ ($ silence) [d3,d4]
 piston 2.c
 -}
 
+d1 $ sound "[[k sn](3,8)]/2"
+
 d1 $ stack [
    sound "[[k ~ ~ k] ~ k ~]/4",
    (0.5 ~>) $ sound "[~ sn]/2"
@@ -418,16 +404,16 @@ d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
 
 d1 $ sound "[k*2 [sn ~ ~ wt] [~ k] sn [~ k]]/5"
 
+d1 $ sound "[k [sn ~ ~ wt] [~ k] sn]/4"
+
+d3 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
+
 d6 $ sound (samples "[[ff bz]*2 [~ bz*2]]/2" $ slow 2 $ run 5)
    |+| begin "0.7" |+| end "0.85"
    |+| hcutoff "0.04" |+| hresonance "0.1"
    |+| shape ((/5) <$> slow (5%3) sinewave1)
    |+| delay "0.6" |+| delayfeedback "0.5" |+| delaytime "0.766" --(138/60)/3
 
-d1 $ sound "[k [sn ~ ~ wt] [~ k] sn]/4"
-
-d3 $ slow 16 $ rev . chop 64 $ bassParams $ sound "[dubb dubb:1]/2"
-
 d9 $ slow 2 $ smash 16 [1,2] $ sound "ant:1"
    |+| cutoff "0.08" |+| resonance "0.01"