diff --git a/.gitignore b/.gitignore
index 967a2b9..8dd944d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 to_process/
+piobaireachd/
 sets/
diff --git a/2-4_marches/black_bear/.tenor.ly.swp b/2-4_marches/black_bear/.tenor.ly.swp
new file mode 100644
index 0000000..1365de3
Binary files /dev/null and b/2-4_marches/black_bear/.tenor.ly.swp differ
diff --git a/2-4_marches/black_bear/drums.ly b/2-4_marches/black_bear/drums.ly
index de18baa..700ad8f 100644
--- a/2-4_marches/black_bear/drums.ly
+++ b/2-4_marches/black_bear/drums.ly
@@ -33,10 +33,10 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			\tenorA s8
+			r8 \tenorA s8
 
-			\tenorBA
-			\tenorBB
+			\tenorB
+			\tenorA s8
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
@@ -45,7 +45,7 @@
 
 			r8 \bassA s8
 			\bassB
-			\bassA
+			\bassA s8
 
 		}
 	>>
diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly
index 2da6300..8b2a155 100644
--- a/2-4_marches/black_bear/full.ly
+++ b/2-4_marches/black_bear/full.ly
@@ -3,9 +3,6 @@
 \include "bagpipe.ly"
 \include "lilydrum.ly"
 
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.bass.ily"
 \include "./notes.tenor.ily"
@@ -48,10 +45,10 @@
 
 			\tenorglobal
 
-			\tenorA s8
+			r8 \tenorA s8
 
