diff --git a/README.md b/README.md
index faa856a..d067793 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,28 @@
-# Anny FM - Pig's Nose EP
+# Anny FM: Pig's Nose EP
 
-repository wip, come back later
+Originally recorded @ home in Elephant & Castle, 5th April 2014.
 
-- patch `pigs-nose.tidal` to use cps, as well as adding more defs
-- unfuck sample loading order
-- write a better readme
+## Recordings
 
-note to self: don't think there's much value in preserving the original code, but `minute.parts.tidal` preserved with this commit anyway for posterity
+- [Pig's Nose EP on Bandcamp](http://anny.audio/album/pigs-nose-ep)
+- [Pig's Nose EP on SoundCloud](https://soundcloud.com/anny-fm/sets/pigs-nose-ep)
+
+## Source files
+
+`pigs-nose.tidal` is the sole source file for this EP, which will be maintained long term for compatibility with future notess of Tidal. This was originally written for Tidal 0.4 and has been patched for 0.7 (and to use `cps` instead of the original `bps` to define cycle length).
+
+This includes the full composition of Pig's Nose EP as recorded, reformulated long after the fact because my original notes were awful. (I have preserved them on the `original-notes` tag for posterity.) I have also made various patches to use new syntax and to improve conciseness and reusability for future live performances.
+
+## Sample attributions
+
+```
+armora baa bass bd casio hh ho house jungbass monsterb print rm sn wobble
+```
+
+All of the above samples from [Dirt-Samples](https://github.com/tidalcycles/Dirt-Samples/tree/c2db9a0dc4ffb911febc613cdb9726cae5175223).
+
+```
+qlatibro qspace
+```
+
+These are, respectively, derived from `latibro` and `space` from Dirt-Samples. Exactly the same actually, just with gain adjusted down a bit. (This was before `gain` was a synth parameter in Tidal. The good old days!)
diff --git a/minute.parts.tidal b/minute.parts.tidal
deleted file mode 100644
index 141ee84..0000000
--- a/minute.parts.tidal
+++ /dev/null
@@ -1,186 +0,0 @@
-bps (117/60)
-
---
--- drums
-
--- pt.1 (intro)
-d1 $ slow 2 $ sound "~ [~ ho] ~ ho ~ ~ ho ~"
-d1 $ slow 2 $ sound "~ [~ sn:8] ~ sn:8 ~ ~ sn:8 ~"
-d1 $ slow 2 $ sound "bd:1 [~ sn:8] ~ sn:8 ~ ~ sn:8 ~"
-d1 $ slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~"
-
--- pt.1 with hat
-d1 $ stack [
-  slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~",
-  every 3 rev $ slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~",
-  jux (iter 4) . every 3 rev $ slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~",
-  every 8 (density 2) $ jux (iter 4) . every 3 rev $ slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~",
-  jux (density 2 . iter 4) . every 3 rev $ slow 2 $ sound "bd:1 [~ sn:8] ~ [sn:8 bd:1] bd:1 bd:1 sn:8 ~",
-  slow 2 $ sound "hh*8 [hh*4 ho]"
-]
-
--- pt.2
-d1 $ stack [
-  sound "bd:1*2",
-  sound "bd:1 [~ bd:1] ~ bd:1",
-  slow 2 $ sound "bd:1 [~ bd:1] ~ bd:1 [~ bd:1] bd:1 ~ ~",
-  sound "house*2" |+| speed "0.7",
-  sound "house [~ house] ~ house" |+| speed "0.7",
-  every 4 (brak . density 2) $ sound "house [~ house] ~ house" |+| speed "0.7",
-  slow 2 $ sound "~ [~ sn:8] ~ [sn:8 ~] ~ ~ sn:8 ~",
-  jux (iter 4 . rev) $ slow 2 $ sound "~ [~ sn:8] ~ [sn:8 ~] ~ ~ sn:8 ~",
-  every 8 (density 3) $ jux (iter 4 . rev) $ slow 2 $ sound "~ [~ sn:8] ~ [sn:8 ~] ~ ~ sn:8 ~",
-  slow 2 $ sound "hh*8 [hh*4 ho]"
-]
-
--- protip for easy segue into pt.3 - break down to this then go to subsequent solo mid-bar
-solo $ d1 $ stack [
-  jux (iter 4 . rev) $ slow 2 $ sound "~ [~ sn:8] ~ [sn:8 ~] ~ ~ sn:8 ~",
-  slow 2 $ sound "hh*8 [hh*4 ho]"
-]
-
--- pt.3
-d1 $ density 2 . density (4%3) $ sound "sn:2 hh hh"
-
-d1 $ stack [
-  sound "house*2" |+| speed "0.7",
-  every 4 (density 3) $ sound "house*2" |+| speed "0.7",
-  sound "house*3" |+| speed "0.7",
-  density 2 . density (4%3) $ sound "sn:2 hh hh"
-  every 4 (density 2 . brak) $ density 2 . density (4%3) $ sound "sn:2 hh hh"
-  every 4 (density 2 . brak) $ density 2 . density (4%3) $ sound "sn:2 hh rm"
-  every 4 (density 2 . brak) $ density 2 . density (4%3) $ sound (pick <$> "sn:2 hh rm" <*> slow 5 "0 1")
-  
-]
-
--- protip for segue into pt.4 - multiply 117 by .1 increments up to 1.5x then hush, start subsequent solo after brief pause
-bps ((117*1.5)/60)
-
--- pt.4 (outro)
-
-solo $ d1 $ stack [
-  sound "[bd:1 ~ bd:1] sn:8",
-  sound "hh*6"
-]
-
-solo $ d1 $ sound "[bd:1 ~ bd:1] sn:8"
-
---
--- outta sync printro
-
-d2 $ slow 2.5 . striate 6 $ sound "print:7"
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ sound "print:7"
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ superimpose (slow 1) $ sound "{print:7, wobble}"
-  |+| vowel (slow 3 "a e i")
-
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ superimpose (slow 1) $ sound "wobble"
-
---
--- crazy beep
-
-d3 $ slow 4 . striate 4 $ sound "qspace"
-d3 $ slow 2 . striate 4 $ sound "qspace"
-d3 $ jux (iter 8) $ slow 2 . striate 4 $ sound "qspace"
-d3 $ spread density [1,2] $ jux (iter 8) $ slow 2 . striate 4 $ sound "qspace"
-d3 $ spread density [1,1,2,0.5] $ jux (iter 8) $ slow 2 . striate 4 $ sound "qspace"
-d3 $ spread density [1,1,0.5,2] $ jux (iter 8) $ slow 2 . striate 4 $ sound "qspace"
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
---  |+| vowel (slow 2 "e u")
-
--- funky beep (outro)
-d3 $ jux (iter 6) $ slow 2 . striate 4 $ sound "qspace"
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
-
---
--- jungle bass (simple loop; don't wear it out)
-
-d4 $ slow 4 $ (1%32) <~ sound "jungbass:2 jungbass:4"
-  |+| pan (slow 2 sinewave1)
-  |+| speed "1.2"
-
--- for funky outro
-d4 $ slow 4 $ sound "jungbass:2 jungbass:4"
-  |+| pan (slow 2 sinewave1)
-  |+| speed "1.2"
-
---
--- zap!! (can get pretty annoying after a few 8-bars, be careful)
-
-d5 $ slow 2 $ sound "monsterb:6"
-d5 $ striate 4 $ slow 2 $ sound "monsterb:6"
-d5 $ spread density [1,2] $ striate 4 $ slow 2 $ sound "monsterb:6"
-d5 $ spread density [2,1] $ striate 4 $ slow 2 $ sound "monsterb:6"
-d5 $ rev . density (4%3) $ spread density [1,2] $ striate 4 $ slow 2 $ sound "monsterb:6"
-  |+| gain "0.7"
-  |+| speed ((+0.6).(/2) <$> slow 4 sinewave1)
-
---
--- proper bass
-
-d6 $ slow 2 $ sound "bass*2 bass*2 bass*3 bass*3"
-d6 $ slow (5%4) . slow 2 $ sound "bass*2 bass*2 bass*3 bass*3 ~"
-d6 $ slow (5%4) . slow 2 $ sound "bass*2 bass*2 bass*3 bass*3"
-  |+| speed ((+1) <$> density 2.4 sinewave1)
-  |+| vowel "a"
-
---
--- casio click
-
-d7 $ sound "casio*2 ~"
-d7 $ spread density [1,4%3] $ sound "casio*2 ~"
-d7 $ jux (slow (4%3)) $ spread density [1,4%3] $ sound "casio*2 ~"
-
---
--- qlatibro
--- n.b. don't latibro and subroc at the same time
-
-d8 $ sound "[qlatibro:1 qlatibro]*2"
-
-d8 $ slow (5%4) $ spread density [1,5%4] $ sound "[qlatibro:1 qlatibro]*2"
-  |+| end "0.3"
-
-d8 $ slow (5%4) $ spread density [1,5%4] $ sound "[qlatibro:1 qlatibro]*2"
-  |+| vowel "e"
-
---
--- baa (loool)
-
-d9 $ slow 3 $ sound "baa"
-  |+| vowel "e"
-
---
--- armora (rough, very low)
-
-d8 $ slow 4 $ sound "armora:5"
-d8 $ every 8 (|+| speed "2") $ slow 4 $ sound "armora:5"
-d8 $ every 2 (density 3) $ every 8 (|+| speed "2") $ slow 4 $ sound "armora:5"
-  |+| shape ((/1.5) <$> slow 4 sinewave1)
-
---
--- compositional notes
-
-part 1
-  print
-  qspace
-  print/wobble
-  drum
-  jungbass
-  qlatibro
-part 2
-  qlatibro
-  casio
-  bass
-  monsterb
-  drum
-  qspace
-  baa
-part 3
-  drum
-  armora
-  monsterb
-  qspace
-  bass
-  jungbass
-  [start increasing bpm]
-  wobble
-  baa
diff --git a/pigs-nose.tidal b/pigs-nose.tidal
index ab4c64f..0c813e1 100644
--- a/pigs-nose.tidal
+++ b/pigs-nose.tidal
@@ -1,116 +1,158 @@
 {-
 anny fm: pig's nose ep
+originally recorded @ home, elephant & castle, 5th april 2014
+released on fwonk*: fwonk.co.uk/132/
+  _____
+ /    /
+/____/
+anny.audio/album/pigs-nose-ep
+      __
+  c|||  o_
+c||||| ___o
+soundcloud.com/anny-fm/sets/pigs-nose-ep
 -}
 
--- still on bps atm, port to cps tomorrow like
-bps (117/60)
+cps (117/60)
+
+-- shortfix for bps->cps
+let cf = slow 2
 
 {-
 [1]
 -}
 
+-- intro hat
 let pn'hointro = s "[~ [~ ho] ~ ho ~ ~ ho ~]/2"
-let pn'sn1 = s "[~ [~ sn:8] ~ sn:8 ~ ~ sn:8 ~]/2"
-let pn'bd1 = s "[bd:1 [~ ~ ~ bd:1] bd:1*2 ~]/2"
 
-let pn'qs1 sl = slow sl . striate 4 $ s "qspace"
+-- drums pretty much all the way thru
+let pn'sn = s "[~ [~ sn:1] ~ sn:1 ~ ~ sn:1 ~]/2"
+let pn'bd = s "[bd [~ ~ ~ bd] bd*2 ~]/2"
+let pn'hh = s "[hh*8 [hh*4 ho]]/2"
 
-d2 $ slow 2.5 . striate 6 $ s "print:7"
+-- qspace (= space but quieter)
+let pn'qs sl = slow sl . striate 4 $ s "qspace"
 
-d2 $ slow 2.5 . striate 6 $ s "print:7"
+-- off tempo intro
+d2 $ cf $ slow 2.5 . striate 6 $ s "print"
+
+d2 $ cf $ slow 2.5 . striate 6 $ s "print"
   # vowel (slow 3 "a e i")
 
-d3 $ pn'qs1 4
-d3 $ pn'qs1 2
+d3 $ cf $ pn'qs 4
+d3 $ cf $ pn'qs 2
 
-d1 $ pn'hointro
+d1 $ cf $ pn'hointro
 
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ sound "print:7"
+d2 $ cf $
+  jux (slow 1.1) $
+  slow 2.5 . striate 6 $ s "print"
+  # vowel (slow 3 "a e i")
 
-d3 $ jux (iter 8) $ pn'qs1 2
+d3 $ cf $ jux (iter 8) $ pn'qs 2
 
-d1 $ pn'sn1
+d1 $ cf $ pn'sn
 
-d3 $ jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $ jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d2 $ jux (slow 1.1) $
-  slow 2.5 . striate 6 $ sound "{print:7, wobble}"
-  |+| vowel (slow 3 "a e i")
+d2 $ cf $
+  jux (slow 1.1) $
+  slow 2.5 . striate 6 $ s "{print, wobble}"
+  # vowel (slow 3 "a e i")
 
-d1 $ overlay (slow 2 $ s "bd") $ pn'sn1
+d1 $ cf $ overlay (slow 2 $ s "bd") $ pn'sn
 
-d3 $ spread density [1,2] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+-- good qspace
+d3 $ cf $
+  spread density [1,2] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d1 $ overlay (pn'bd1) $ pn'sn1
+-- drums r srs now
+d1 $ cf $ overlay (pn'bd) $ pn'sn
 
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ sound "wobble"
+d2 $ cf $
+  jux (slow 1.1) $
+  slow 2.5 . striate 6 $ s "wobble"
 
--- angry qspace
-d3 $ spread density [1,1,2,0.5] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+-- pushy qspace
+d3 $ cf $
+  spread density [1,1,2,0.5] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d1 $ every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+d1 $ cf $
+  every 3 rev $
+  overlay (pn'bd) $ pn'sn
 
-d1 $ jux (iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
-
-d1 $ every 8 (density 2) $
+d1 $ cf $
   jux (iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+  overlay (pn'bd) $ pn'sn
 
-d1 $ jux (density 2 . iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+d1 $ cf $
+  every 8 (density 2) $
+  jux (iter 4) . every 3 rev $
+  overlay (pn'bd) $ pn'sn
+
+d1 $ cf $
+  jux (density 2 . iter 4) . every 3 rev $
+  overlay (pn'bd) $ pn'sn
 
 -- chiller qspace
-d3 $ spread density [1,1,0.5,2] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  spread density [1,1,0.5,2] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
 d2 silence
 
-d1 $ overlay (pn'bd1) $ pn'sn1
+d1 $ cf $ overlay (pn'bd) $ pn'sn
 
-d1 $ overlay (s "[hh*8 [hh*4 ho]]/2") $
-  overlay (pn'bd1) $ pn'sn1
+d1 $ cf $
+  overlay (pn'hh) $
+  overlay (pn'bd) $ pn'sn
 
-d1 $ overlay (s "[hh*8 [hh*4 ho]]/2") $
+d1 $ cf $
+  overlay (pn'hh) $
   every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+  overlay (pn'bd) $ pn'sn
 
-d4 $ slow 4 $ (1%32) <~ s "jungbass:2 jungbass:4"
-  |+| pan (slow 2 sinewave1)
-  |+| speed "1.2"
+d4 $ slow 8 $ ((1%32) <~) $ s "jungbass jungbass:1"
+  # pan (slow 2 sinewave1)
+  # speed "1.2"
 
-d1 $ overlay (s "[hh*8 [hh*4 ho]]/2") $
+d1 $ cf $
+  overlay (pn'hh) $
   jux (iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+  overlay (pn'bd) $ pn'sn
 
-d8 $ sound "[qlatibro:1 qlatibro]*2"
+-- start tailing off
+d8 $ slow 2 $ s "[qlatibro:1 qlatibro]*2"
 
-d1 $ overlay (s "[hh*8 [hh*4 ho]]/2") $
+d1 $ cf $
+  overlay (pn'hh) $
   jux (iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+  overlay (pn'bd) $ pn'sn
 
 d3 silence
 
-d5 $ slow 2 $ s "monsterb:6"
+d5 $ cf $
+  slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d5 $ striate 4 $ slow 2 $ s "monsterb:6"
+d5 $ cf $
+  striate 4 $ slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d1 $ overlay (s "[hh*8 [hh*4 ho]]/2") $
+d1 $ cf $
+  overlay (pn'hh) $
   every 8 (density 2) $
   jux (iter 4) . every 3 rev $
-  overlay (pn'bd1) $ pn'sn1
+  overlay (pn'bd) $ pn'sn
 
+-- calm
 mapM_ ($ silence) [d1,d4]
 d5 silence
 
@@ -118,147 +160,194 @@ d5 silence
 [2]
 -}
 
-d8 $ slow (5%4) $ spread density [1,5%4] $ sound "[qlatibro:1 qlatibro]*2"
+let pn'bass4 = s "bass*2 bass*2 bass*3 bass*3"
+let pn'bass5 = s "bass*2 bass*2 bass*3 bass*3 ~"
+
+d8 $ slow (10%4) $ spread density [1,5%4] $
+  s "[qlatibro:1 qlatibro]*2"
   # vowel "e"
 
-d7 $ sound "casio*2 ~"
-d1 $ s "[hh*8 [hh*4 ho]]/2"
+-- yknow this is a pretty neat sample
+d7 $ cf $ s "casio*2 ~"
+d1 $ cf $ pn'hh
 
-d5 $ striate 4 $ slow 2 $ s "monsterb:6"
+d5 $ cf $
+  striate 4 $ slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d5 $ spread density [1,2] $ striate 4 $ slow 2 $ sound "monsterb:6"
+d5 $ cf $
+  spread density [1,2] $
+  striate 4 $ slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d6 $ slow 2 $ sound "bass*2 bass*2 bass*3 bass*3"
+-- real bass at last
+d6 $ slow 4 $ pn'bass4
 
-d1 $ overlay (pn'sn1) $
-  s "[hh*8 [hh*4 ho]]/2"
+d1 $ cf $ overlay (pn'sn) $ pn'hh
 
-d6 $ slow 2 $ sound "bass*2 bass*2 bass*3 bass*3"
+d6 $ cf $ slow 2 $ pn'bass4
   # speed ((+1) <$> density 2.4 sinewave1)
 
-d1 $ overlay (s "bd*2") $
-  overlay (pn'sn1) $
-  s "[hh*8 [hh*4 ho]]/2"
+d1 $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  s "bd*2"
 
-d3 $ spread density [1,2] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  spread density [1,2] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d6 $ slow (5%4) . slow 2 $ sound "bass*2 bass*2 bass*3 bass*3 ~"
+d6 $ slow 5 $ pn'bass5
   # speed ((+1) <$> density 2.4 sinewave1)
 
-d1 $ overlay (s "house*2") $
-  overlay (pn'sn1) $
-  s "[hh*8 [hh*4 ho]]/2"
+-- real kick drum at last!
+d1 $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  s "house*2"
 
-d3 $ spread density [1,1,2,0.5] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  spread density [1,1,2,0.5] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
+-- quickly
 d1 silence
 
-d1 $ overlay (s "house(3,8)") $
-  overlay (pn'sn1) $
-  s "[hh*8 [hh*4 ho]]/2"
+d1 $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  s "house(3,8)"
 
-d3 $ spread density [1,1,0.5,2] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  spread density [1,1,0.5,2] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d4 $ slow 4 $ s "jungbass:2 jungbass:4"
-  |+| pan (slow 2 sinewave1)
-  |+| speed "1.2"
+d4 $ slow 8 $ s "jungbass jungbass:1"
+  # pan (slow 2 sinewave1)
+  # speed "1.2"
 
-d6 $ slow (5%4) . slow 2 $ sound "bass*2 bass*2 bass*3 bass*3"
+d6 $ slow 5 $ pn'bass4
   # speed ((+1) <$> density 2.4 sinewave1)
 
 mapM_ ($ silence) [d3,d5]
 
-d7 $ spread density [1,4%3] $ sound "casio*2 ~"
+-- mess with casio a bit then get rid. a transition
+d7 $ cf $
+  spread density [1,4%3] $ s "casio*2 ~"
 
-d1 $ overlay (every 4 (brak . density 2) $ s "house(3,8)") $
-  overlay (pn'sn1) $
-  s "[hh*8 [hh*4 ho]]/2"
+d1 $ cf $ overlay (pn'sn) $ overlay (pn'hh) $
+  every 4 (brak . density 2) $ s "house(3,8)"
 
-d7 $ jux (slow (4%3)) $ spread density [1,4%3] $ sound "casio*2 ~"
+d7 $ cf $
+  jux (slow (4%3)) $
+  spread density [1,4%3] $ s "casio*2 ~"
 
 mapM_ ($ silence) [d7,d8]
 
-d5 $ spread density [1,2] $ striate 4 $ slow 2 $ sound "monsterb:6"
+d5 $ cf $
+  spread density [1,2] $
+  striate 4 $ slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d9 $ slow 3 $ sound "baa"
-  |+| vowel "e"
+-- sometimes i regret putting a sheep in this song
+d9 $ slow 6 $ s "baa"
+  # vowel "e"
 
 mapM_ ($ silence) [d2,d3,d4,d5,d9]
 
-solo $ d1 $ stack [
-  jux (iter 4 . rev) $ slow 2 $ sound "~ [~ sn:8] ~ [sn:8 ~] ~ ~ sn:8 ~",
-  slow 2 $ sound "hh*8 [hh*4 ho]"
-]
+-- nice
+solo $ d1 $ cf $
+  overlay pn'hh $
+  jux (iter 4 . rev) $ pn'sn
 
 {-
 [3]
 -}
 
-d1 $ density 2 . density (4%3) $ sound "sn:2 hh hh"
+-- drum intro
+d1 $ cf $
+  density (8%3) $ s "sn:0 hh hh"
 
-d1 $ overlay (s "house*2") $
-  density 2 . density (4%3) $ sound "sn:2 hh hh"
+d1 $ cf $
+  overlay (s "house*2") $
+  density (8%3) $ s "sn:0 hh hh"
 
-d1 $ overlay (s "house*2") $
-  every 4 (density 2 . brak) $ density 2 . density (4%3) $ sound "sn:2 hh hh"
-
-d1 $ overlay (s "house*2") $
+d1 $ cf $
+  overlay (s "house*2") $
   every 4 (density 2 . brak) $
-  density 2 . density (4%3) $ sound "sn:2 hh rm"
+  density (8%3) $ s "sn:0 hh hh"
 
-d8 $ slow 4 $ sound "armora:5"
+d1 $ cf $
+  overlay (s "house*2") $
+  every 4 (density 2 . brak) $
+  density (8%3) $ s "sn:0 hh rm"
 
-d8 $ every 8 (|+| speed "2") $ slow 4 $ sound "armora:5"
+-- weird low
+d8 $ cf $
+  slow 4 $ s "armora"
 
-d8 $ every 2 (density 3) $ every 8 (|+| speed "2") $ slow 4 $ sound "armora:5"
-  |+| shape ((/1.5) <$> slow 4 sinewave1)
+d8 $ cf $
+  every 8 (# speed "2") $
+  slow 4 $ s "armora"
 
-d5 $ striate 4 $ slow 2 $ s "monsterb:6"
+d8 $ cf $
+  every 2 (density 3) $
+  every 8 (# speed "2") $
+  slow 4 $ s "armora"
+
+d8 $ cf $
+  every 2 (density 3) $
+  every 8 (# speed "2") $
+  slow 4 $ s "armora"
+  # shape ((/1.5) <$> slow 4 sinewave1)
+
+-- bring monster back
+d5 $ cf $
+  striate 4 $ slow 2 $ s "monsterb"
   # gain "0.7"
   # speed ((+0.6).(/2) <$> slow 4 sinewave1)
 
-d3 $ pn'qs1 2
-d3 $ jux (iter 8) $ pn'qs1 2
+-- and qspace
+d3 $ cf $ pn'qs 2
+d3 $ cf $ jux (iter 8) $ pn'qs 2
 
-d3 $ jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d3 $ spread density [1,2] $
-  jux (iter 8) $ pn'qs1 2
-  |+| speed ((+0.7).(/2) <$> slow 3.2 triwave1)
+d3 $ cf $
+  spread density [1,2] $
+  jux (iter 8) $ pn'qs 2
+  # speed ((+0.7).(/2) <$> slow 3.2 triwave1)
 
-d1 $ overlay (s "house*2") $
+d1 $ cf $
+  overlay (s "house*2") $
   every 4 (density 2 . brak) $
-  density 2 . density (4%3) $ sound (samples "sn:2 hh rm" (slow 5 "0 1"))
+  density (8%3) $ (s "sn:0 hh rm" # n "[0 1]/5")
 
-d6 $ slow (5%4) . slow 2 $ sound "bass*2 bass*2 bass*3 bass*3 ~"
+-- bring back 5/4 bass
+d6 $ slow 5 $ pn'bass5
   # speed ((+1) <$> density 2.4 sinewave1)
 
-d1 $ overlay (every 4 (density 3) $ s "house*2") $
+d1 $ cf $
+  overlay (every 4 (density 3) $ s "house*2") $
   every 4 (density 2 . brak) $
-  density 2 . density (4%3) $ sound "sn:2 hh hh"
+  density (8%3) $ (s "sn:0 hh rm" # n "[0 1]/5")
 
-d4 $ slow 4 $ s "jungbass:2 jungbass:4"
-  |+| pan (slow 2 sinewave1)
-  |+| speed "1.2"
+d4 $ slow 8 $ s "jungbass jungbass:1"
+  # pan (slow 2 sinewave1)
+  # speed "1.2"
 
-bps ((117*1.5)/60) -- gradually 1.1->1.5
+-- gradually 1.1->1.5
+cps ((117*1.5)/60)
 
-d2 $ jux (slow 1.1) $ slow 2.5 . striate 6 $ sound "wobble"
+d2 $ cf $
+  jux (slow 1.1) $
+  slow 2.5 . striate 6 $ s "wobble"
 
-d9 $ slow 3 $ sound "baa"
-  |+| vowel "e"
+-- still don't know why i put a fuckin sheep in here
+d9 $ slow 6 $ s "baa"
+  # vowel "e"
 
+-- all at once
 hush
diff --git a/samples/jungbass/00_gliding_808_sub.wav b/samples/jungbass/00_gliding_808_sub.wav
deleted file mode 100644
index 03b4d5e..0000000
Binary files a/samples/jungbass/00_gliding_808_sub.wav and /dev/null differ
diff --git a/samples/jungbass/01_gliding_808_sub.wav b/samples/jungbass/01_gliding_808_sub.wav
deleted file mode 100644
index 03b4d5e..0000000
Binary files a/samples/jungbass/01_gliding_808_sub.wav and /dev/null differ
diff --git a/samples/jungbass/02_fukubass2.wav b/samples/jungbass/02_fukubass2.wav
deleted file mode 100644
index 92330a1..0000000
Binary files a/samples/jungbass/02_fukubass2.wav and /dev/null differ
diff --git a/samples/jungbass/README.md b/samples/jungbass/README.md
deleted file mode 100644
index 545a379..0000000
--- a/samples/jungbass/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-2 samples duplicated to :0 :1 :2 spots to preserve correct sample loading in current version of tidal source. will be fixed properly later!
-
-jungbass:2 => fukubass2.wav
-jungbass:4 => gliding_808_sub.wav
-
diff --git a/samples/sn/00_ST0T0S7.wav b/samples/sn/00_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/00_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/01_ST0T0S7.wav b/samples/sn/01_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/01_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/02_ST0T0S7.wav b/samples/sn/02_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/02_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/03_ST0T0S7.wav b/samples/sn/03_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/03_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/04_ST0T0S7.wav b/samples/sn/04_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/04_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/05_ST0T0S7.wav b/samples/sn/05_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/05_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/06_ST0T0S7.wav b/samples/sn/06_ST0T0S7.wav
deleted file mode 100644
index f905875..0000000
Binary files a/samples/sn/06_ST0T0S7.wav and /dev/null differ
diff --git a/samples/sn/README.md b/samples/sn/README.md
deleted file mode 100644
index 33b6385..0000000
--- a/samples/sn/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-duplicated samples to preserve sample order, patch later
-
-sn:2 => ST0T0S7.wav
-sn:8 => ST0T7S7.wav
-