diff --git a/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly
index 5c1b4f3..2708a07 100644
--- a/4-4_marches/the_leaving_of_liverpool/drums.ly
+++ b/4-4_marches/the_leaving_of_liverpool/drums.ly
@@ -7,6 +7,11 @@
 \include "./notes.tenor.ily"
 \include "./notes.side.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
@@ -21,7 +26,7 @@
 					\line \bar "|."
 				}
 				{
-				 \snareA s4
+				 r8 \snareA s4
 
 				 \snareBA
 				 \snareBB
@@ -35,13 +40,13 @@
 		%	\bassA
 		%	s16 \bassBA \bassBB
 		%}
-		\new PipeBandDrumStaff = "tenor" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-
-			r8 r16 \tenorA s4
-			r8 r16 \tenorA
-			r8 r16 \tenorA
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			r8. \tenorA s4
+			r8. \tenorA
+			r8. \tenorA
 			s4
 
 		}
diff --git a/4-4_marches/the_leaving_of_liverpool/full.ly b/4-4_marches/the_leaving_of_liverpool/full.ly
index bb65b48..4179d39 100644
--- a/4-4_marches/the_leaving_of_liverpool/full.ly
+++ b/4-4_marches/the_leaving_of_liverpool/full.ly
@@ -28,9 +28,11 @@
 						\part
 						\line 
 						\break
-						\line \bar "|."
+						\line
+						\bar "||"
 						\break
 					}
+					\bar "|."
 				}%Format
 				{
 					\pipesAA
@@ -46,7 +48,7 @@
 			shortInstrumentName = \markup{ \shortInstrumentSide }
 		} {
 			\sideglobal
-			\snareA
+			r8 \snareA s8
 			\snareA s4
 
 			\snareBA
diff --git a/4-4_marches/the_leaving_of_liverpool/notes.side.ily b/4-4_marches/the_leaving_of_liverpool/notes.side.ily
index 8270c11..0115f16 100644
--- a/4-4_marches/the_leaving_of_liverpool/notes.side.ily
+++ b/4-4_marches/the_leaving_of_liverpool/notes.side.ily
@@ -7,29 +7,29 @@ sideglobal = {
 }
 %%music
 snareA = \drummode {
-	r8 d16. g32 |
-	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+	d16. g32 |
+	\flam d8 \triplet { d16 g d }		\flam g8 d8:32(		g16.) d32-> g16. g32		\flam d8 d8:32(\dr |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8\fr d16. g32 |
 
-	\flamd d8 \tuplet 3/2 { d16 g d }		\flamg g8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8 |
-	\flamd d4	d4:32(		d4)
+	\flam d8 \triplet { d16 g d }		\flam g8 d8:32(		g16.) d32-> g16. g32		\flam d8 d8 |
+	\flamdr d4	d4:32(		d4)\fr
 }
 % Part 2
 snareBA = \drummode {
-	\flamd d4 |
-	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+	\flam d4\v |
+	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32(\dr |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8\fr d16. g32 |
 
 	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> g8 |
-	\flamd d4	d4:32(		d4)
+	\flamdr d4	d4:32(		d4)
 }
 snareBB = \drummode{
-	\flamd d4 |
+	\flam d4\v |
 	d4:32(\<		d4:32)(->		d8)\! d32 g d g		d8-> d8:32( |
 
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8 d16. g32 |
+	\triplet { g16) d g } \flam d16. g32		\triplet { d16 g d } \flam g16. g32		d16. g32 \triplet { d16 g d }		\flam g8 d16. g32 |
 
-	\flamg g16. d32:128( d16.) g32		d16.:64( d32) \tuplet 3/2 { g16 d g }		\flamd d16. g32-> d32 g d g		d16. g32-> d32 g d g |
+	\flam g16. d32:128( d16.) g32		d16.:64( d32) \triplet { g16 d g }		\flam d16. g32-> d32 g d g		d16. g32-> d32 g d g |
 
-	d4	d4:32(		d4)
+	d4	d4:32(		d4)\fr
 }
diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly
index 48b4805..4c8aabd 100644
--- a/4-4_marches/the_leaving_of_liverpool/side.ly
+++ b/4-4_marches/the_leaving_of_liverpool/side.ly
@@ -8,20 +8,16 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-        <<
-			{
-				\repeat volta 2 { \part \line } \break
-				\part \line \break
-				\line \bar "|."
-
-			}
-			{
-			 \snareA s4
-
-			 \snareBA
-			 \snareBB
-			}
-		>>
+		\sideglobal
+		\repeat volta 2 {
+			\partial 4 r8
+			\snareA s4
+		}
+		\break
+		\partial 4
+		\snareBA
+		\snareBB
+		\fine
 	}
 	\header {
 		title = \title