-			\tenorBA
-			\tenorBB s8
+			\tenorB
+			\tenorA s8
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
diff --git a/2-4_marches/black_bear/mid.ly b/2-4_marches/black_bear/mid.ly
new file mode 100644
index 0000000..fba3590
--- /dev/null
+++ b/2-4_marches/black_bear/mid.ly
@@ -0,0 +1,180 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\score {
+	\new StaffGroup <<
+<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
+		\new PipeBandDrumStaff = "side" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+				<<
+				\new NullVoice = "format" {
+					\mark \markup { \normalsize {Intro } }
+					\emptyline
+					\bar "|."
+					
+					\mark \markup { \normalsize {Tune } }
+				  	\line \break
+					\line \break
+					\bar "|."
+	
+					\part \line \break
+					\line \break
+					\bar "|."
+				}%Format
+	
+				\new DrumVoice = "side" {
+					\intro
+					\snareA s8
+					\snareA s8
+			
+					\snareBA
+					\snareBB
+				
+				}%Pipes
+||||||| merged common ancestors
+		\new PipeBandDrumStaff = "side" {
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\global
+			<<
+				{
+					\line \break
+					\line \break
+					\bar "|."
+
+					\part \line \break
+					\part \line \break
+					\bar "|."
+			}%End of Format
+				{
+					\snareA
+					s8
+					\snareA
+					s8
+
+					\snareBA
+					\snareBB
+				}
+=======
+		\new PipeBandDrumStaff = "tenor" {
+		  \global
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+<<
+				\new NullVoice = "format" {
+					\repeat volta 2 { \part \halfline \break \halfline } \break
+					\part \halfline \break \halfline \bar "||" \break
+					\line \bar "|."
+				}%End of Format
+				\new DrumVoice = "side" {
+					r8 \tenorA s8
+
+					\tenorB
+					\tenorA s8
+				}%End of side
+>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
+			>>
+<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
+||||||| merged common ancestors
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+=======
+
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
+
+<<<<<<< Updated upstream:strathspeys/molly_connell/drums.ly
+			}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+	
+			\emptyline
+	
+			\tenorA
+			\tenorA
+	
+			s8 \tenorBA
+			\tenorBB
+||||||| merged common ancestors
+			\bassAA
+			\bassAB
+
+			s8
+			\bassAA
+			s8
+			\bassAB
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+			\tenorA
+
+			s8
+			\tenorBA
+			s8
+			\tenorBB
+=======
+			r8 \bassA s8
+			\bassB
+			\bassA s8
+
+>>>>>>> Stashed changes:2-4_marches/black_bear/mid.ly
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+	
+			\emptyline
+	
+			\bassAA
+			\bassAB
+	
+			s8 \bassAA
+			\bassAB
+		}
+	>>
+	\layout {
+		\context {
+			\PipeBandDrumStaff
+			\RemoveEmptyStaves
+			\override VerticalAxisGroup.remove-first = ##t
+		}
+	}
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/2-4_marches/black_bear/notes.bass.ily b/2-4_marches/black_bear/notes.bass.ily
index d72c965..8eeb7ab 100644
--- a/2-4_marches/black_bear/notes.bass.ily
+++ b/2-4_marches/black_bear/notes.bass.ily
@@ -1,50 +1,38 @@
 % 2/4 Black Bear>
 % Bass
 \version "2.18.2"
-composerBass  = "E.T. de Boone, 2016"
+composerBass  = "E.T. de Boone, v0.9, 2016"
 bassglobal = {}
 % Music
 bassA = \drummode {
-	d8 g
-	d4
-	|
-	d8 g8
-	d4
-	|
+	\repeat unfold 2 {
+		d4--	g4-^	|
+	}
 	d8 d8
 	g4
 	|
-	r4
-	g8 d8
+	d4\v
+	d8\p\< g8
 	
 	|
-	d8 g
-	d4
+	\repeat unfold 2 {
+		d4--\!	g4-^	|
+	}
 	|
 	d8 g
 	d4
 	|
-	d8. g16
-	d8 g8
-	|
-	d8 g8
+	r8 g
 	d8
 
 }
 bassB = \drummode {
 	g8
 	|
-	d4
-	g4
-	|
-	d4
-	r4
-	|
-	d4
-	g4
-	|
-	d4
-	r4
+	\repeat unfold 2 {
+		d4\<	g4	|
+		d4\!	r4	|
+	}
 
 	|
 	d4
diff --git a/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily
index 8a4e36a..b92a724 100644
--- a/2-4_marches/black_bear/notes.pipes.ily
+++ b/2-4_marches/black_bear/notes.pipes.ily
@@ -2,6 +2,9 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "1936"
+pipeglobal = {
+  \bagpipeKey
+}
 pipesA = {
 	\grg a16. [ b32 ] |
 	\thrwd d8 [ \dbld d8 ] \grg f16.[  d32  A16.  f32  ]|
diff --git a/2-4_marches/black_bear/notes.tenor.ily b/2-4_marches/black_bear/notes.tenor.ily
index 42824e6..477fdf5 100644
--- a/2-4_marches/black_bear/notes.tenor.ily
+++ b/2-4_marches/black_bear/notes.tenor.ily
@@ -1,67 +1,39 @@
 % 2/4 Black Bear
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.6, 2016"
+composerTenor = "E.T. de Boone, v0.9, 2016"
 tenorglobal = {}
 % Music
-tenorApiece = \drummode {
-	d8 g8
-	\triplet { d16 g d } g8
+tenorA = \drummode {
+	d8 g8 	d4
 	|
-	d8 g8
-	\triplet { d16 g d } g8
+	d8 g8 	d4
 	|
-	d8 d8
-	g4
+	d8 \triplet { d16 g d} 	g4
 	|
-	d4^\splitTheFeather
-	r8 \triplet { g16 d g }
+	d4^\parenthesize \splitTheFeather		r4
 	|
 	
-	d8 g8
-	\triplet { d16 g d } g8
+	d8 g8	d4
+	|
+	d8 g8	d4
+	|
+	d8 d16. g32	d16 g8-> g16
 	|
 	d8 g8
-	\triplet { d16 g d } g8
-	|
-	d8 g16. g32
-	d16. g8 d32
-	|
-	d8 d8
-	g8
-}
-tenorA = \drummode {
-	g8 |
-	\tenorApiece
+	d8
 }
 
-tenorBA = \drummode {
+tenorB = \drummode {
 	g8 |
-	d16. g32 d16. d32
-	g4
-	|
-	r4
-	d32 g16. g32 d16.
-	|
-	d16. g32 d16. d32
-	g4
-	|
-	r4
-	d32 g16. g32 d16.
-	|
+	\repeat unfold 2 {
+		d8 g8 d8 g8|
+		r16 g8 g16 \triplet { d16 g d } g8 |
+	}
 
-	d32 g16. g32 d16.
-	d32 g16. g32 d16.
-	|
-	g32 d16. g32 d16.
-	g32 d16. g32 d16.
-	|
-	d16. g32 d16. d32
-	g16. d32 g16. g32
-	|
-	d4
-	d16. g32 g16. d32
-}
-tenorBB = \drummode {
-	\tenorApiece
+
+	d4 g8. g16 |
+	d8 g d4 |
+	d8 d g g |
+	d4^\parenthesize \splitTheFeather	r4
 }
diff --git a/2-4_marches/black_bear/pipes.ly b/2-4_marches/black_bear/pipes.ly
index 2900cc2..4dd099c 100644
--- a/2-4_marches/black_bear/pipes.ly
+++ b/2-4_marches/black_bear/pipes.ly
@@ -10,7 +10,7 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
 			{
 				\repeat volta 2 {
@@ -34,3 +34,21 @@
 		composer = \composerPipes
 	}
 }
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA
+		\pipesA
+		\pipesB
+		\pipesCA
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/2-4_marches/black_bear/tenor.ly b/2-4_marches/black_bear/tenor.ly
index 9357c90..1432f4c 100644
--- a/2-4_marches/black_bear/tenor.ly
+++ b/2-4_marches/black_bear/tenor.ly
@@ -22,10 +22,10 @@
 			
 			}%Format
 			{
-				\tenorA  s8
+				r8 \tenorA  s8
 
-				\tenorBA
-				\tenorBB
+				\tenorB
+				\tenorA s8
 			
 			}
 	>>
@@ -37,3 +37,28 @@
 		composer = \composerTenor
 	}
 }
+
+midiTenor = midiDrumPitches
+midiTenor.right-hand = \tenorDefault
+midiTenor.left-hand = \tenorDefault
+\score {
+	\new PipeBandDrumStaff 
+	\with {
+		drumPitchTable = #(alist->hash-table midiTenor)
+	}
+	{ \global \tenorglobal
+		%%Tune
+		\tenorA 
+		r8 \tenorA
+		
+		\tenorB
+		\tenorA r8
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
index c07685d..10bfc61 100644
--- a/2-4_marches/caller_herrin/pipes.ly
+++ b/2-4_marches/caller_herrin/pipes.ly
@@ -14,7 +14,7 @@
 		<<
 			{
 				\repeat volta 2 {
-					\part \line
+					\part \halfline
 				}\break
 
 				\part \halfline \line
diff --git a/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly
index 0cf60f0..30e1e3c 100644
--- a/2-4_marches/duncan_mcinness/side.ly
+++ b/2-4_marches/duncan_mcinness/side.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
@@ -33,4 +31,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/2-4_marches/mackenzie_highlanders/config.ily b/2-4_marches/mackenzie_highlanders/config.ily
index 8aed0e2..1821533 100644
--- a/2-4_marches/mackenzie_highlanders/config.ily
+++ b/2-4_marches/mackenzie_highlanders/config.ily
@@ -5,7 +5,7 @@ global = {
 	}
 confTempo = { \tempo 4 = 90 } 
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace{s4} s8 }
 measure = { \grace { s4 } s2 | }
 halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily b/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
index 7465179..5ed97aa 100644
--- a/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
@@ -7,7 +7,7 @@ tenorglobal = {
 }
 % Music
 
-tenorA = \drummode {
+tenorAold = \drummode {
 	g8 |
 	d4 d8 g |
 	d8 \< g8 d4 \! |
@@ -19,7 +19,7 @@ tenorA = \drummode {
 	d16-> g16 r8	g16-> g8 g16 |
 	d4 g4 |
 }
-tenorA = \drummode {
+tenorAvold = \drummode {
 	s8 |
 	d4 g4 |
 	d4 d8 g |
@@ -31,13 +31,31 @@ tenorA = \drummode {
 	d16-> g16 r8	g16-> d8 g16 |
 	d4 g4 |
 }
-tenorBA = \drummode {
-s2*4 |
+tenorA = \drummode {
+	s8 |
+	d8 g d g |
+	d8-> g16\< g	r16 d16\< g8 |
+	d4 g4 |
+	d4 r4 |
 
-s2*4 |
-}
-tenorBB = \drummode {
-s2*4 |
-s2*4 |
+	d8 g d g |
+	d4 g4 |
+	d8. g16 r8 d8 |
+	g8 d d4 |
 }
+tenorB = \drummode {
+	d4 g4 |
+	d8. g16 r8 d8 |
+	d8 g d4 |
+	d4 g4 |
+
+	d8 g d4 |
+	d8. g16 r8 d8 |
+	d4 g4 |
+	d8 g d4
+}
+%tenorBB = \drummode {
+%s2*4 |
+%s2*4 |
+%}
 
diff --git a/2-4_marches/mackenzie_highlanders/tenor.alt.ly b/2-4_marches/mackenzie_highlanders/tenor.alt.ly
index ef9930a..3a3d0ec 100644
--- a/2-4_marches/mackenzie_highlanders/tenor.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/tenor.alt.ly
@@ -1,15 +1,21 @@
 \version "2.18.2"
 
 \include "lilydrum.ly"
+\include "bagpipe.ly"
+
+\include "./notes.pipes.ily"
+\include "./notes.bass.ily"
+\include "./notes.side.ily"
 
 \include "./config.ily"
 \include "./notes.tenor.alt.ily"
 
 \score {
-    \new PipeBandDrumStaff {
-	\global
-	\tenorglobal
-	<<
+  \new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+		\tenorglobal
+			\global
+		<<
 			{
 				\repeat volta 2 {
 					\part \line
@@ -17,16 +23,44 @@
 				\break
 
 				\part \line \bar "||" \break
+
 				\line \bar "|."
 			}%Format
 			{
-				\tenorA s8
+				\tenorA
 
-				\tenorBA
-				\tenorBB s8
+				\tenorB
+				\tenorB
 			}
+		>>
+		}
+		\new PipeBandDrumStaff = "bass" {
+		  \tenorAold
+		}
+
+		\new PipeBandDrumStaff {
+		  \tenorAvold
+		}
+		\new Staff {
+			\pipesA
+
+			\pipesB
+			\pipesBA s8
+			\pipesBB
+		}
+		\new PipeBandDrumStaff {
+			s8 \bassA
+
+			s8 \bassBA
+			\bassBB
+		}
+		\new PipeBandDrumStaff {
+			\snareA s8
+
+			\snareBA
+			\snareBB
+		}
 	>>
-	}
 	\header {
 		title = \title
 		meter = \meter
diff --git a/3-4_marches/shoals_of_herring/notes.pipes.ily b/3-4_marches/shoals_of_herring/notes.pipes.ily
index 173555c..e12d50d 100644
--- a/3-4_marches/shoals_of_herring/notes.pipes.ily
+++ b/3-4_marches/shoals_of_herring/notes.pipes.ily
@@ -6,27 +6,27 @@ pipeglobal = {
 	\bagpipeKey
 	}
 pipesA = {
-	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
-	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
-	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] |
+	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 |
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] |
 	\dblA A8 [ c8 ] \dblc c4 \gre b4 
 }
 pipesAB = {
-	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
-	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
-	\grg a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] |
+	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 |
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] |
 	\thrwd d8. [ c16 ] \dblb b4 \grG a4 
 }
 
 pipesB = {
-	A8. [ g16 ] \grA f4 A8. [ g16 ] \bar "|"
-	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
-	A8. [ f16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
-	\dblA A8 [ c8 ] \dblc c4 \gre b4 \bar "|" \break
+	A8. [ g16 ] \grA f4 A8. [ g16 ] |
+	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 |
+	A8. [ f16 ] \dble e4 \dblc c8 [ e8 ] |
+	\dblA A8 [ c8 ] \dblc c4 \gre b4 |
 }
 pipesBA = {
-	A8. [ g16 ] \grA f4 A8. [ g16 ] \bar "|"
-	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
-	a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] \bar "|"
+	A8. [ g16 ] \grA f4 A8. [ g16 ] |
+	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 |
+	a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] |
 	\thrwd d8. [ c16 ] \dblb b4 \grG a4 
 }
diff --git a/4-4_marches/51st_highland_division/notes.tenor.ily b/4-4_marches/51st_highland_division/notes.tenor.ily
new file mode 100644
index 0000000..98439c8
--- /dev/null
+++ b/4-4_marches/51st_highland_division/notes.tenor.ily
@@ -0,0 +1,21 @@
+% 4/4 51st Highland Division
+% Tenor
+\version "2.18.2"
+composerTenor = "v1.0, 2012"
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorAA = \drummode {
+	g8 |
+	d4 g d8[ g] d[ g] |
+	d4 g d8[ g] d[ g] |
+	d4 d8[ g] d4 d8[ g] |
+	d4 g d r8 
+}
+tenorAB = \drummode {
+	g8 |
+	d4 g d r8 g8 |
+	d4 g d8[ g] d[ g] |
+	d4 g d8[ g] d[ g] |
+	d4 g d r8
+}
diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly
index 64a4a4d..c264f2d 100644
--- a/4-4_marches/51st_highland_division/side.ly
+++ b/4-4_marches/51st_highland_division/side.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
diff --git a/4-4_marches/51st_highland_division/tenor.ly b/4-4_marches/51st_highland_division/tenor.ly
new file mode 100644
index 0000000..7e33e5b
--- /dev/null
+++ b/4-4_marches/51st_highland_division/tenor.ly
@@ -0,0 +1,37 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+				\repeat unfold 2 {
+					\repeat repeat 2 {
+						\partial 8 s8 \line
+						\break
+						\line
+					}
+					\break
+				}
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\tenorAA \tenorAB s8
+				\tenorAA \tenorAB s8
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/4-4_marches/flett_from_flotta/pipes.ly b/4-4_marches/flett_from_flotta/pipes.ly
index 1826fb1..a74e8b6 100644
--- a/4-4_marches/flett_from_flotta/pipes.ly
+++ b/4-4_marches/flett_from_flotta/pipes.ly
@@ -12,12 +12,12 @@
 		<<
 			{
 				\repeat volta 2 {
-					\partial 4 s4
+					\part
 					\line \break
 					\line \break 
 				}
 				\repeat volta 2 {
-					\partial 4 s4
+					\part
 					\line \break
 					\line \break
 				}
diff --git a/4-4_marches/the_crusaders_march/config.ily b/4-4_marches/the_crusaders_march/config.ily
index 069b833..c4b1494 100644
--- a/4-4_marches/the_crusaders_march/config.ily
+++ b/4-4_marches/the_crusaders_march/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4 = 80 
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 4 \grace{s4} s4 }
 measure = { \grace { s4 } s1 | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/4-4_marches/the_crusaders_march/drums.ly b/4-4_marches/the_crusaders_march/drums.ly
new file mode 100644
index 0000000..e7e22f8
--- /dev/null
+++ b/4-4_marches/the_crusaders_march/drums.ly
@@ -0,0 +1,69 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+%\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			<<
+				\new NullVoice = "format" {
+					\part \line
+					\line
+					\bar "|."
+					\break
+					\line
+					\line
+					\bar "|."
+				}%End of Format
+				\new DrumVoice = "side" {	
+					s8 \snareAA r8
+					\snareAB
+
+					\snareBA r8
+					\snareBB r8 s8
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+
+			\tenorB s4
+		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/4-4_marches/the_crusaders_march/full.ly b/4-4_marches/the_crusaders_march/full.ly
new file mode 100644
index 0000000..e53fda8
--- /dev/null
+++ b/4-4_marches/the_crusaders_march/full.ly
@@ -0,0 +1,107 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "./config.ily"
+%\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.ily"
+\include "./notes.pipes.ily"
+%\include "./notes.pipes.seconds.ily"
+%\include "./notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new NullVoice = "format" {
+					\part \line
+					\line
+					\bar "|."
+					\break
+					\line
+					\line
+					\bar "|."
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+
+					\pipesB
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics" {
+%				
+%			}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			s8 \snareAA r8
+			\snareAB
+
+			\snareBA r8
+			\snareBB r8 s8
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+
+			\tenorB s4
+		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/4-4_marches/the_crusaders_march/notes.tenor.ily b/4-4_marches/the_crusaders_march/notes.tenor.ily
new file mode 100644
index 0000000..090b5c6
--- /dev/null
+++ b/4-4_marches/the_crusaders_march/notes.tenor.ily
@@ -0,0 +1,31 @@
+% 4/4 Crusaders March
+% Tenor
+\version "2.18.2"
+composerTenor = "F.J. de Boone, 2015"
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorA = \drummode {
+  r8. g16 |
+  d4 r r r8. g16 |
+  d4 r r r8. g16 |
+  d4 r8 g8 r d r8. g16 |
+  d4 r8. g16 d4 r8. g16 |
+
+  d4 r4 r4 r8. g16 |
+  d4 r4 r4 r8 g8 |
+  r8 d r g r d r g |
+  r8 g r8. g16 d4 g16 d d g |
+}
+
+tenorB = \drummode {
+  d4 r r8 g r8 d|
+  d4 r r8 d r8. g16 |
+  d4 r8 g8 r d r8. g16 |
+  d4 r8. g16 d4 r8. g16 |
+
+  d4 r4 r4 r8. g16 |
+  d4 r4 r4 r8 g8 |
+  r8 d r g r d r g |
+  r8 g r8. g16 d4 
+}
diff --git a/4-4_marches/the_crusaders_march/pipes.ly b/4-4_marches/the_crusaders_march/pipes.ly
index 09e48bf..664aada 100644
--- a/4-4_marches/the_crusaders_march/pipes.ly
+++ b/4-4_marches/the_crusaders_march/pipes.ly
@@ -13,8 +13,10 @@
 		\pipeglobal
 		<<
 			{
-				\part 	\line \bar "|."
+				\part \line
+				\line \bar "|."
 				\break
+				\line
 				\line \bar "|."
 			}
 			{
diff --git a/4-4_marches/the_crusaders_march/side.ly b/4-4_marches/the_crusaders_march/side.ly
index 4a587eb..cc13623 100644
--- a/4-4_marches/the_crusaders_march/side.ly
+++ b/4-4_marches/the_crusaders_march/side.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
diff --git a/4-4_marches/the_crusaders_march/tenor.ly b/4-4_marches/the_crusaders_march/tenor.ly
new file mode 100644
index 0000000..b7c93a9
--- /dev/null
+++ b/4-4_marches/the_crusaders_march/tenor.ly
@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+				\part \line
+				\line
+				\bar "|."
+				\break
+				\line
+				\line
+				\bar "|."
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\tenorA
+				\tenorB s4
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
index 8d3ebe0..77e65ec 100644
--- a/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
+++ b/4-4_marches/the_leaving_of_liverpool/notes.tenor.ily
@@ -1,7 +1,7 @@
 % 4/4 The Leaving of Liverpool
 % Tenor
 \version "2.18.2"
-composerTenor = "F.J. de Boone,2011"
+composerTenor = "F.J. de Boone, v1.0, 2011"
 tenorglobal = {}
 %%music
 tenorA = \drummode {
diff --git a/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly
index 4bd726a..080fc14 100644
--- a/4-4_marches/the_leaving_of_liverpool/tenor.ly
+++ b/4-4_marches/the_leaving_of_liverpool/tenor.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
@@ -11,8 +9,15 @@
     \new PipeBandDrumStaff {
 		\global
         <<
-			{\repeat volta 2 { \partial 16 s16 \line }}
-			{\tenorA d4 r8.}
+			{
+			  \repeat volta 2 { \partial 16 s16 \line }
+			  \break
+			  \repeat volta 2 { \partial 16 s16 \line }
+			}
+			{
+			  \tenorA r8. s16
+			  \tenorA r8. s16
+			}
 		>>
 	}
 	\header {
@@ -21,4 +26,4 @@
 		instrument = \instrumentTenor
 		composer = \composerTenor
 	}
-}
\ No newline at end of file
+}
diff --git a/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp b/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp
new file mode 100644
index 0000000..04d9dd8
Binary files /dev/null and b/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp differ
diff --git a/4-4_marches/the_pikemans_march/.pipes.ly.swp b/4-4_marches/the_pikemans_march/.pipes.ly.swp
new file mode 100644
index 0000000..d682213
Binary files /dev/null and b/4-4_marches/the_pikemans_march/.pipes.ly.swp differ
diff --git a/4-4_marches/the_pikemans_march/notes.pipes.ily b/4-4_marches/the_pikemans_march/notes.pipes.ily
index 38bc38b..4dc6c4b 100644
--- a/4-4_marches/the_pikemans_march/notes.pipes.ily
+++ b/4-4_marches/the_pikemans_march/notes.pipes.ily
@@ -26,6 +26,7 @@ pipesBA = {
  A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] |
  \dblg g8. [ A16 ] g8 [ e8 ] \dblg g4 A16 [ g16 e16 ] g16 ] | 
 }
+
 pipesBB = {
  A8 [ \grg A8 ] A8 [ g8 ] \hdble e8 [ d8 ] d8 [ e8 ] |
  \dblg g8. [ A16 ] g8 [ e8 ] \dbld d8 [ b8 ] \grg G4 |
diff --git a/4-4_marches/the_pikemans_march/pipes.ly b/4-4_marches/the_pikemans_march/pipes.ly
index 5d6dabf..b2fe76f 100644
--- a/4-4_marches/the_pikemans_march/pipes.ly
+++ b/4-4_marches/the_pikemans_march/pipes.ly
@@ -23,7 +23,7 @@
 				\line \break
 			}
 			{ 
-				\pipesA
+				\pipesA s8
 
 				\pipesBA
 				\pipesBB
diff --git a/4-4_marches/the_pikemans_march/pipes.ly~ b/4-4_marches/the_pikemans_march/pipes.ly~
new file mode 100644
index 0000000..5d6dabf
--- /dev/null
+++ b/4-4_marches/the_pikemans_march/pipes.ly~
@@ -0,0 +1,53 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 {
+					\part
+					\line \break
+					\line \break
+				}
+				\part \line \break
+				\line \break
+				\line \break
+			}
+			{ 
+				\pipesA
+
+				\pipesBA
+				\pipesBB
+				\pipesBC
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA
+		\pipesA
+		\pipesBA
+		\pipesBB
+		\pipesBC
+	}
+	\midi { \confTempo }
+}
diff --git a/6-8_marches/10th_hli_crossing_the_rhine/config.ily b/6-8_marches/10th_hli_crossing_the_rhine/config.ily
index 0bcde4e..ecaf225 100644
--- a/6-8_marches/10th_hli_crossing_the_rhine/config.ily
+++ b/6-8_marches/10th_hli_crossing_the_rhine/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4. = 90 
 	}
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace {s4} s8 }
 measure = { \grace { s4 } s1. | }
 halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily b/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
index e9a73c2..6031808 100644
--- a/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
+++ b/6-8_marches/10th_hli_crossing_the_rhine/notes.pipes.ily
@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}
diff --git a/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly b/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly
index 4734a19..f189607 100644
--- a/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly
+++ b/6-8_marches/10th_hli_crossing_the_rhine/pipes.ly
@@ -1,2 +1,102 @@
-\version "2.18.2"
+\version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+				  	\line
+				}
+				\break
+				\repeat volta 2 {
+				  	\part
+					\halfline
+				}\alternative{
+				  	\halfline
+					\halfline
+				}
+				\bar "|."
+				\break
+				\repeat volta 2 {
+				  	\part
+				  	\line
+				}
+				\break
+				\repeat volta 2 {
+				  	\part
+					\halfline
+				}\alternative{
+				  	\halfline
+					\halfline
+				}
+				\bar "|."
+
+			}%Format
+			
+			\new Voice = "pipes" {
+				\pipesAA
+				\pipesAB s8
+
+				\pipesBA
+				\pipesBB s8
+				\pipesAB s8
+
+				\pipesCA
+				\pipesCB s8
+
+				\pipesDA
+				\pipesDB s8
+				\pipesCB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesAA
+		\pipesAB
+		\pipesAA
+		\pipesAB
+
+		\pipesBA
+		\pipesBB
+		\pipesBA
+		\pipesAB
+		
+		\pipesCA
+		\pipesCB
+		\pipesCA
+		\pipesCB
+
+		\pipesDA
+		\pipesDB
+		\pipesDA
+		\pipesCB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}
diff --git a/9-8_marches/going_to_vancouver_hills/full.ly b/9-8_marches/going_to_vancouver_hills/full.ly
new file mode 100644
index 0000000..2565134
--- /dev/null
+++ b/9-8_marches/going_to_vancouver_hills/full.ly
@@ -0,0 +1,105 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "./config.ily"
+%\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+%\include "./notes.side.ily"
+\include "./notes.pipes.ily"
+%\include "./notes.pipes.seconds.ily"
+%\include "./notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new NullVoice = "format" {
+					\repeat unfold 4 {
+						\repeat volta 2 {
+							\line
+						}
+						\break
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+				
+					\pipesB
+
+					\pipesC
+
+					\pipesD
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics" {
+%				
+%			}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
+%
+%
+%		}
+%		\new PipeBandDrumStaff = "side" {
+%			\sideglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+%
+%		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+
+			\tenorB
+		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/9-8_marches/going_to_vancouver_hills/notes.tenor.ily b/9-8_marches/going_to_vancouver_hills/notes.tenor.ily
new file mode 100644
index 0000000..709e98e
--- /dev/null
+++ b/9-8_marches/going_to_vancouver_hills/notes.tenor.ily
@@ -0,0 +1,30 @@
+% 9/8 Going to Vancouver Hills
+% Tenor
+\version "2.18.2"
+composerTenor = "F.J. de Boone, 2014"
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorA = \drummode {
+	d4 g8	d4.	r4. |
+	d4 g8	d4.	r4. |
+	d8 g8 d8	g4.	r4. |
+	d4 g8	d4.	r4. |
+
+	d4 g8	d4.	r4. |
+	d4 g8	d4.	r4. |
+	d4 g8	d4.	r4. |
+	d4 g8	d8 g d	g8 d g |
+
+}
+tenorB = \drummode {
+	r4.	r4.	d4. |
+	r4. d4. r4. |
+	r4.	r4.	d4 g8 |
+	d4. r4. r4. |
+
+	r4.	r4.	d4. |
+	r4.	r4.	d4. |
+	r4.	r4.	d4 g8 |
+	d4 g8	d8 g d	g8 d g |
+}
diff --git a/9-8_marches/going_to_vancouver_hills/pipes.ly b/9-8_marches/going_to_vancouver_hills/pipes.ly
index 9fd2cb5..fcc8961 100644
--- a/9-8_marches/going_to_vancouver_hills/pipes.ly
+++ b/9-8_marches/going_to_vancouver_hills/pipes.ly
@@ -2,8 +2,6 @@
 
 \include "bagpipe.ly"
 
-\include "bagpipe.ly"
-
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
diff --git a/9-8_marches/going_to_vancouver_hills/tenor.ly b/9-8_marches/going_to_vancouver_hills/tenor.ly
new file mode 100644
index 0000000..772bfb9
--- /dev/null
+++ b/9-8_marches/going_to_vancouver_hills/tenor.ly
@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+				\repeat unfold 4 {
+					\repeat volta 2 {
+						\line
+					}
+					\break
+				}
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\tenorA
+
+				\tenorB
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/airs/alexander_mackenzie/config.ily b/airs/alexander_mackenzie/config.ily
index 5972beb..34b4d6c 100644
--- a/airs/alexander_mackenzie/config.ily
+++ b/airs/alexander_mackenzie/config.ily
@@ -4,7 +4,7 @@ global = {
 	\time 6/8
 	}
 confTempo = {
-	\tempo 2. = 90
+	\tempo 4. = 60
 }
 
 %% Format
diff --git a/airs/alexander_mackenzie/mid.ly b/airs/alexander_mackenzie/mid.ly
new file mode 100644
index 0000000..1c991bb
--- /dev/null
+++ b/airs/alexander_mackenzie/mid.ly
@@ -0,0 +1,58 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "tenor" {
+			\global
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			<<
+				{
+					\repeat volta 2 { \partial 16 s16 \halfline \break \halfline } \break
+					\repeat volta 2 { \part \halfline \break }
+						\alternative{ {\part \halfline \break}{\part \halfline \break} }
+					\bar "|."
+				}%Format
+				{ 
+					s16 \tenorAA r8
+					\tenorAB s8
+
+					\tenorBA s8
+					\tenorBB s8
+					r8 \tenorAB s8
+				}%Music
+			>>
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s16 \bassAA \bassAB 
+			s8 \bassBA 
+			s8 \bassBB 
+			s8 \bassAB 
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/bells_of_dunblane/config.ily b/airs/bells_of_dunblane/config.ily
index 908438c..6a52f24 100644
--- a/airs/bells_of_dunblane/config.ily
+++ b/airs/bells_of_dunblane/config.ily
@@ -4,7 +4,7 @@ global = {
 	\time 4/4
 	}
 confTempo = { 
-	\tempo 4 = 80 
+	\tempo 4 = 60 
 	}
 %% Format
 part = { \partial 4 \grace{s1} s4 }
diff --git a/airs/bells_of_dunblane/notes.side.ily b/airs/bells_of_dunblane/notes.side.ily
new file mode 100644
index 0000000..702a5b9
--- /dev/null
+++ b/airs/bells_of_dunblane/notes.side.ily
@@ -0,0 +1,56 @@
+% 4/4 Bells of Dunblane
+% Side
+\version "2.18.2"
+composerSide = "v2.0@01-04-10"
+arrangerSide = ""
+sideglobal = {}
+% Music
+snareA = \drummode {
+  \compressMMRests{
+	 \override MultiMeasureRest.expand-limit = #2
+		r4 |
+		R1*3 |
+		r4 r4 r4 d4:32(
+		|
+	}
+	\repeat unfold 2 {
+		d8.) g16->
+		r16 g8-> g16
+		d8-> d32 g d g
+		d16-> g d d
+		|
+		g8-> g16 d->
+		r16 g8-> g16
+		\flam d4
+		d4:32(
+		|
+	}
+	d4) r4 r4 r4 |
+	r4 r4 r4 \flamg \triplet { g8 \flam d \flam g }
+	|
+	d1:32(->\<
+	|
+	d1:32)(\!\>
+	|
+	\repeat unfold 3 {
+		d8.)\! g16->
+		r16 g8-> g16
+		d8-> d32 g d g
+		d16-> g d d
+		|
+		g8-> g16 d->
+		r16 g8-> g16
+		\flam d4
+		d4:32(
+		|
+	}
+	d8.) g16->
+	r16 g8-> g16
+	d8-> d32 g d g
+	d16-> g d d
+	|
+	g8-> g16 d->
+	r16 g8-> g16
+	\flam d4
+
+}
diff --git a/airs/bells_of_dunblane/side.ly b/airs/bells_of_dunblane/side.ly
new file mode 100644
index 0000000..03ab565
--- /dev/null
+++ b/airs/bells_of_dunblane/side.ly
@@ -0,0 +1,35 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\part
+				\line
+				\line
+				\line
+				\line
+				\line
+				\bar "|."
+			}%Format
+			
+			\new DrumVoice = "side" {
+				\snareA
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/airs/mull_of_kintyre/notes.tenor.ily b/airs/mull_of_kintyre/notes.tenor.ily
new file mode 100644
index 0000000..2161f50
--- /dev/null
+++ b/airs/mull_of_kintyre/notes.tenor.ily
@@ -0,0 +1,22 @@
+% 6/8 Mull of Kintyre
+% Tenor
+\version "2.18.2"
+composerTenor = ""
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorMeasure = \drummode {
+	d8 d16. g32 d8
+	d8 d16. g32 d8 |
+}
+tenorA = \drummode {
+	\repeat unfold 6 { \tenorMeasure }
+}
+
+tenorB = \drummode {
+	\repeat unfold 9 { \tenorMeasure }
+}
+
+tenorE = \drummode {
+	\repeat unfold 6 { \tenorMeasure }
+}
diff --git a/airs/mull_of_kintyre/tenor.ly b/airs/mull_of_kintyre/tenor.ly
new file mode 100644
index 0000000..30cab0d
--- /dev/null
+++ b/airs/mull_of_kintyre/tenor.ly
@@ -0,0 +1,57 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+				  	% Refrain
+					\repeat unfold 6 {	
+					  \measure
+					}
+					\bar "||"
+					\break
+					% Couplet
+					\repeat unfold 4 {
+					  \measure
+					}
+					\break
+					\repeat unfold 4 {
+					  \measure
+					}
+					\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
+					\mark \markup { \small "D.C. al fine" }
+					\measure
+					\break
+
+				}
+				% Dunno
+				\repeat unfold 6 {
+				  \measure
+				}
+				\bar "|."
+
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\tenorA
+				\tenorB
+
+				\tenorE
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}
diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily
index d665733..e886e66 100644
--- a/airs/the_mist_covered_mountains/notes.tenor.ily
+++ b/airs/the_mist_covered_mountains/notes.tenor.ily
@@ -1,6 +1,7 @@
 % 6/8 The Mist Covered Mountains
 % Tenor
 \version "2.18.2"
