diff --git a/2-4_marches/mackenzie_highlanders/bass.alt.ly b/2-4_marches/mackenzie_highlanders/bass.alt.ly
new file mode 100644
index 0000000..8f9a0b4
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/bass.alt.ly
@@ -0,0 +1,28 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\bassglobal
+		<<
+			\new NullVoice = "format"
+			{
+				
+			}%Format
+			\new DrumVoice { 
+				
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+	}
+}
diff --git a/2-4_marches/mackenzie_highlanders/full.alt.ly b/2-4_marches/mackenzie_highlanders/full.alt.ly
index b3d7034..af2c92c 100644
--- a/2-4_marches/mackenzie_highlanders/full.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/full.alt.ly
@@ -1,5 +1,8 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "./config.ily"
 \include "./notes.bass.ily"
 \include "./notes.tenor.alt.ily"
@@ -10,7 +13,7 @@
 	\new StaffGroup <<
 		\new Staff {
 			\global
-			\bagpipeKey
+			\pipeglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
index 88fdc27..108f1a8 100644
--- a/2-4_marches/mackenzie_highlanders/full.ly
+++ b/2-4_marches/mackenzie_highlanders/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"
@@ -16,7 +13,7 @@
 	\new StaffGroup <<
 		\new Staff {
 			\global
-			\bagpipeKey
+			\pipeglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
diff --git a/2-4_marches/mackenzie_highlanders/mid.alt.ly b/2-4_marches/mackenzie_highlanders/mid.alt.ly
new file mode 100644
index 0000000..f50b2c4
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/mid.alt.ly
@@ -0,0 +1,166 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.alt.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "bass" {
+			\global
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			<<
+				{
+					\repeat volta 2 { \line } \break
+					
+					\line \bar "||" \break
+					\line \bar "|."
+				}%Format
+				{
+				\bassA
+
+				\bassBA
+				\bassBB
+				}
+			>>
+		}
+			\new PipeBandDrumStaff = "tenor" {
+				\tenorglobal
+				\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+				\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+				\tenorA
+
+				\tenorBA
+				\tenorBB
+			}
+	>>
+	\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 }}#} )
+			}
+		}
+	}
+}
+\include "./notes.tenor.alt.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+
+				\part \line \bar "||" \break
+				\line \bar "|."
+			}%Format
+			{
+				\tenorA s8
+
+				\tenorBA
+				\tenorBB s8
+			}
+	>>
+	}
+	\header {
+		title = ""
+		meter = ""
+		instrument = ""
+		composer = \composerTenor
+	}
+}
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+
+				\part \line \bar "||" \break
+				\line \bar "|."
+			}%Format
+			{
+				\tenorA s8
+
+				\tenorBA
+				\tenorBB s8
+			}
+	>>
+	}
+	\header {
+		title = ""
+		meter = ""
+		instrument = ""
+		composer = \composerTenor
+	}
+}
+
+\score {
+  \new PipeBandDrumStaff {
+	\global
+	\repeat volta 2 {
+	  \part \line
+	}
+	\break
+	\part \line \bar "||" \break
+	\line \bar "|."
+  }
+}
+
+\score {
+  \new PipeBandDrumStaff {
+	\global
+	\repeat volta 2 {
+	  \part \line
+	}
+	\break
+	\part \line \bar "||" \break
+	\line \bar "|."
+  }
+}
+\score {
+  \new PipeBandDrumStaff {
+	\global
+	\repeat volta 2 {
+	  \part \line
+	}
+	\break
+	\part \line \bar "||" \break
+	\line \bar "|."
+  }
+}
+\score {
+  \new PipeBandDrumStaff {
+	\global
+	\repeat volta 2 {
+	  \part \line
+	}
+	\break
+	\part \line \bar "||" \break
+	\line \bar "|."
+  }
+}
diff --git a/2-4_marches/mackenzie_highlanders/notes.pipes.ily b/2-4_marches/mackenzie_highlanders/notes.pipes.ily
index 8d1e079..99c2359 100644
--- a/2-4_marches/mackenzie_highlanders/notes.pipes.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.pipes.ily
@@ -2,7 +2,9 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
-pipeglobal = { }
+pipeglobal = {
+	\bagpipeKey
+}
 pipesA = {
 	\dblA A8 |
 	\dblc c8 [ \gre b16. \grd c32 ] \grg a16. [ b32  \grg c16.  d32 ] |
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily
index d13e55a..68dd58d 100644
--- a/2-4_marches/mackenzie_highlanders/notes.side.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.side.ily
@@ -1,39 +1,40 @@
 % 2/4 MacKenzie Highlanders
 % Snare
 \version "2.18.2"
-composerSide = "v1.1, 2016"
+composerSide = "v1.2, 2016"
 sideglobal = { \eighthBeaming }
 %%music
 snareA = \drummode {
-	d8:32( |
-	g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
-	\flam d8 d8:32(	g8:32) d16. g32 |
+	d8:32( \dr |
+	g8)\fr \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
+	\flam d8 d8:32(	g8:32) d16.\dr g32 |
 
-	d8:32( g16.) g32->	d32 g d g-> d8-> |
-	d4:32(\<	d8)\! d8:32( |
+	d8:32( g16.)\fr g32->	d32 g d g-> d8-> |
+	d4:32(\dr\<	d8)\! 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 } |
+	g8)\fr \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
+	d8-> g8:32(->	d8:32)(\dr-> \tuplet 3/2 { g16) d g } |
 
 	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
-	d4:32(	d8)
+	d4:32(	d8)\fr
 }
 % Part 2
 snareBA = \drummode {
 	g8 |
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
-	d8-> d8:32(	g8) d16. g32 |
+	d8-> d8:32(	g8) d16.\dr g32 |
 
-	d8:32( g16.) g32-> d32 g d g-> d8-> |
-	d4:32(\<	d8)\! g8-> |
+	d8:32( g16.)\fr g32-> d32 g d g-> d8-> |
+	d4:32(\dr\<	d8)\!\fr 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-> g8:32(->	d8:32)(\dr-> \tuplet 3/2{ g16) d g } |
 
 	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
-	d4:32(	d8) g8
+	d4:32(	d8)\fr
 }
 snareBB = \drummode {
+	g8 |
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 	d8-> d8:32(	g8) d16. g32 |
 
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.v1.1.ily b/2-4_marches/mackenzie_highlanders/notes.side.v1.1.ily
new file mode 100644
index 0000000..d13e55a
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/notes.side.v1.1.ily
@@ -0,0 +1,48 @@
+% 2/4 MacKenzie Highlanders
+% Snare
+\version "2.18.2"
+composerSide = "v1.1, 2016"
+sideglobal = { \eighthBeaming }
+%%music
+snareA = \drummode {
+	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-> d8-> |
+	d4:32(\<	d8)\! 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)
+}
+% Part 2
+snareBA = \drummode {
+	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-> d8-> |
+	d4:32(\<	d8)\! 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
+}
+snareBB = \drummode {
+	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-> d8-> |
+	\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)
+}
diff --git a/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily b/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
index 44d9f4b..7465179 100644
--- a/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.tenor.alt.ily
@@ -9,77 +9,35 @@ tenorglobal = {
 
 tenorA = \drummode {
 	g8 |
-	d16.\< g32 d16. g32\!
-	r16. g32\< \triplet { d16 g d }
-	|
-	g16.->\< d32 g16. g32 \!
-	r16. d32\< \triplet { g16 d g }
-	|
-	d16. \< g32 d16. d32 \!
-	r16 g16\< r16 d16
-	|
-	r16 g16 r16 d16
-	g8\! g8
-	|
+	d4 d8 g |
+	d8 \< g8 d4 \! |
+	d8-> g d g |
+	d4 g4 |
 
-	d16.\< g32 d16. g32 \!
-	r16. g32\< \triplet { d16 g d }
-	|
-	g16.->\< d32 g16. g32 \!
-	r16. g32\< d16. g32
-	|
-	d32 g16.\! d16. g32
-	r16. g32 d16. g32
-	|
-	d8.. g32
-	r8
+	d4 d8 g |
+	d8 \< g d4 \! |
+	d16-> g16 r8	g16-> g8 g16 |
+	d4 g4 |
+}
+tenorA = \drummode {
+	s8 |
+	d4 g4 |
+	d4 d8 g |
+	d8. g16 d8. g16-> |
+	r8. g16 d4 |
 
+	d4 g4 |
+	d8 g d4 |
+	d16-> g16 r8	g16-> d8 g16 |
+	d4 g4 |
 }
 tenorBA = \drummode {
-	g8 |
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	d4
-	r8 g8
-	|
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	r4
-	d8 g8
-	|
-	
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	d4 r8 g8
-	|
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	r4 r8
+s2*4 |
+
+s2*4 |
 }
 tenorBB = \drummode {
-	g8 |
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	d4
-	r8 g8
-	|
-	r8 d32 g16.
-	r8 d32 g16.
-	|
-	r4
-	d8 g8
-	|
-	
-	\repeat unfold 3
-	{
-		r8 d32 g16.
-		r8 d32 g16.
-		|
-	}
-	d4 r8
+s2*4 |
+s2*4 |
 }
+
diff --git a/2-4_marches/mackenzie_highlanders/pipes.ly b/2-4_marches/mackenzie_highlanders/pipes.ly
index 46bacb5..121bc4b 100644
--- a/2-4_marches/mackenzie_highlanders/pipes.ly
+++ b/2-4_marches/mackenzie_highlanders/pipes.ly
@@ -2,8 +2,6 @@
 
 \include "bagpipe.ly"
 
-\include "bagpipe.ly"
-
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly
index 2ccdb4c..eef48b4 100644
--- a/2-4_marches/mackenzie_highlanders/side.ly
+++ b/2-4_marches/mackenzie_highlanders/side.ly
@@ -2,14 +2,13 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
 \score {
     	\new PipeBandDrumStaff {
         	\global
+			\sideglobal
         	<<
 			{
 				\repeat volta 2 { \part \line } \break
@@ -31,29 +30,3 @@
 	}
 	\layout {}
 }
-\score {
-    	\new PipeBandDrumStaff {
-        	\global
-		
-
-		\unfoldRepeats {
-			\repeat volta 2 {
-				\partial 8 \snareA
-			}
-			\bar "|."
-			\snareBA \bar "||"
-			\snareBB
-
-		}
-
-	}
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentSide
-		composer = \composerSide
-	}
-	\midi {
-		\tempo 4 = 80
-	}
-}
diff --git a/4-4_marches/minstrel_boy/notes.side.ily b/4-4_marches/minstrel_boy/notes.side.ily
index 83af0dd..537e3f2 100644
--- a/4-4_marches/minstrel_boy/notes.side.ily
+++ b/4-4_marches/minstrel_boy/notes.side.ily
@@ -2,7 +2,7 @@
 % Snare
 \version "2.18.2"
 composerSide = ""
-sideglobal = {}
+sideglobal = { \eighthBeaming }
 %%music
 
 snareEnds = \drummode {
diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly
index 84c75bb..3e81b27 100644
--- a/4-4_marches/minstrel_boy/side.ly
+++ b/4-4_marches/minstrel_boy/side.ly
@@ -10,6 +10,7 @@
 \score {
     \new PipeBandDrumStaff {
         \global
+		\sideglobal
         <<
 			{
 				\partial 4 s4 |
diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily
index f05e531..f805ba4 100644
--- a/4-4_marches/rowan_tree/notes.side.ily
+++ b/4-4_marches/rowan_tree/notes.side.ily
@@ -2,7 +2,7 @@
 % Snare
 \version "2.18.2"
 composerSide = ""
-sideglobal = {}
+sideglobal = { \eighthBeaming }
 
 %%music
 snareEnding = \drummode {
diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly
index 40b23ed..895adc0 100644
--- a/4-4_marches/rowan_tree/side.ly
+++ b/4-4_marches/rowan_tree/side.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
diff --git a/airs/abide_with_me/notes.side.ily b/airs/abide_with_me/notes.side.ily
index cce5aad..dc4ceda 100644
--- a/airs/abide_with_me/notes.side.ily
+++ b/airs/abide_with_me/notes.side.ily
@@ -2,7 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = "W.H. de Boone, 2014"
-sideglobal = {}
+sideglobal = { \eighthBeaming }
 snareAA = \drummode {
 	\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 |
diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly
index fe1a8ec..b915d85 100644
--- a/airs/alexander_mackenzie/side.ly
+++ b/airs/alexander_mackenzie/side.ly
@@ -2,8 +2,6 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
 \include "./config.ily"
 \include "./notes.side.ily"
 
diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily
index bf1ad38..1465530 100644
--- a/airs/flower_of_scotland/notes.side.ily
+++ b/airs/flower_of_scotland/notes.side.ily
@@ -2,7 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-sideglobal = {} 
+sideglobal = { \eighthCompoundBeaming } 
 snareA = \drummode {
 	g8 |
 	\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily
index 9e7f49c..bc27c67 100644
--- a/airs/loch_duich/notes.side.ily
+++ b/airs/loch_duich/notes.side.ily
@@ -2,7 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-sideglobal = {} 
+sideglobal = { \sixteenthCompoundBeaming } 
 snareA = \drummode {
 	\flam d4 \flam d8		d16:64( d8) d16:64( d8) |
 	d4:32( d8)		\drag d16 d-> g g \flam d8 |
diff --git a/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily
index 4610a8d..ebe1608 100644
--- a/airs/my_home/notes.side.ily
+++ b/airs/my_home/notes.side.ily
@@ -2,7 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = ""
-sideglobal = {}
+sideglobal = { \eighthCompoundBeaming }
 snareA = \drummode {
 	d8:32( |
 	g8.) d16 g8		\flamd d8. g16 d8 |
diff --git a/other/band_of_brothers/pipes.ly b/other/band_of_brothers/pipes.ly
index b64378b..fdfc26a 100644
--- a/other/band_of_brothers/pipes.ly
+++ b/other/band_of_brothers/pipes.ly
@@ -7,12 +7,14 @@
 \layout {
 	indent = 0
 	\set Score.markFormatter = #format-mark-box-alphabet
+	\context {
+		\Staff
+		\numericTimeSignature
+%		\hideKeySignature
+	}
 }
 \score {
 	\new Staff = "staff_pipes" {
-		\numericTimeSignature
-		\hideKeySignature
-
 		\compressMMRests {
 			\tempo 2. = 32
 			\time 3/4
@@ -34,6 +36,7 @@
 		
 			\time 4/4
 			R1
+		}
 
 		\bar "||"
 		\mark \default
@@ -75,6 +78,7 @@
 
 		\bar "||"
 		\mark \default
+		\compressMMRests {
 			R1*4
 		}
 
diff --git a/other/band_of_brothers/snaredrum.ly b/other/band_of_brothers/snaredrum.ly
index cf561a9..df68738 100644
--- a/other/band_of_brothers/snaredrum.ly
+++ b/other/band_of_brothers/snaredrum.ly
@@ -1,6 +1,6 @@
 \version "2.18.2"
 
-#(set-default-paper-size "a4" 'landscape)
+%#(set-default-paper-size "a4" 'landscape)
 #(set-global-staff-size 19)
 \layout {
 	indent = 0
diff --git a/other/god_save_the_queen/lyrics.ly b/other/god_save_the_queen/lyrics.ly
index 9be0bca..25a09da 100644
--- a/other/god_save_the_queen/lyrics.ly
+++ b/other/god_save_the_queen/lyrics.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "./config.ily"
 %\include "./notes.pipes.ily"
 \include "./notes.lyrics.ily"
diff --git a/other/jonge_prins_van_friesland/bass.ly b/other/jonge_prins_van_friesland/bass.ly
index eb32ab5..f7f4b17 100644
--- a/other/jonge_prins_van_friesland/bass.ly
+++ b/other/jonge_prins_van_friesland/bass.ly
@@ -2,18 +2,8 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "config.ily"
-\include "notes.bass.ily"
+\include "./config.ily"
+\include "./notes.bass.ily"
 
 \score {
     \new PipeBandDrumStaff {
@@ -22,10 +12,12 @@
 		<<
 			\new NullVoice = "format"
 			{
-				
+					\part
+					\line
+					\bar "|."
 			}%Format
 			\new DrumVoice { 
-				
+				\bassA s4
 			}
 		>>
 	}
diff --git a/other/jonge_prins_van_friesland/config.ily b/other/jonge_prins_van_friesland/config.ily
new file mode 100644
index 0000000..a5c1e36
--- /dev/null
+++ b/other/jonge_prins_van_friesland/config.ily
@@ -0,0 +1,17 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/2
+	}
+confTempo = { 
+	\tempo 2 = 80 
+	}
+%% Format
+part = { \partial 4 s4 }
+measure = { \grace {s1} s1 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "De Jonge Prins van Friesland"
+meter = "Mars"
diff --git a/other/jonge_prins_van_friesland/drums.ly b/other/jonge_prins_van_friesland/drums.ly
index 5e7a353..1cd8ee0 100644
--- a/other/jonge_prins_van_friesland/drums.ly
+++ b/other/jonge_prins_van_friesland/drums.ly
@@ -2,20 +2,10 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "config.ily"
-\include "notes.bass.ily"
-\include "notes.tenor.ily"
-\include "notes.side.ily"
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.ily"
 
 \score {
 	\new StaffGroup <<
diff --git a/other/jonge_prins_van_friesland/full.ly b/other/jonge_prins_van_friesland/full.ly
index 7b56a79..a5545ea 100644
--- a/other/jonge_prins_van_friesland/full.ly
+++ b/other/jonge_prins_van_friesland/full.ly
@@ -3,28 +3,13 @@
 \include "bagpipe.ly"
 \include "lilydrum.ly"
 
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\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"
+\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 <<
diff --git a/other/jonge_prins_van_friesland/notes.bass.ily b/other/jonge_prins_van_friesland/notes.bass.ily
new file mode 100644
index 0000000..5d32a91
--- /dev/null
+++ b/other/jonge_prins_van_friesland/notes.bass.ily
@@ -0,0 +1,27 @@
+% 2/2 De Jonge Prins van Friesland
+% Bass
+\version "2.18.2"
+composerBass  = ""
+bassglobal = {}
+% Music
+bassA = \drummode {
+	r4 |
+	d4 g d g |
+	d4 r g r |
+	d4 g d g |
+	d4. g8 d4
+	
+	r4|
+	d4 g d g |
+	d4 r g r |
+	d4 g d g |
+	d2.
+}
+
+simpleBassA = \drummode {
+	r4 |
+	\repeat percent 4 {
+		d2 g2 |
+		d2 r2
+	}
+}
diff --git a/other/jonge_prins_van_friesland/notes.pipes.ily b/other/jonge_prins_van_friesland/notes.pipes.ily
new file mode 100644
index 0000000..8cda2d2
--- /dev/null
+++ b/other/jonge_prins_van_friesland/notes.pipes.ily
@@ -0,0 +1,10 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+}
diff --git a/other/jonge_prins_van_friesland/notes.side.ily b/other/jonge_prins_van_friesland/notes.side.ily
new file mode 100644
index 0000000..803a355
--- /dev/null
+++ b/other/jonge_prins_van_friesland/notes.side.ily
@@ -0,0 +1,33 @@
+% 2/2 De Jonge Prins van Friesland
+% Side
+\version "2.18.2"
+composerSide = ""
+sideglobal = {}
+% Music
+snareA = \drummode {
+	g4 |
+	\flam d4 g \flam d g |
+	d8 g d g \flam d4 d8 g |
+	\flam d4 g d g |
+	d2:32( d4)
+
+	g4 |
+	\flam d4 g \flam d g |
+	d8 g d g \flam d4 d8 g |
+	\flam d4 g d g |
+	d2.:32\fermata
+}
+
+snareOrigA = \drummode {
+	r4 |
+	sn4 4 4 4 |
+	sn2:32( 4) 4 |
+	sn4 r4 sn4 r4 |
+	sn4 4 4 
+	
+	sn4 |	
+	sn4 4 4 4 |
+	sn2:32( 4) 4 |
+	sn4 r4 sn4 r4
+	sn2.:32\fermata
+  }
diff --git a/other/jonge_prins_van_friesland/notes.tenor.ily b/other/jonge_prins_van_friesland/notes.tenor.ily
new file mode 100644
index 0000000..37da133
--- /dev/null
+++ b/other/jonge_prins_van_friesland/notes.tenor.ily
@@ -0,0 +1,19 @@
+% 2/2 De Jonge Prins van Friesland
+% Tenor
+\version "2.18.2"
+composerTenor = ""
+tenorglobal = {}
+% Music
+tenorA = \drummode {
+	g4 |
+	d4\up g\up d\up g\up |
+	d8 g d g d4 r4 |
+	\flourish d2 \flourish g2 |
+	r2\blfy r4
+
+	g4 |
+	d4\up g\up d\up g\up |
+	d8 g d g d4 r4 |
+	\flourish d2 \flourish g2 |
+	d2.^\splitTheFeather
+}
diff --git a/other/jonge_prins_van_friesland/pipes.ly b/other/jonge_prins_van_friesland/pipes.ly
index 5371471..4d9c86c 100644
--- a/other/jonge_prins_van_friesland/pipes.ly
+++ b/other/jonge_prins_van_friesland/pipes.ly
@@ -2,18 +2,8 @@
 
 \include "bagpipe.ly"
 
-\include "bagpipe.ly"
-
-\include "bagpipe.ly"
-
-\include "bagpipe.ly"
-
-\include "bagpipe.ly"
-
-\include "bagpipe.ly"
-
-\include "config.ily"
-\include "notes.pipes.ily"
+\include "./config.ily"
+\include "./notes.pipes.ily"
 
 \score {
     \new Staff {
diff --git a/other/jonge_prins_van_friesland/side.ly b/other/jonge_prins_van_friesland/side.ly
index b109f7c..9c4f44f 100644
--- a/other/jonge_prins_van_friesland/side.ly
+++ b/other/jonge_prins_van_friesland/side.ly
@@ -2,37 +2,44 @@
 
 \include "lilydrum.ly"
 
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "config.ily"
-\include "notes.side.ily"
+\include "./config.ily"
+\include "./notes.side.ily"
 
 \score {
-    \new PipeBandDrumStaff {
-        \global
-		\sideglobal
-		<<
-			\new NullVoice = "format" {
-			
-			}%Format
-			
-			\new DrumVoice = "side" {
-			
-			}
-		>>
-	}
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			<<
+				\new NullVoice = "format" {
+					\part
+					\line
+					\bar "|."
+				}%End of Format
+				\new DrumVoice = "side" {
+					\snareA s4
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "trom" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{Trom}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{T.}
+
+			\new DrumVoice = "trom" {
+				\snareOrigA s4
+			}%End of side
+		}
+	>>
 	\header {
 		title = \title
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }
diff --git a/other/jonge_prins_van_friesland/tenor.ly b/other/jonge_prins_van_friesland/tenor.ly
index e34d20f..adb3fd9 100644
--- a/other/jonge_prins_van_friesland/tenor.ly
+++ b/other/jonge_prins_van_friesland/tenor.ly
@@ -1,28 +1,9 @@
 \version "2.18.2"
 
-\include "bagpipe.ly"
 \include "lilydrum.ly"
 
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "lilydrum.ly"
-
-\include "config.ily"
-\include "notes.tenor.ily"
+\include "./config.ily"
+\include "./notes.tenor.ily"
 
 \score {
     \new PipeBandDrumStaff {
@@ -30,11 +11,14 @@
 	\tenorglobal
 	<<
 			\new NullVoice = "format" {
-			
+					\part
+					\line
+					\bar "|."
+
 			}%Format
 			
 			\new DrumVoice = "tenor" {
-			
+				\tenorA s4
 			}
 	>>
 	}
diff --git a/other/wilhelmus/pipes.seconds.ly b/other/wilhelmus/pipes.seconds.ly
index a56bbd5..d22eea3 100644
--- a/other/wilhelmus/pipes.seconds.ly
+++ b/other/wilhelmus/pipes.seconds.ly
@@ -2,8 +2,6 @@
 
 \include "bagpipe.ly"
 
-\include "bagpipe.ly"
-
 \include "./config.ily"
 \include "./notes.pipes.seconds.ily"
 
@@ -41,13 +39,14 @@
 		title = \title
 		meter = \meter
 		instrument = \instrumentSecnd
-		composer = \composerPipesSecnd
+		composer = \composerPipessecnd
 	}
 }
 \score {
 	\new Staff { \global \pipessecndglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
+		\partial 4 
 		\pipessecndAA
 		\pipessecndAB
 
@@ -58,7 +57,7 @@
 		title = \title
 		meter = \meter
 		instrument = \instrumentSecnd
-		composer = \composerPipesSecnd
+		composer = \composerPipessecnd
 	}
 
 }