diff --git a/README.md b/README.md
index ac83937..370e0df 100755
--- a/README.md
+++ b/README.md
@@ -9,5 +9,6 @@ This is meant to extend or translate some parts.
 The original file can still be found at http://lsr.di.unimi.it/LSR/Snippet?id=970
 
 
-Currently, the most advanced score is MacKenzie Highlanders in 2-4_marches/mackenzie_highlanders.side.ly
-This score is used for most of the layout.
\ No newline at end of file
+Currently, the most advanced scores are for Lady MacKenzie of Fairburn in strathspeys/lady_mackenzie_of_fairburn/*.ly
+These scores are used for most of the layout.
+The scores include a side, tenor, bass, pipes, fullscore for drums and a regular fullscore.
\ No newline at end of file
diff --git a/makedrum b/makedrum
index 90479f5..4dddbf1 100755
--- a/makedrum
+++ b/makedrum
@@ -10,7 +10,7 @@ from argparse import ArgumentParser
 
 class MakeDrum:
 	LILYPOND = 'lilypond'
-	VERSION  = '0.9'
+	VERSION  = '0.9.5'
 	TMP_DIR  = './tmp'
 	TMP_PREFIX = 'tmp_'
 	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
index f41998c..27f092d 100755
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.pipes.ily
@@ -1,7 +1,7 @@
 % 4/4 Lady MacKenzie of Fairburn
 % Pipes
 \version "2.18.2"
-composerPipes = ""
+composerPipes = "J. Wark, arr. R. Stanley"
 pipesA = {
 	d16 |
 	\dblc c8. e16
@@ -56,15 +56,15 @@ pipesBB = {
 	\grg a8. \grd c16
 	\dble d8. d16
 	\dblc c8. b16
-	\grg a8. A16
+	\grg a16 A8.
 	|
 	a8. \grd c16
-	\grg e8. A16
-	\hdblf g8. d16
+	\grg e16 A8.
+	\hdblf g16 d8.
 	\dble e8. c16
 	|
 	\thrwd d8. e16
 	\dblg g8. d16
 	\dblb b8. a16
 	\grg G8.
-}
\ No newline at end of file
+}
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
index 67a647c..95e0700 100755
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
@@ -1,7 +1,7 @@
 % 4/4 Lady MacKenzie of Fairburn
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.8, 2015"
+composerSide = "E.T. de Boone, v0.9, 2015"
 snareA = \drummode {
 	\flam d8. g16
 	d8.:32( g16)
@@ -43,10 +43,10 @@ snareBA = \drummode{
 	d8.[:32(\<  \dr g16]:32)(-> \>
 	d8.[:32)( g16]:32)(-> \<
 	d8.[:32)( g16]:32)(->
-	d8.) \!
+	d8.) \! \fr
 }
 snareBB = \drummode{
-	g16 \fr |
+	g16 |
 	\triplet {d8 g \flam d}
 	\triplet {g d \flam g}
 	\triplet {d8 g \flam d}
@@ -59,11 +59,11 @@ snareBB = \drummode{
 	|
 	\drag d16 d8 g16
 	d8.:32( g16)
-	\flam d8 \< \triplet {d16 g d }
+	\flamd \triplet { d8 \< g16 g d8 }
 	\flam g4-> \!
 	|
 	d8.[:32( g16]:32)(->
 	d8.:32)( g16]:32)(->
 	d8.[:32)( g16]:32)(->
 	d8.)
-}
\ No newline at end of file
+}
diff --git a/todo b/todo
index 406409a..e0ff4bc 100755
--- a/todo
+++ b/todo
@@ -1,9 +1,11 @@
 TODO
  * show 8th and 16th beats in beaming, currently only 8ths:  d32[[ g] d[ g]] d32[[ g] d[ g]]
  * Macro for tutti's (unisons)
+	- on just one note
+	- with open ending
  * Macro for "Part 2 of $n"
  * If 8/16/32/..th notes come before a flam, they have a flag instead of a beam (fixable by explicit beaming, but rather have a good autobeaming)
- * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. )
+ * A tuplet beginning with a flam has a strange tuplet beam (slanted) (fixable by putting the flam outside of the tuplet .. However the flam function doesnt work that way (yet))
  * It's customary to have 4 bars per line for portrait and 8 for landscape...
 
  * SIDE sticking
@@ -11,5 +13,5 @@ TODO
 
  * FLOURISHING			short	long			note	above-note
 	ups					\up								arrow-up
-	scoop				\scoop							arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one]
-	(further EUSPBA symbols)
\ No newline at end of file
+	scoop				\scoop							arrow-right-(diag-up then diag-down) [propably start on beginning of note and filter out the last one]
+	(further EUSPBA symbols)