+composerTenor = "v1.0, 2016"
 tenorglobal = {}
 tenorA = \drummode {
 	d4. g |
@@ -19,6 +20,6 @@ tenorB = \drummode {
 	d4. g8 r8 g8 |
 	d4. g |
 	d4. g8 r8 g8 |
-	r8. g16 d8 r8. d16 g8 |
+	r8 g8 d8 r8 d8 g8 |
 	d8 g8 d8 g8 r4
 }
diff --git a/defs/layout.ily b/defs/layout.ily
new file mode 100644
index 0000000..dc04f4c
--- /dev/null
+++ b/defs/layout.ily
@@ -0,0 +1,7 @@
+\paper {
+
+}
+
+\layout {
+	indent = 0.0
+}
diff --git a/defs/paper.ily b/defs/paper.ily
new file mode 100644
index 0000000..52d8f7c
--- /dev/null
+++ b/defs/paper.ily
@@ -0,0 +1,2 @@
+\paper {
+}
diff --git a/defs/point-and-click.ily b/defs/point-and-click.ily
new file mode 100644
index 0000000..03159da
--- /dev/null
+++ b/defs/point-and-click.ily
@@ -0,0 +1 @@
+#(ly:set-option 'point-and-click #f)
diff --git a/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly
index 67b7630..272c748 100644
--- a/jigs/seaforth_sticks/tenor.ly
+++ b/jigs/seaforth_sticks/tenor.ly
@@ -2,13 +2,16 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
 \score {
-    \new PipeBandDrumStaff {
+    \new PipeBandDrumStaff\with {
+	    fontSize = #-0.5
+		\override StaffSymbol.staff-space = #(magstep -0.5)
+		\override StaffSymbol.thickness = #(magstep -0.5)
+	} 
+	{
 		\global
         <<
 			{
@@ -28,17 +31,17 @@
 				}
 			}
 			{
-				r2.*4
+				R2.*4
 				\tenorIntro
 
-				\tenorA s8
-				\tenorB s8
-				\tenorC s8
-				\tenorD s8
-				\tenorE s8
-				\tenorF s8
-				\tenorG s8
-				\tenorH s8
+				\tenorA r8
+				\tenorB r8
+				\tenorC r8
+				\tenorD r8
+				\tenorE r8
+				\tenorF r8
+				\tenorG r8
+				\tenorH r8
 				
 			}
 		>>
diff --git a/other/band_of_brothers/config.ily b/other/band_of_brothers/config.ily
new file mode 100644
index 0000000..dd20fd8
--- /dev/null
+++ b/other/band_of_brothers/config.ily
@@ -0,0 +1,7 @@
+\version "2.18.2"
+%% Headers
+title = "Band of Brothers"
+subtitle = "for the Edinburgh Military Tattoo 2005"
+arranger = "Michael Kamen, arr. Richard Barriball"
+meter = ""
+
diff --git a/other/band_of_brothers/pipes.ly b/other/band_of_brothers/pipes.ly
index fdfc26a..c3bdf61 100644
--- a/other/band_of_brothers/pipes.ly
+++ b/other/band_of_brothers/pipes.ly
@@ -2,6 +2,8 @@
 
 \include "bagpipe.ly"
 
+\include "./config.ily"
+
 #(set-default-paper-size "a4" 'landscape)
 #(set-global-staff-size 19)
 \layout {
@@ -104,10 +106,10 @@
 			\grG a1 |
 	}
 	\header {
-		title = "Band of Brothers"
-		subtitle = "for the Edinburgh Military Tattoo 2005"
-		arranger = "Michael Kamen, arr. Richard Barriball"
+		title = \title
+		subtitle = \subtitle
+		arranger = \arranger
+		meter = \meter
 		instrument = "Bagpipe"
-		meter = ""
 	}
 }
diff --git a/other/band_of_brothers/snaredrum.ly b/other/band_of_brothers/snaredrum.ly
index df68738..e6f5ea1 100644
--- a/other/band_of_brothers/snaredrum.ly
+++ b/other/band_of_brothers/snaredrum.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "./config.ily"
+
 %#(set-default-paper-size "a4" 'landscape)
 #(set-global-staff-size 19)
 \layout {
@@ -116,11 +118,11 @@
 		}
 	}
 	\header {
-		title = "Band of Brothers"
-		subtitle = "for the Edinburgh Military Tattoo 2005"
-		arranger = "Michael Kamen, arr. Richard Barriball"
+		title = \title
+		subtitle = \subtitle
+		arranger = \arranger
+		meter = \meter
 		instrument = "Snare Drum"
-		meter = ""
 	}
 
 }
