diff --git a/.gitignore b/.gitignore
index eb0973e..bd55f6c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.gitignore
 *.ps
 *.pdf
 *.png
@@ -6,4 +7,5 @@
 *.py
 _output/
 pdf/
+fullscores/
 fullscores/*
diff --git a/2-4_marches/black_bear.v1.2.side.ly b/2-4_marches/black_bear.v1.2.side.ly
new file mode 100755
index 0000000..710c759
--- /dev/null
+++ b/2-4_marches/black_bear.v1.2.side.ly
@@ -0,0 +1,57 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\score {
+   \new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 2/4
+		\eighthBeaming
+
+		\drummode {
+			% Part 1
+				\repeat volta 2 {
+					\partial 8 d8:32( |
+					g16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 |
+					r4^\markup {\bold YELL} d8:32( g8:32)(-> |
+
+					\break
+
+					d16.) \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16. \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d4 d4:32( |
+					d8) \flam g8 \flam d8
+
+				}
+
+				\break
+
+					g8
+			% Part 2 ( Part 2.2 = Part 1)
+					\tuplet 3/2 { \flam d16 g16 d16->} g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } |
+					\flam d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( |
+					\tuplet 3/2 { d16) g16 d16-> } g16. g32 \flam d8:32( \tuplet 3/2 { g16) d16 g16 } |
+					\flam d8:32( g16.)(-> g32) d32 g16. d16. g32 |
+
+					\break
+
+					\tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } |
+					\tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } |
+					\flam d16. g32-> d16. d32  \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] |
+					g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 |
+					\bar "|."
+
+		}% End of drums %
+	}
+	\header {
+		title = "Black Bear"
+		meter = "March"
+		composer = "version 1.2, 2015"
+		instrument = "Side"
+	}
+}
\ No newline at end of file
diff --git a/2-4_marches/black_bear.v1.3.side.ly b/2-4_marches/black_bear.v1.3.side.ly
new file mode 100755
index 0000000..164a84a
--- /dev/null
+++ b/2-4_marches/black_bear.v1.3.side.ly
@@ -0,0 +1,73 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+yell = \markup { \bold \small HOY }
+
+\score {
+   \new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+
+		\time 2/4
+		\eighthBeaming
+
+		\drummode {
+			% Part 1
+				\repeat volta 2 {
+					\partial 8 d8:32( |
+					g16.)-> \parenthesize g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16.->  \parenthesize g32 \flam d16.-^ g32 d16. \flam g32 d16. g32 |
+					\flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 |
+					r4^\yell d8:32( \< g8:32)(-> |
+
+					\break
+
+					d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d4 d4:32( |
+					d8) \flam g8 \flam d8
+
+				}
+
+				\break
+
+					g8
+			% Part 2 ( Part 2.2 = Part 1)
+					\tuplet 3/2 { \flam d16 g16 d16->} g16. g32  d8:32( \tuplet 3/2 { g16) d16 g16 } |
+					d8:32( g16.)(-> g32) d32 g16. d16:64( d16:64)( |
+					\tuplet 3/2 { d16) g16 d16-> } g16. g32 d8:32( \tuplet 3/2 { g16) d16 g16 } |
+					d8:32( g16.)(-> g32) d32 g16. d16. g32 |
+
+					\break
+
+					\tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { g16 d16 \flam g32 g32 } \tuplet 3/2 { d16 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } |
+					\tuplet 3/2 { d16 g16 \flam d32 d32 } \tuplet 3/2 { g16 d16 g16 } \tuplet 3/2 { \flam d32 d32 g16 d16 } \tuplet 3/2 { \flam g32 g32 d16 g16 } |
+					\flam d16. g32-> d16. d32  \tuplet 3/2 { \flam g16[ d16 g16-> } d16. \drag g32] |
+					g32 d32 g32 d32 \tuplet 3/2 {g16-> d16 g16-> } \tuplet 3/2 { d16 g16 d16->} g32 d32 d32 g32 |
+					\bar "||"
+					\break
+
+					d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16.  g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d8 \tuplet 3/2 { d16 g16 d16 } \flam g4 |
+					r4^\yell d8:32( \< g8:32)(-> |
+
+					\break
+
+					d16.) \! g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d16. g32 \flam d16. g32 d16. \flam g32 d16. g32 |
+					\flam d4 d4:32( |
+					d8) \flam g8 \flam d8 r8
+
+		}% End of drums %
+	}
+	\header {
+		title = "Black Bear"
+		meter = "March"
+		composer = "version 1.3, 2015"
+		instrument = "Side"
+	}
+}
diff --git a/2-4_marches/mackenzie_highlanders.alternate.side.ly b/2-4_marches/mackenzie_highlanders.alternate.side.ly
new file mode 100755
index 0000000..829a22b
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders.alternate.side.ly
@@ -0,0 +1,63 @@
+\score {
+	\new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 2/4
+		\eighthBeaming
+
+		\drummode {
+			\repeat volta 2{
+				\partial 8 d8:32( |
+				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
+				\flam d8 d8:32(	g8:32) d16. g32 |
+
+				d8:32( g16.) g32->	d32 g d g-> d16.-> g32 |
+				d8:64(-> g32) d g d	g8 d8:32( |
+
+				g8) \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
+				d8-> g8:32(->	d8:32)(-> \tuplet 3/2 { g16) d g } |
+
+				d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+				d4:32(	d8)
+			}
+			\break
+
+			\partial 8 g8 |
+			d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+			d8-> d8:32(	g8) d16. g32 |
+
+			d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
+			d8:64(-> g32) d g d	g8 g8-> |
+
+			d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+			d8-> g8:32(->	d8:32)(-> \tuplet 3/2{ g16) d g } |
+
+			d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+			d4:32(	d8) g8
+
+			\bar "||"
+			\break
+
+			d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+			d8-> d8:32(	g8) d16. g32 |
+
+			d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
+			\flam d4	d8:32(-> \< g8:32)(-> |
+
+			d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
+			d32 g d g-> d16.-> g32	d8:32(-> \tuplet 3/2 { g16) d g } |
+
+			d8-> \drag d16 d32-> g	d g \drag d16 d16. g32 |
+			d4:32( d4)
+			\bar ":|"
+		}
+
+	}
+	\header {
+		title = "MacKenzie Highlanders"
+		composer = "alternate version, 2015"
+		meter = "March"
+	}
+}
\ No newline at end of file
diff --git a/2-4_marches/mackenzie_highlanders.side.ly b/2-4_marches/mackenzie_highlanders.side.ly
index fc71f5e..2a1132b 100755
--- a/2-4_marches/mackenzie_highlanders.side.ly
+++ b/2-4_marches/mackenzie_highlanders.side.ly
@@ -10,7 +10,7 @@
 		\drummode {
 			\repeat volta 2{
 				\partial 8 d8:32( |
-				g8) \tuplet 3/2 { \backstick  d16 g d } 	\flam g16. d32-> g16. g32 |
+				g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
 				\flam d8 d8:32(	g8:32)(-> \tuplet 3/2 { d16) g d } |
 
 				\flam g8 \drag d16. d32->		g16. \drag d32 d16. g32 |
@@ -39,9 +39,10 @@
 				d4:32(		d8)
 			}
 		}
+
 	}
 	\header {
 		title = "MacKenzie Highlanders"
 		meter = "March"
 	}
-}
\ No newline at end of file
+}
diff --git a/4-4_marches/the_pikemans_march.v1.5.side.ly b/4-4_marches/the_pikemans_march.v1.5.side.ly
new file mode 100755
index 0000000..b4535b9
--- /dev/null
+++ b/4-4_marches/the_pikemans_march.v1.5.side.ly
@@ -0,0 +1,53 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\score {
+   \new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 4/4
+		\eighthBeaming
+
+		\drummode {
+				\repeat volta 2 {
+						\partial 8 g16. g32 |
+						\flamd d4-^		d32\< g d g d8->\!		\flamd d8\> \flamg g8\!		r8 d8:32( |
+						g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8..) g32 |
+						\flamd d8.. g32		\tuplet 3/2 { d16 d g} \flam d16. g32	\tuplet 3/2 { d16 d g } \flam d16. g32	\flam d16. d32 \tuplet 3/2 { g16 g d }
+						\flamd d4		d8:32( g8:32)(->		d4)		r8 \tuplet 3/2 { g16\< d g\! } |
+				\break
+						\flamd d4-^		d32\< g d g d8->\!		\flamd d8\> \flamg g8\!		r8 d8:32( |
+						\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> g16. g32 |
+						d8:32( g8:32)(->		d8:32)( g8:32)(->		d8)-> \tuplet 3/2 { g16 d g}	\flam d8 g32 d d g	|
+						\flam d8. g16	d16:64(-> \parenthesize d16:64)(-> g16:64)(-> \parenthesize g16:64)(-> 		d8.)-> \parenthesize d16:64(		\parenthesize d8:64)
+				}
+			\break
+				\partial 8 d16. g32 |
+				\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) g8 |
+				d8:32( g8:32)(->		d8:32)( g8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
+				\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
+
+			\break
+				\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+				d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
+				\flamd d4		d4:32(		d4)		r8 d16. g32 |
+
+			\break
+				\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+				g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
+				d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
+				\flamd d4		d8:32( g8:32)(->		d4)		r4
+		}% End of drummode %
+	}
+	\header {
+		title = "The Pikeman's March"
+		meter = "March"
+		composer = "version 1.5, 2015"
+		instrument = "Side"
+	}
+}
\ No newline at end of file
diff --git a/4-4_marches/were_no_awa_tae_bide_awa.side.ly b/4-4_marches/were_no_awa_tae_bide_awa.side.ly
new file mode 100755
index 0000000..38a741a
--- /dev/null
+++ b/4-4_marches/were_no_awa_tae_bide_awa.side.ly
@@ -0,0 +1,29 @@
+\score {
+	\new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 4/4
+		\eighthBeaming
+
+		\drummode {
+			\repeat volta 2 {
+				\partial 8 d16. g32 |
+				d32-> g d g->  d-> g d g	d g d-> g  d g d g	d-> g d g  d-> g d g	d8-> d8:32( |
+				\tuplet 3/2 { g16) d g }  \flam d16. g32 	\tuplet 3/2 { d16 g d }  \flam g16. g32		d16. g32 \tuplet 3/2 { d16 g d }  \flam d8 r8 |
+				d32-> g d g->  d-> g d g	d g d-> g  d g d g	d-> g d g  d-> g d g	d8-> d8:32( |
+				g4)	d4:32(	d4) 	r8 g8 |
+			\break
+				d2:32(\<	d4)\!	r8 g8 |
+				d8:32( g8)	g8 d8:32(	d8) r8	r8 g8 |
+				\flam d8 g16. d32-> 	g16. g32 \flam d16. g32 	\flam d16. d32:128( d16) g16-> 	d16 g d \flam d  |
+				d4 d4:32( d4) r8
+			}
+		}
+	}
+	\header {
+		title = "We're No' Awa Tae Bide Awa"
+		meter = "March"
+	}
+}
\ No newline at end of file
diff --git a/airs/abide_with_me.side.ly b/airs/abide_with_me.side.ly
new file mode 100755
index 0000000..0089db9
--- /dev/null
+++ b/airs/abide_with_me.side.ly
@@ -0,0 +1,32 @@
+\score {
+	\new DrumStaff = "staff_side" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = #"Side"
+		\set Staff.shortInstrumentName = #"S.D."
+
+		\time 4/4
+		\eighthBeaming
+		%\markup{ 1st time through rolls, n+1th time: n drums play score}
+		\drummode {
+			\repeat unfold 3{
+				\flam  d8->) \! \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 g |
+				\flam  d8-> \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 g |
+				\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam g8 \flam g-> |
+				d4:32( \<	d4:32)(	d4:32)(	d4:32)( \! \> |
+
+				\break
+			}
+			\break
+			\flam  d8->) \! \triplet { d16 g d }	g8 \flam d->	r8 \flam d	r8 \flam g |
+			\flam  d8->\< \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam  d8-> \triplet { d16 g d }	\flam g8[ \drag g]->\! |
+			d4:32( \>	d4:32)(	d4:32)(	d4:32)( |
+			d4:32)( \<	d4:32)(	d4:32)(	d4:32) \!
+
+		}
+
+	}
+	\header {
+		title = "Abide with Me"
+		meter = "Hymn"
+	}
+}
diff --git a/airs/flower_of_scotland.ly b/airs/flower_of_scotland.side.ly
similarity index 100%
rename from airs/flower_of_scotland.ly
rename to airs/flower_of_scotland.side.ly
diff --git a/build_all b/build_all
new file mode 100755
index 0000000..9370e5e
--- /dev/null
+++ b/build_all
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MKDRUMCOMMAND="./makedrum"
+
+for d in *_marches strathspeys standards jigs airs hornpipes other
+do
+	$MKDRUMCOMMAND $d/*.ly
+done;
diff --git a/cheatsheet.ly b/cheatsheet.ly
new file mode 100755
index 0000000..f16c5b4
--- /dev/null
+++ b/cheatsheet.ly
@@ -0,0 +1,74 @@
+
+#(ly:set-option 'point-and-click #f)
+
+% Choose a size
+#(set-global-staff-size 18)
+#(set-default-paper-size "a4" 'landscape)
+
+\paper {
+  indent = 0\mm
+  ragged-right = ##t
+  ragged-bottom = ##t
+}
+\layout {
+  indent = 30\mm
+  \context {
+    \Score
+    \override NonMusicalPaperColumn #'line-break-permission = ##f
+  }
+}
+
+\include "lilydrum.ly"
+
+\score {
+	\new DrumStaff {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = "Plain notes"
+		\drummode {
+			d4 g dcross gcross \rimshot d \rimshot g dback gback
+		}
+    }
+    \addlyrics {
+		d g dcross gcross "\rimshot d" "\rimshot g" dback gback
+    }
+}
+
+\score {
+	\new DrumStaff {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = "Tenor Flourishing"
+		\drummode {
+			d^\splitTheFeather g^\cartWheel d^\up {\scoop d8 g8 d4} g d \flourish { d4 g d g }
+		}
+    }
+    \addlyrics {
+		"\splitTheFeather" "cartWheel" "up" "scoop d g d" "\flourish { }"
+    }
+}
+
+
+\score {
+	\new DrumStaff {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+		\set Staff.instrumentName = "Tenor Flourishing"
+		\drummode {
+			\partial 8 d8:32( |
+			\triplet { g16) d g} \flam d16. g32  \drag g16 g16 \triplet { d16 g:64 d->}
+		}
+    }
+    \addlyrics {
+    }
+}
+
+% # Writing parts
+% rolls
+% tuplets
+% tutti
+% accents ( > v ^)
+%
+
+\header {
+    title = "Cheat sheet for entering pipeband drumming music"
+    subtitle = "Intended for Lilypond 2.18 or better"
+    tagline = \markup { "Cpl ET de Boone, Seaforths of Holland" }
+}
diff --git a/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww b/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww
deleted file mode 100755
index b34acba..0000000
--- a/fullscores/2-4_marches/black_bear/Black_Bear_Hornpipe_The.bww
+++ /dev/null
@@ -1,71 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,75,80,250)
-
-TuneFormat,(1,0,M,L,500,500,500,500,L,1,0)
-
-
-
-"The Black Bear Hornpipe",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-
-"March",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"Trad.",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"P.M. FrankJan de Boone-The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"B 3",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"2001",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-TuneTempo,84
-
-
-& sharpf sharpc 2_4 I!'' 	gg LAr_8 'la Bl_16 	
-! 		thrd Dr_8 lgstd Dl_8 	gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 		thrd Dr_8 lgstd Dl_8 	gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 		dbe Er_8 gg Bl_8 		grp Br_8 gg Er_16 Dl_16 	
-! 		gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c		gg LAr_16 'la Bl_32 	gg Cr_32 dg LAl_16 'la
-
-!t
-
-& sharpf sharpc  	thrd Dr_8 lgstd Dl_8 		gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-!  	thrd Dr_8 lgstd Dl_8 		gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 	dbe Er_8 grp El_8 		gg Er_16 'e HGl_32	 tg Fr_32 El_16 'e
-! 	thrd Dr_8 gg Fl_8 		thrd D_8 		''!I
-
-
-"part 2"
-
-& sharpf sharpc   space	 E_8 
-! 		gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16  	thrd Dr_8 gg Dr_16  El_16
-!		dbhg HGr_8 tg  Fr_16  El_16 				gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32
-! 		gg LAr_16 'la dg LAl_32 eg LAl_16 dg Bl_16  	thrd Dr_8 gg Dr_16  El_16
-!		dbhg HGr_8 tg  Fr_16  El_16 				gg Fr_32 HAr_16 'ha Fl_16 'f Dl_32
-!t
-
-& sharpf sharpc 	
-	HAr_8  LAr_16 dbla LAl_16					gg Cr_8 dg LAr_16 dbla  LAl_16 
-!	gg Dr_8 Br_16 dbb Bl_16						gg Er_8 Cr_16 dbc Cl_16
-! 	gg Dr_32 Fl_16 'f gg Dr_32  Fl_16 'f		 		Er_16 'e HGl_32 	 tg Fr_32 HGl_16 'hg
-! 	HAr_8 grp HAl_8 							strhg HAr_16 'ha HGl_32 tg Fl_16 'f El_16
-
-!I
-
-& sharpf sharpc 		
- 		thrd Dr_8 lgstd Dl_8 	gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 		thrd Dr_8 lgstd Dl_8 	gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 		dbe Er_8 gg Bl_8 		grp Br_8 gg Er_16 Dl_16 	
-! 		gg Cr_32 Dl_16 'd gg Br_32 dg Cl_16 'c		gg LAr_16 'la Bl_32 	gg Cr_32 dg LAl_16 'la
-
-!t
-
-& sharpf sharpc  	thrd Dr_8 lgstd Dl_8 		gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-!  	thrd Dr_8 lgstd Dl_8 		gg Fr_16 'f Dl_32 HAr_16 'ha Fl_32
-! 	dbe Er_8 grp El_8 		gg Er_16 'e HGl_32	 tg Fr_32 El_16 'e
-! 	thrd Dr_8 gg Fl_8 		thrd D_8 		!I
\ No newline at end of file
diff --git a/fullscores/2-4_marches/black_bear/black_bear.full.ly b/fullscores/2-4_marches/black_bear/black_bear.full.ly
deleted file mode 100644
index 6a236c7..0000000
--- a/fullscores/2-4_marches/black_bear/black_bear.full.ly
+++ /dev/null
@@ -1,26 +0,0 @@
-\version "2.18.2"
-
-\include "black_bear.pipes.ly"
-\include "black_bear.snare.ly"
-
-#(set-default-paper-size "a4landscape")
-
-\score {
-	{
-	\new StaffGroup <<
-		\new Staff \with {
-		  instrumentName = #"Pipes"
-		  shortInstrumentName = #"P"
-		} \pipes
-		\new DrumStaff \with {
-		  instrumentName = #"Snare"
-		  shortInstrumentName = #"S.D."
-		} \snare
-	>>
-	}
-}
-\header {
-	title = "Black Bear"
-	meter = "March"
-	instrument = ""
-}
\ No newline at end of file
diff --git a/fullscores/2-4_marches/black_bear/black_bear.head.ly b/fullscores/2-4_marches/black_bear/black_bear.head.ly
deleted file mode 100644
index 5fdcae4..0000000
--- a/fullscores/2-4_marches/black_bear/black_bear.head.ly
+++ /dev/null
@@ -1,6 +0,0 @@
-\version "2.18.2"
-
-\header {
-	title = "Black Bear"
-	meter = "March"
-}
diff --git a/fullscores/2-4_marches/black_bear/black_bear.pipes.ly b/fullscores/2-4_marches/black_bear/black_bear.pipes.ly
deleted file mode 100644
index 2f3f5d7..0000000
--- a/fullscores/2-4_marches/black_bear/black_bear.pipes.ly
+++ /dev/null
@@ -1,46 +0,0 @@
-\include "bagpipe_new.ly"
-pipes = {
-
-
-	\time 2/4
-    \bagpipeKey
-    \quarterBeaming
-
-	% Part 1
-	\repeat volta 2 {
-		\partial 8 \grg a16. [ b32 ] |
-		\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-		\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-		\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
-		\grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 ] \grg c32 [ \grd a16. ] |
-
-		\break
-
-		\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-		\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-		\dble e8 [ \grip e8 ] \grg e16. [ g32 ] \grA f32 [ e16. ] |
-		\thrwd d8 [ \grg f8 ] \thrwd d8
-	}
-
-	\break
-
-	% Part 2 ( Part 2.2 = Part 1)
-		e8 |
-		\grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
-		\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
-		\grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
-		\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
-
-		\break
-
-		A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] |
-		\grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] |
-		\grg d32 [ f16. ] \grg d32 [ f16. ] e16. [ g32 ] \grA f32 [ g16. ] |
-		A8 [ \grip A8 ] \grg A16. [ g32 f16. ] e32 ] \bar ".|"
-  }
-\header {
-	title = "The Black Bear Hornpipe"
-	meter = "March"
-	arranger = "Trad."
-	instrument = "Bagpipes"
-}
\ No newline at end of file
diff --git a/fullscores/2-4_marches/black_bear/black_bear.snare.ly b/fullscores/2-4_marches/black_bear/black_bear.snare.ly
deleted file mode 100644
index 4fa2752..0000000
--- a/fullscores/2-4_marches/black_bear/black_bear.snare.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\version "2.18.2"
-
-\include "lilydrum.ly"
-
-snare =	{
-
-		% Part 1
-			\repeat volta 2 {
-				\partial 8 d8:32( |
-				g16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d8 d32 g32 d32 g32 d4 |
-				r4^\markup {\bold HOI} d8:32( g8:32)(-> |
-
-				\break
-
-				d16.) \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d16. \parenthesize g32 \flamd d16. g32 d16. \flamg g32 d16. g32 |
-				\flamd d4 d4:32( |
-				d8) \flamg g8 \flamd d8
-
-			}
-
-			\break
-
-		% Part 2 ( Part 2.2 = Part 1)
-				d8
-				d4:32( d4:32)( |
-				d8) g16. d32-> g16. g32 \flamd d16. g32 |
-				d4:32( d4:32)( |
-				d8) g16. d32-> g16. g32 \flamd d16. g32 |
-
-				\break
-
-				d4:32( d8.:32)( g16:32)( |
-				d8:32)( g8:32)( d4)( |
-				g8:32)( d8:32)( g16.) d32-> g16. g32 |
-				\flamd d8 d8:32( g8) \bar "|."
-
-	}% End of drums %
-
-
-\header {
-	title = "Black Bear"
-	meter = "March"
-	composer = "E.T. de Boone, 2015"
-	instrument = "Snare"
-}
\ No newline at end of file
diff --git a/fullscores/template.ly b/fullscores/template.ly
deleted file mode 100755
index 704b22d..0000000
--- a/fullscores/template.ly
+++ /dev/null
@@ -1,95 +0,0 @@
-\version "2.19.22"
-
-print_pipes = #f
-print_snare = #f
-print_tenor = #f
-print_bass  = #f
-
-file_pipes = "Pipes"
-file_snare = "Snare"
-file_tenor = "Tenor"
-file_bass  = "Bass"
-
-composer_pipes = "Trad."
-composer_snare = "Dean Hall, 1999"
-composer_tenor = "Dean Hall, 1999"
-composer_bass  = "Dean Hall, 1999"
-
-
-%=======================================%
-%	You should not have to touch below	%
-%=======================================%
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-#(if (\print_pipes)	(music_pipes = \include \file_pipes))
-#(if (\print_snare)	(music_snare = \include \file_snare))
-#(if (\print_tenor)	(music_tenor = \include \file_tenor))
-#(if (\print_bass)	(music_bass	 = \include \file_bass ))
-
-#(ly:set-option 'point-and-click #f)
-\paper{
-	ragged-bottom = ##t
-}
-
-\score {
-	{
-		<<
-			#(if (\print_pipes)	(
-				\new Staff = "staff_pipes" {
-					\set Staff.instrumentName = #"Pipes"
-					\set Staff.shortInstrumentName = #"P."
-
-					\music_pipes
-				}
-			))
-			#(if (\print_snare)	(
-				\new DrumStaff = "staff_snare" {
-					\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
-					\set Staff.instrumentName = #"Snare"
-					\set Staff.shortInstrumentName = #"S.D."
-
-					\music_snare
-				}
-			))
-			#(if (\print_tenor)	(
-				\new DrumStaff = "staff_tenor" {
-					\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
-					\set Staff.instrumentName = #"Tenor"
-					\set Staff.shortInstrumentName = #"T.D."
-
-					\music_tenor
-				}
-			))
-			#(if (\print_bass)	(
-				\new DrumStaff = "staff_bass" {
-					\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
-					\set Staff.instrumentName = #"Bass"
-					\set Staff.shortInstrumentName = #"B.D."
-
-					\music_bass
-				}
-			))
-		>>
-	}
-}
-\header {
-	title = "Title"
-	meter = "Meter"
-	subtitle = "Subtitle"
-    subsubtitle = "Subsubtitle"
-
-    composer = \markup {
-					\column {
-						#(if (\print_pipes)	(\line{Pipes: \composer_pipes}))
-						#(if (\print_snare)	(\line{Snare: \composer_snare}))
-						#(if (\print_tenor)	(\line{Tenor: \composer_tenor}))
-						#(if (\print_bass )	(\line{Bass: \composer_bass}  ))
-					}
-				}
-    arranger = "Arranger"
-      % The following fields are centered at the bottom
-    tagline = "tagline goes at the bottom of the last page"
-    copyright = "copyright goes at the bottom of the first page"
-}
\ No newline at end of file
diff --git a/header_book.ily b/header_book.ily
new file mode 100755
index 0000000..b4e9177
--- /dev/null
+++ b/header_book.ily
@@ -0,0 +1,42 @@
+%{
+    Header formatting for tunes. Customize to get your name in the tag line.
+%}
+
+\version "2.16.0"
+
+today = #(strftime "%B %e, %Y" (localtime (current-time)))
+
+\paper {
+    raggedbottom = ##t
+    tagline = \markup {
+        \line {
+            "Cpl Eric Teunis de Boone, Seaforths of Holland,"
+            \concat { "(rev. " \today ")" }
+        }
+    }
+    bookTitleMarkup = \markup {
+      \override #'(baseline-skip . 3.5)
+      \column {
+        \fill-line { \fromproperty #'header:dedication }
+        \override #'(baseline-skip . 3.5)
+        \column {
+          \huge \larger \bold
+          \fill-line {
+            \larger \fromproperty #'header:title
+          }
+          \fill-line {
+            \large \smaller \bold
+            \larger \fromproperty #'header:subtitle
+          }
+          \fill-line {
+            \smaller \bold
+            \fromproperty #'header:source
+          }
+          \fill-line {
+          \line { \fromproperty #'header:meter }
+          \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
+          }
+        }
+      }
+    }
+}
diff --git a/header_default.ily b/header_default.ily
new file mode 100755
index 0000000..2be6319
--- /dev/null
+++ b/header_default.ily
@@ -0,0 +1,33 @@
+%{
+    Header formatting for tunes. Customize to get your name in the tag line.
+%}
+
+\version "2.16.0"
+
+today = #(strftime "%B %e, %Y" (localtime (current-time)))
+
+\paper {
+    raggedbottom = ##t
+    tagline = \markup {
+        \line {
+			"Cpl ET de Boone, Seaforths of Holland,"
+            \concat { "(rev. " \today ")" }
+        }
+    }
+    scoreTitleMarkup = \markup {
+        \override #'(baseline-skip . 3)
+        \column {
+            \fill-line {
+                \column {
+                    \large \bold \fromproperty #'header:title
+                    \bold \fromproperty #'header:subtitle
+                }
+                \fromproperty #'header:meter
+                \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
+            }
+            $(if (not (ly:get-option 'without-comment))
+                 (markup #:justify-field 'header:comment)
+                 (markup))
+        }
+    }
+}
diff --git a/lilydrum.ly b/lilydrum.ly
index 9dfb364..81a77e6 100755
--- a/lilydrum.ly
+++ b/lilydrum.ly
@@ -48,8 +48,8 @@ drumPitchNames =
 #(define pipeband-style '(
 	(right-hand	()	#f	1)
 	(left-hand	()	#f	-1)
-	(right-backstick cross	#f	1)
-	(left-backstick	cross	#f	-1)
+	(right-crossstick cross	#f	1)
+	(left-crossstick cross	#f	-1)
 	(right-backstick xcircle #f	1)
 	(left-backstick	xcircle	#f	-1)
 	)
@@ -120,14 +120,13 @@ drumPitchNames =
 % 	Define some tweaks for printing nicely			%
 % ===================================================	%\
 
-
 eighthBeaming = {
   \set Score.baseMoment = #(ly:make-moment 1 8)
   \set Score.beatStructure = #'( 2 )
 }
 sixteenthBeaming = {
   \set Score.baseMoment = #(ly:make-moment 1 16)
-  \set Score.beatStructure = #'( 4)
+  \set Score.beatStructure = #'( 4 )
 }
 
 \layout{
@@ -154,7 +153,7 @@ sixteenthBeaming = {
 % =================================================	%
 backstick	= #(define-music-function (parser location notes) (ly:music?)
 				#{
-					\temporary \override Staff.NoteHead.style = #'triangle
+					\temporary \override Staff.NoteHead.style = \
 					$notes
 					\revert Staff.NoteHead.style
 				#})
@@ -167,31 +166,45 @@ crossstick	= #(define-music-function (parser location notes) (ly:music?)
 rimshot		= #(define-music-function (parser location notes) (ly:music?)
 				#{
 					$notes
-					\once \override Staff.NoteHead.style = #'cross
-					\once \hide Stem
-					d
+
 				#})
 
 % =================================================	%
 % 	Tenor Flourishing								%
 % =================================================	%
+splitTheFeather = \markup{ \musicglyph #"noteheads.s2xcircle"}
+cartWheel = \markup { \musicglyph #"timesig.neomensural94" }
+up = \markup {
+	%	\combine
+			%\tiny \triangle ##t
+			\center-align \draw-line #'(0 . 2)
+		}
+
 flourish = #(define-music-function (parser location notes) (ly:music?)
 				#{
 					\temporary \override Staff.NoteHead.style = #'cross
 					$notes
 					\revert Staff.NoteHead.style
 				#})
-splitTheFeather = #(define-music-function (parser location notes) (ly:music?)
+scoop = #(define-music-function (parser location notes end) (ly:music? ly:music?)
 				#{
-					\temporary \override Staff.NoteHead.style = #'xcircle
-					$notes
-					\revert Staff.NoteHead.style
+					$notes ^\markup { \path
+					$end
 				#})
 
+% stf = \splitTheFeather
+% cart = \cartWheel
+% fl = \flourish
+
 % =================================================	%
 % 	Functions										%
 % =================================================	%
 
+% triplet
+triplet = #(define-music-function (parser location notes) (ly:music?)
+	#{ \tuplet 3/2 { $notes } #}
+	)
+
 % dynamics
 v = #(define-event-function (parser location) ()
   #{ \upbow #}
@@ -319,4 +332,4 @@ sruff = #(define-music-function (parser location note) (ly:music?) #{
           #{ \sruffd #})
 	% print the note, else it won't show up
 	$note
-#})
\ No newline at end of file
+#})
diff --git a/makedrum b/makedrum
index 72a5d13..8c45264 100755
--- a/makedrum
+++ b/makedrum
@@ -13,10 +13,11 @@ class MakeDrum:
 	VERSION  = '0.7'
 	TMP_DIR  = './tmp'
 	TMP_PREFIX = 'tmp_'
+	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
+	RUN_DIR = os.path.abspath(os.curdir)
 
 	def __init__(self):
 		# Gather options and create the template file
-
 		usage = __file__
 		parser = ArgumentParser(usage)
 
@@ -27,6 +28,13 @@ class MakeDrum:
 			action='store_true', dest='show_lilyversion', default=False,
 			help='show Lilypond version and exit')
 
+		parser.add_argument('-x', '--drumfile',
+			dest='lilydrum', default='lilydrum.ly',
+			help='Use the specified file for drums')
+		parser.add_argument('-c', '--pipefile',
+			dest='lilypipe', default='bagpipe.ly',
+			help='Use the specified file for pipes')
+
 		parser.add_argument('-p', '--paper-size',
 			dest='papersize', default='a4',
 			help='Paper size. Default: A4')
@@ -34,7 +42,7 @@ class MakeDrum:
 			dest='orientation', default='landscape',
 			help='Paper orientation. Default: landscape')
 		parser.add_argument('-s', '--staff-size',
-			dest='staffsize', default='16',
+			dest='staffsize', default='20',
 			help='Staff size. Default: 16pt.')
 		parser.add_argument('-f', '--format',
 			dest='format', default=None,
@@ -49,6 +57,9 @@ class MakeDrum:
 		parser.add_argument('--no-cleanup',
 			action='store_false', dest='clean', default=True,
 			help='Leave all temporary files in place')
+		parser.add_argument('-d', '--out_dir',
+			dest='out_dir', default='pdf',
+			help='Output dir, for lilypond. If it doesn\'t exist, try to create it')
 		parser.add_argument('music_file',
 			default='', nargs='+',
 			help='file to process')
@@ -58,6 +69,7 @@ class MakeDrum:
 
 		self.args = parser.parse_args()
 
+		print(self.RUN_DIR)
 		if self.args.show_version:
 			print(__name__, ' ', self.VERSION)
 			return
@@ -84,17 +96,24 @@ class MakeDrum:
 			except:
 				print('Seems like no temporary directory can be created')
 				return
+		if not os.path.exists(os.path.join(os.path.curdir, self.args.out_dir)):
+			try: os.makedirs(os.path.join(os.path.curdir, self.args.out_dir))
+			except:
+				print('Seems like no output directory can be created')
+				return
 
-
+		os.chdir(self.MASTER_DIR)
 		for file_path in self.args.music_file:
-			self.processit(self.TMP_DIR, file_path)
+			self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path))
 
 		#if not
 		#os.rmdir(self.TMP_DIR)
 
+		os.chdir(self.RUN_DIR)
+
 	def processit(self, tmp_dir, file):
 		if self.args.log:
-				logfile = os.path.join(self.TMP_DIR, file.strip('.ly').replace('/', '-')+'.log')
+				logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).strip('.ly').replace('/', '-')+'.log')
 				log = ' > '+logfile+' 2>&1'
 		else:
 			log = ''
@@ -108,22 +127,51 @@ class MakeDrum:
 		tmp_file = self.maketemplate(tmp_dir, file, header_format)
 
 		print ('Compiling ', file, end=' ', flush=True)
+		if not self.args.log:
+			print()
 
-		lilycmd = self.LILYPOND+' --pdf --output=./pdf/'+os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('ly')+' '+tmp_file+log
+		lilyout = os.path.join(os.path.curdir, self.args.out_dir, os.path.basename(tmp_file).strip(self.TMP_PREFIX).strip('.ly'))
+		lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log
 
 		if os.system(lilycmd) != 0:
 			self.remove_tmp_dir = False
 			print ('[Error]')
-			print (' ! Did not compile, please see the log at ', logfile)
+			if self.args.log:
+				print (' ! Did not compile, please see the log at ', logfile)
 		else :
 			print ('[OK]')
-			os.remove(logfile)
-			os.remove(tmp_file)
+
+			if self.args.clean:
+				#remove files
+				if self.args.log:
+					os.remove(logfile)
+				os.remove(tmp_file)
 
 
 	def maketemplate(self, tmp_dir, file, header_format):
+		lily_includes = ''
+		include_drum_file = False
+		include_pipe_file = False
+		# find out whether drum, pipes, or full score
+		for ext in ['.full', '.side', '.tenor', '.bass', '.drum', '.snare']:
+			if ext in file:
+				include_drum_file = True
+
+		for ext in ['.full', '.pipes']:
+			if ext in file:
+				include_pipe_file = True
+
+		if include_drum_file:
+			lily_includes = lily_includes + u"""
+\\include \""""+self.args.lilydrum+"""\"
+"""
+		if include_pipe_file:
+			lily_includes = lily_includes + u"""
+\\include \""""+self.args.lilypipe+"""\"
+"""
+
 		# set up a tmp file with template and file combined
-		tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + file.replace('/', '-'))
+		tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-'))
 
 		out_file = codecs.open(tmp_file, 'w+', 'utf8')
 		out_file.write(u'\ufeff')
@@ -139,8 +187,7 @@ class MakeDrum:
 #(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""")
 
 \\include "../"""+header_format+""".ily"
-\\include "lilydrum.ly"
-
+"""+ lily_includes +"""
 % Local tweaks
 \\paper {
 	ragged-bottom = ##t
@@ -171,4 +218,4 @@ class MakeDrum:
 		return tmp_file
 
 
-MakeDrum();
\ No newline at end of file
+MakeDrum();
diff --git a/other/band_of_brothers.snare.ly b/other/band_of_brothers.snare.ly
new file mode 100755
index 0000000..03b1cef
--- /dev/null
+++ b/other/band_of_brothers.snare.ly
@@ -0,0 +1,50 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\score {
+	\new DrumStaff = "staff_snare" {
+		\set DrumStaff.drumStyleTable = #(alist->hash-table pipeband-style)
+
+		\drummode {
+			\time 3/4
+			R1*4
+			\bar "||"
+			s16^ \markup "A"
+			R1*35
+			\bar "||"
+
+			\time 4/4
+
+			s16^ \markup "B"
+			sn4 \tuplet 3/2 {r8 sn8 sn8 } r4 |
+			\grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 |
+			\grace { sn16 sn16 sn16 sn16} \tuplet 3/2 { sn4 sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn4 sn8 } r4
+
+			\time 2/4
+
+			sn2:16(
+
+			\time 4/4
+
+			\tuplet 3/2 { sn4) sn8 } \tuplet 3/2 { r8 sn8 sn8 } \tuplet 3/2 { sn8 sn8 sn8} \tuplet 3/2 { sn8 sn8 sn8}
+			\bar "||"
+			s16^\markup "C"
+
+			\repeat volta 2 {
+				\grace sn8 sn4 \tuplet 3/2 { r8 sn8 sn8 } sn4 r4 |
+				\grace { sn16 sn16 sn16 sn16 }
+			}
+
+		}
+	}
+
+}
+
+	\header {
+		title = "Band of Brothers"
+		subtitle = "for the Edinburgh Military Tattoo 2005"
+		arranger = "Michael Kamen, arr. Richard Barriball"
+		instrument = "Snare Drum"
+		meter = ""
+	}
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index ecc58fb..2c875c1 100755
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -21,6 +21,7 @@
 			d8-> g  d g |
 			d4-> r  |
 			\bar "||"
+		\break
 			\flourish {
 				d4 d |
 				g4 g |
@@ -49,6 +50,7 @@
 			d8.-> g16 d8 g r g |
 			d4-> d8 g d4 |
 			\bar "||"
+		\break
 			\flourish{
 				d4-> d d |
 				g4-> g g |
@@ -73,12 +75,13 @@
 			d8-^ g d g d-> g d g |
 			d4-^ g d r |
 			\bar "||"
+		\break
 			\flourish {
 				d4 d g g |
 				d4 d g g |
 				d4 d g g |
 			}
-			\flourish d4 \flourish g \splitTheFeather d r |
+			\flourish d4 \flourish g d^\splitTheFeather r |
 		}
 	}
 
@@ -93,14 +96,15 @@
 
 		\repeat volta 2 {
 			\flourish d4. \flourish g |
-			\splitTheFeather d r |
+			d^\splitTheFeather r |
 			d g |
 			d8 r8 g8 d4. |
 			\flourish d4. \flourish g |
-			\splitTheFeather d r |
+			d^\splitTheFeather r |
 			d g |
 			d8 r8 g8 d4. |
 			\bar "||"
+		\break
 			\flourish {
 				d4. d |
 				g g |
@@ -110,7 +114,7 @@
 				g g |
 				d g |
 			}
-			\splitTheFeather d r |
+			d^\splitTheFeather r |
 
 		}
 	}
@@ -118,4 +122,4 @@
 	\header {
 		title = "6/8 Standards"
 	}
-}
\ No newline at end of file
+}
diff --git a/strathspeys/molly_connell.bass.ly b/strathspeys/molly_connell.bass.ly
index b21417b..215a71b 100755
--- a/strathspeys/molly_connell.bass.ly
+++ b/strathspeys/molly_connell.bass.ly
@@ -3,7 +3,7 @@
 \include "lilydrum.ly"
 
 \score {
-	\drums {
+	\drummode {
 		\numericTimeSignature
 		\time 4/4
 
diff --git a/TODO b/todo (hoofdletterconflict)
similarity index 94%
rename from TODO
rename to todo (hoofdletterconflict)
index 41f2f2e..ffa8f8b 100755
--- a/TODO
+++ b/todo (hoofdletterconflict)	
@@ -26,5 +26,5 @@ TODO
 	ups					\up								arrow-up
 	scoop				\scoop							arrow-right-(diag-up\diag-down) [propably start on beginning of note and filter out the last one]
 	split the feather	\stf	\splitTheFeather		xcircle
-	cartwheel			\cart	\cartwheel
+	cartwheel			\cart	\cartwheel				circle with dot
 	(further EUSPBA symbols)
\ No newline at end of file