diff --git a/hornpipes/young_pipers/full.ly b/hornpipes/young_pipers/full.ly
index 547c337..a5fcce3 100644
--- a/hornpipes/young_pipers/full.ly
+++ b/hornpipes/young_pipers/full.ly
@@ -11,14 +11,21 @@
 %\include "./notes.pipes.seconds.ily"
 %\include "./notes.lyrics.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
+mpageBreak = \pageBreak
 
 \score {
 	\new StaffGroup <<
-		\new Staff {
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		}{
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				\new Voice = "format"
 			  	{
@@ -40,6 +47,7 @@
 						\halfline
 					}
 					\break
+					\mpageBreak
 
 					\repeat volta 2 {
 					 	\part
@@ -93,10 +101,11 @@
 %
 %
 %		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\snareAA
 			\snareAB
diff --git a/hornpipes/young_pipers/notes.side.ily b/hornpipes/young_pipers/notes.side.ily
index 5bcda36..0ab70fe 100644
--- a/hornpipes/young_pipers/notes.side.ily
+++ b/hornpipes/young_pipers/notes.side.ily
@@ -66,8 +66,8 @@ snareCB = \drummode {
 }
 
 snareDC = \drummode {
-	\flam d16 \flam g \flam d8
-	g16 d:64( d) g
+	\flam d16 \fr \flam g \flam d8
+	g16 d:64( d) g\dr
 	|
 	d32 g d g d16 g:64(
 	g16:64 d) g g
@@ -78,10 +78,10 @@ snareDA = \drummode {
 	\snareDC
 }
 snareDB = \drummode {
-	d16 g32 g d16 g
+	d16\fr g32 g d16 g
 	d32 g d g d16 g32 g
 	|
-	d16 g8.:32(
+	d16 \dr g8.:32(
 	d16) g d32 g d g 
 	|
 }
diff --git a/standards/68_standards.side.ily b/standards/68_standards.side.ily
index 9325059..a46ab8c 100644
--- a/standards/68_standards.side.ily
+++ b/standards/68_standards.side.ily
@@ -100,8 +100,8 @@ pthree = \drummode {
 
 pfour = \drummode {
 	d8:32( |
-	g8.) g16 \flamd d8		d8. d16 \flamg g8 |
-	d8. g16 \flamd d8		\flamd d8. g16 d8 |
+	g8.) g16 \flam d8		d8. d16 \flam g8 |
+	d8. g16 \flam d8		\flam g8. d16 g8 |
 }
 
 pfive = \drummode {
diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily
index 2aa0fe0..79a1950 100644
--- a/strathspeys/molly_connell/notes.side.ily
+++ b/strathspeys/molly_connell/notes.side.ily
@@ -27,18 +27,18 @@ intro = \drummode {% by Dean Hall, 2006
 }
 snareA = \drummode {
 	\tutti {
-		\flamd d4 	\flam g8.[
+		\flam d4 	\flam g8.[
 	} d16:64(]		d8.[) \tutti {
 		\drag d16]		d8.[
 	}
 	
-	g16] |		d8.:64[(-> g16])	\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flamd g8] }		\flam d8.[  g16] |
+	g16] |		d8.:64[(-> g16])	\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flam g8] }		\flam d8.[  g16] |
 
 	\tutti {
 		d16:64[( d8.])		g8.[ \drag d16]
 	}	\triplet  { d16[ g d g d8] }		g8.[ g16] |
-	\flamddr \triplet  { d8 \fr g d }		\tutti {
-		\flamd g8.[ \flam g16]		\triplet  { d16 g d g d8 } g8
+	\flamdr \triplet  { d8 \fr g d }		\tutti {
+		\flam g8.[ \flam g16]		\triplet  { d16 g d g d8 } g8
 	}
 }
 
@@ -53,9 +53,9 @@ snareBA = \drummode {
 	} \triplet  { d16[ g d g d8] }		\triplet  { g8[ d g] } |
 
 	\tutti {
-		\flamd \triplet  { d8[ g16 g16 d8] }		g8.[
+		\flam \triplet  { d8[ g16 g16 d8] }		g8.[
 		} g16]		\triplet  { d8[ g16 g16 d8] }		g8.[ g16] |
-	\flamddr \triplet  { d8[ \fr  g d] }		\tutti {
+	\flamdr \triplet  { d8[ \fr  g d] }		\tutti {
 		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
 	}
 }
@@ -67,6 +67,6 @@ snareBB = \drummode {
 		\drag d16[ d8.]		\flam d8.[ \flam g16]		\triplet  { d16[ g d g d8] }		\triplet  { g8[\mf\> d g]\p  } |
 
 		\flam d4\f		\flam g8.[ d16:64](		d8.[) \drag d16]		d8.[ g16] |
-		\flamd \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
+		\flam \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
 	}
 }