diff --git a/reels/jock_wilsons_ball/bass.ly b/reels/jock_wilsons_ball/bass.ly
index 34a9275..b6d16a7 100644
--- a/reels/jock_wilsons_ball/bass.ly
+++ b/reels/jock_wilsons_ball/bass.ly
@@ -5,17 +5,21 @@
 \include "./config.ily"
 \include "./notes.bass.ily"
 
+pBreak = {\break}
 \score {
     \new PipeBandDrumStaff {
         \global
 	\bassglobal
 		<<
 			{
-				\line 
-				\bar "|."
-				\break
-				\line
-				\bar "|."
+				\halfline
+				\pBreak
+				\halfline
+				\section
+				\halfline
+				\pBreak
+				\halfline
+				\fine
 			}%Format
 			{
 			\bassA
diff --git a/reels/jock_wilsons_ball/drums.ly b/reels/jock_wilsons_ball/drums.ly
index 648827b..bf182b3 100644
--- a/reels/jock_wilsons_ball/drums.ly
+++ b/reels/jock_wilsons_ball/drums.ly
@@ -7,48 +7,58 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+pBreak = {\break}
 \score {
 	\new StaffGroup <<
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\global
-			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
-
 			<<
-				{
-					\partial 16 s16
-					\line
-					\bar "|."
+				\new NullVoice = "format" {
+					\halfline
+					\pBreak
+					\halfline
 					\break
-					\partial 16 s16
-					\line
-					\bar "|."
-				}%Format
-				{ 
-					\sideA s16
-					\sideB
-				}%Music
+					\section
+					\halfline
+					\pBreak
+					\halfline
+					\fine
+				}%End of Format
+				\new DrumVoice = "side" {
+					\sideglobal
+					\snareA
+					\snareB
+				}%End of side
 			>>
 		}
-		\new PipeBandDrumStaff = "tenor" {
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-			s16 \tenorA
-			s16 \tenorB
+			\tenorAA \tenorAB
+			\tenorBA \tenorBB
 		}
-		\new PipeBandDrumStaff = "bass" {
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
-			s16 \bassA
-			s16 \bassB
+			\bassAA \bassAB
+			\bassBA \bassBB
 		}
 	>>
 	\header {
 		title = \title
+		subtitle = \subtitle
 		meter = \meter
 		composer = \markup {
 			\column \right-align {
diff --git a/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly
index dca7b02..ac0c8ad 100644
--- a/reels/jock_wilsons_ball/full.ly
+++ b/reels/jock_wilsons_ball/full.ly
@@ -4,75 +4,122 @@
 \include "lilydrum.ly"
 
 \include "./config.ily"
-\include "./notes.bass.ily"
-\include "./notes.tenor.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"
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
 
 \score {
-	\new StaffGroup  \with { 
-		}
-		<<
-		\new Staff {
+	\new StaffGroup <<
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				{
-				\partial 16 s16
-				\line
-				\bar "|,"
-
-				\break
-				\line
-				\bar "|."
+				\new NullVoice = "format" {
+					%\repeat volta 2 {
+					%	\part \line
+					%}
+					\part
+					\halfline
+					\break
+					\halfline
+					\section
+					\break
+					\part
+					\halfline
+					\break
+					\halfline
+					\fine
 				}%Format
-				{
-					s16 \pipesAA
-					\pipesAB
+				\new Voice = "pipes" {
+
+					\pipesA \pipesA s16
 
 					\pipesBA
-					\pipesBB
+					\pipesBB s16
+
 				}%Pipes
 			>>
 		}
-		\new PipeBandDrumStaff = "side"{
-			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+%{		\new Staff = "song" {
+  			\lyricsglobal
+			\new Voice = "lyrics" {
 
-				\snareA
-				\snareB
+			}
 		}
-		\new PipeBandDrumStaff = "tenor" {
+}%
+%{		\new Lyrics = "verse1" {
+		  \lyricsglobal
+		  \lyricsto "lyrics" {
+			\verseA
+		  }
+		}
+%}
+%{		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
+		} {
+			\pipessecndglobal
+
+		}
+%}
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\sideglobal
+
+			s16 \snareA |
+
+			s16 \snareB |
+			\fine
+		}
+%{
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-				s16 \tenorA
-				\tenorB
+
 		}
-		\new PipeBandDrumStaff = "bass" {
+%}
+%{
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-				s16 \bassA
-				\bassB
-		
+
 		}
+%}
 	>>
 	\header {
 		title = \title
+		subtitle = \subtitle
 		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/reels/jock_wilsons_ball/mid.ly b/reels/jock_wilsons_ball/mid.ly
new file mode 100644
index 0000000..a9f8b63
--- /dev/null
+++ b/reels/jock_wilsons_ball/mid.ly
@@ -0,0 +1,65 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+pBreak = {\break}
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\global
+			<<
+				\new NullVoice = "format" {
+					\halfline
+					\pBreak
+					\halfline
+					\break
+					\section
+					\halfline
+					\pBreak
+					\halfline
+					\fine
+				}%End of Format
+				\new DrumVoice = "tenor" {
+					\tenorglobal
+					\tenorAA \tenorAB
+					\tenorBA \tenorBB
+				}%End of Tenor
+			>>
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+			\bassAA \bassAB
+			\bassBA \bassBB
+		}
+	>>
+	\header {
+		title = \title
+		subtitle = \subtitle
+		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/reels/jock_wilsons_ball/notes.bass.ily b/reels/jock_wilsons_ball/notes.bass.ily
index 2c57a5b..a3cb3cc 100644
--- a/reels/jock_wilsons_ball/notes.bass.ily
+++ b/reels/jock_wilsons_ball/notes.bass.ily
@@ -1,62 +1,31 @@
 % 2/2 Jock Wilson's Ball
 % Bass
 \version "2.18.2"
-composerBass  = ""
+composerBass  = "v0.1"
+arrangerBass  = ""
 bassglobal = {}
 % Music
-bassA = \drummode {
-	
-	d4 g4
-	d2
-	|
-	d2 
-	g2
-	|
-	d4 g4
-	d2
-	|
-	d8. g16 d8. d16
-	g4 d4
-	
-	|
-	d4 g4
-	d2
-	|
-	d2 
-	g4.. g16
-	|
-	d2
-	g2
-	|
-	d8. g16 d8. d16
-	d2
-
+bassAA = \drummode {
+	bd2	\triplet{ 8 8 8 } 4 |
+	2	2 |
+	2	\triplet{ 8 8 8 } \parenthesize 4 |
+	2	2 |
 }
-
-bassB = \drummode {
-	d4 g4->
-	d4 g8. g16
-	|
-	d4 g4
-	d2
-	|
-	d4 g4->
-	d4 g8. g16
-	|
-	g4.. g16
-	d2
-	|
-
-	d4 g4->
-	d4 g8. g16
-	|
-	d4 g4
-	d2
-	|
-	d8. g16 d4
-	g4 g4
-	|
-	d8. g16 d4
-	g4 d4
-
+bassAB = \drummode {
+	bd2	\triplet{ 8 8 8 } 4 |
+	2	2 |
+	2	2 |
+	2	2 |
 }
+bassA = \drummode{ \bassAA \bassAB }
+
+bassBA = \drummode {
+	bd2 2 |
+	2	2 |
+	2	2 |
+	2	2 |
+}
+bassBB = \drummode {
+	\bassBA
+}
+bassB = \drummode{ \bassBA \bassBB }
diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily
index b2fbacd..527cfdb 100644
--- a/reels/jock_wilsons_ball/notes.side.ily
+++ b/reels/jock_wilsons_ball/notes.side.ily
@@ -6,15 +6,16 @@ arrangerSide = ""
 sideglobal = {
 %	\eighthReelBeaming
 }
+
 % Music
 snareAA = \drummode {
 	\flam d4 g4	d4:32(\staccato\dr g4:32)(->\fr\> |
-	d8.)\!\dr g16-> d16\<\fr g d g\!	d8.[->\dr \drag d16 d8. g16] |
+	d8.)\! \tutti { g16-> } d16\< g d g\!	d8.[-> \dragdr d16 d8. g16] |
 	d4:32(-> g8.)\fr d16:64(	d8.) g16 d4:32(->\>\dr |
-	g8.[)\p\fr d16 g8. \drag d16]	d8.[ \dragdr d16->\mf  d8. g16] |
+	g8.[) d16\p g8.\fr \drag d16]	d8.[ \dragdr d16->\mf  d8. g16] |
 }
 snareAB = \drummode {
-	\flam d4 g4	d4:32(\staccato g4:32)(->\> |
+	\flam d4-> g4	d4:32(\staccato g4:32)(->\> |
 	d8.)\! g16-> d16\< g d g\!	d8.[->\fr \drag d16 d8. g16]\dr |
 	d8.:32(-> g16) d4\fr	r4 \flamdr \triplet { d8\fr g d } |
 	g8 g8 \flamdr d8. g16	d4 d4:32(\< |
@@ -35,7 +36,7 @@ snareBB = \drummode {
 	g4)\! \flam d8.\v d16	g8. d16 \triplet { g8 d g } |
 	d4:32(-> g8.:32)(-> g16)->	\triplet { d8[ g \drag d] } d4\fr |
 	d2:32(	d4:32)(\dr\< d8.)\!-> g16 |
-	d8.:32(-> g16) d8. g16	d4:32(-> g4)->\fr
+	d8.:32(-> g16) d8. g16	d4:32(-> d4)->\fr
 }
 
 snareB = \drummode {
diff --git a/reels/jock_wilsons_ball/notes.tenor.ily b/reels/jock_wilsons_ball/notes.tenor.ily
index a01bb14..3b41deb 100644
--- a/reels/jock_wilsons_ball/notes.tenor.ily
+++ b/reels/jock_wilsons_ball/notes.tenor.ily
@@ -1,61 +1,34 @@
 % 2/2 Jock Wilson's Ball
 % Tenor
 \version "2.18.2"
-composerTenor = ""
+composerTenor = "v0.1"
+arrangerTenor = ""
 tenorglobal = {}
 % Music
-tenorA = \drummode {
-	d4 g8. g16
-	d4 g4
-	|
-	d4 g16 g8 d16
-	r8. d16 g4
-	|
-	d4 g8. g16
-	d2
-	|
-	d2
-	d8. g16 d4
-
-	|
-	d4 g8. g16
-	d2
-	|
-	d4 g16 g8 d16
-	r8. d16 g4
-	|
-	d8. g16 d g8.
-	d8. g16 d4
-	|
-	d8. g16 d4
-	g2 
-	|
+tenorAA = \drummode {
+	d4 g	d g |
+	d8. g16 \parenthesize d4	d2 |
+	d4 \triplet{ g8 d g }	d2 |
+	d8. g16 d8. g16	d8. d16 g8. g16 |
 }
-tenorB = \drummode {
-	\flourish g4 \flourish g4
-	\flourish d4 \flourish d4
-	|
-	d4 d8. g16
-	d8. g16 d4
-	|
-	\flourish g4 \flourish g4
-	\flourish d4 \flourish d4
-	|
-	d4 g4
-	d8. g16 d4
-
-	|
-	\flourish g4 \flourish g4
-	\flourish d4 \flourish d4
-	|
-	d4 d8. g16
-	d8. g16 d4
-	|
-	d8. g16 d8. g16
-	
-	d4^\up g4^\up
-	|
-	
-	d4 \triplet {g8 d g}
-	d2^\splitTheFeather
+tenorAB = \drummode {
+	d4 g	d g |
+	d8. g16 \parenthesize d4	d2 |
+	d8. g16	d4	\triplet{ g8 d g } d4 |
+	d8 g d4	d2 |
 }
+tenorA = \drummode{ \tenorAA \tenorAB }
+
+tenorBA = \drummode {
+	d4 g	d2 |
+	d4 g8. g16	d2 |
+	d4\< g	d2\! |
+	d8 g d4	d2 |
+}
+tenorBB = \drummode {
+	d4 g	d2 |
+	d4 g8. g16	d2 |
+	d4 d8. d16	g4 g4 |
+	d8. g16 d8.	d16 g4 d4 |
+}
+tenorB = \drummode{ \tenorBA \tenorBB }
diff --git a/reels/jock_wilsons_ball/pipes.ly b/reels/jock_wilsons_ball/pipes.ly
index f5dfcc6..1ddb58f 100644
--- a/reels/jock_wilsons_ball/pipes.ly
+++ b/reels/jock_wilsons_ball/pipes.ly
@@ -10,19 +10,19 @@
 		\global
 		\pipeglobal
 		<<
-			{ 
+			{
 				\halfline
 				\break
 				\halfline
 				\bar "|."
 				\break
 
-				\halfline 
+				\halfline
 				\break
 				\halfline
 				\bar "|."
 			}%Format
-			{ 
+			{
 				\pipesAA
 				\pipesAB
 
diff --git a/reels/jock_wilsons_ball/tenor.ly b/reels/jock_wilsons_ball/tenor.ly
index e7a87c4..aee61a3 100644
--- a/reels/jock_wilsons_ball/tenor.ly
+++ b/reels/jock_wilsons_ball/tenor.ly
@@ -5,17 +5,21 @@
 \include "./config.ily"
 \include "./notes.tenor.ily"
 
+pBreak = {\break}
 \score {
     \new PipeBandDrumStaff {
 	\global
 	\tenorglobal
 	<<
 			{
-				\line 
-				\bar "|."
-				\break
-				\line
-				\bar "|."
+				\halfline
+				\pBreak
+				\halfline
+				\section
+				\halfline
+				\pBreak
+				\halfline
+				\fine
 			}%Format
 			{
 			\tenorA
diff --git a/reels/piper_of_drummond/notes.side.ily b/reels/piper_of_drummond/notes.side.ily
index c4c0f66..3df5706 100644
--- a/reels/piper_of_drummond/notes.side.ily
+++ b/reels/piper_of_drummond/notes.side.ily
@@ -1,7 +1,7 @@
 % 2/2 Piper of Drummond
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.6, 2023" % 2023-05-05 Wageningen, unisons 202-07-23 AR, Maastricht
+composerSide = "E.T. de Boone, v0.6, 2023" % 2023-05-05 Wageningen, unisons 2023-07-23 AR, Maastricht
 arrangerSide = ""
 sideglobal = {
 }
@@ -30,8 +30,8 @@ snareAAB = \drummode {% only different for unisons
 snareABB = \drummode {
 	g8. g16 \flam d4\fr
 	|
-	d4:32( g8.) g16\dr
-	\flam d4 d4:32(\<
+	d4:32( g4)
+	\flamdr d4 d4:32(\<
 	|
 	d8.)->\! g16 d8. \flam g16
 	d4\fr d16 g d g