diff --git a/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily b/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
index 3c78cf4..7b11e49 100644
--- a/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
+++ b/sinterklaas/zachtjes_gaan_de_paarden_voetjes/notes.pipes.ily
@@ -24,7 +24,7 @@ pipesABA = {
 pipesABB = {
 	\grg a8 \grd a |
 	b4 c4 d8 e |
-	\dblf f2 d8 e |
+	\dblf f2 d8 f |
 	\dble e4 b4 \grc c8 e8 |
 	\thrwd d2
 }
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index 4b630e0..6be7c2d 100644
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -29,9 +29,9 @@
 					g4 g |
 					d4 d |
 					g4 g |
-					d4 d |
-					g4 d |
+					d4 g |
 				}
+				d4\splitTheFeather r |
 			}
 		}
 	}
@@ -40,17 +40,17 @@
 		title = "2/4 Standards"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 3/4
 
 		\drummode {
 			\repeat volta 2 {
-				d8.-> g16 d8 g r g |
-				d4-> d8 g d4 |
-				d8.-> g16 d8 g r g |
-				d4-> d8 g d4 |
+				\repeat unfold 2 {
+					d8.-> g16 d8 g r g |
+					d4-> d8^"scoop"\dr g d4^"end" \fr |
+				}
 				\bar "||"
 			\break
 				\flourish{
@@ -67,17 +67,17 @@
 		title = "3/4 Standards"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 4/4
 
 		\drummode {
 			\repeat volta 2 {
-				d8-^ g d g d-> g d g |
-				d8-^ g d g d-> g d g |
-				d8-^ g d g d-> g d g |
-				d4-^ g d r |
+				d8-> g	d g	 d-- g	d g |
+				d8-> g	d g	 d-- g	d g |
+				d8-> g	d g	 d-- g	d g |
+				d4-> d8^"scoop"\dr g d4^"end"\fr r |
 				\bar "||"
 			\break
 				\flourish {
@@ -94,21 +94,21 @@
 		title = "4/4 Standards"
 	}
 }
-\break
+
 \score {
 	\new PipeBandDrumStaff {
 		\time 6/8
 
 		\drummode {
 			\repeat volta 2 {
+				d4.\up g\up |
+				d^\splitTheFeather r |
+				d g |
+				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
 				\flourish d4. \flourish g |
 				d^\splitTheFeather r |
 				d g |
-				d8 r8 g8 d4. |
-				\flourish d4. \flourish g |
-				d^\splitTheFeather r |
-				d g |
-				d8 r8 g8 d4. |
+				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
 				\bar "||"
 			\break
 				\flourish {
diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly
index e8e6e2c..d70192d 100644
--- a/strathspeys/molly_connell/bass.ly
+++ b/strathspeys/molly_connell/bass.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.bass.ily"
 
@@ -21,4 +19,4 @@
 		instrument = \instrumentBass
 		composer = \composerBass
 	}
-}
\ No newline at end of file
+}
diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily
index 3c0d0f3..4343725 100644
--- a/strathspeys/molly_connell/notes.tenor.ily
+++ b/strathspeys/molly_connell/notes.tenor.ily
@@ -1,7 +1,7 @@
 % 4/4 Molly Connell
 % Tenor
 \version "2.18.2"
-composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, 2014"
+composerTenor = "S.J. de Boone / M. Jansen / N. Kuijkhoven / E.T. de Boone, v1.1, 2014"
 tenorglobal = {}
 tenorA = \drummode {
 	d4 g4 d8. g16 d4
@@ -19,5 +19,5 @@ tenorBB = \drummode {
 	d4^\up g4^\up \flourish { d4 g4 } |
 	d4 \parenthesize d8. g16 r8. g16 d4 |
 	d4 g4 d8. g16 d4 |
-	\flourish d4 \flourish g4 d4^\up g4^\up |
+	d4^\up g4^\up \flourish d4 \flourish g4 |
 }
diff --git a/template/mid.ly b/template/mid.ly
new file mode 100644
index 0000000..6ad5d11
--- /dev/null
+++ b/template/mid.ly
@@ -0,0 +1,46 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			\global
+			<<
+				{
+
+				}%Format
+				{
+
+				}%Music
+			>>
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}