diff --git a/2-4_marches/caller_herrin/config.ily b/2-4_marches/caller_herrin/config.ily
index 9f6b7eb..4326529 100644
--- a/2-4_marches/caller_herrin/config.ily
+++ b/2-4_marches/caller_herrin/config.ily
@@ -2,13 +2,14 @@
 %% Globals
 global = {
 	\time 2/4
-	}
+	\key d \major
+}
 
 confTempo = {
 	\tempo 4 = 80
 	}
 %% 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/caller_herrin/notes.pipes.ily b/2-4_marches/caller_herrin/notes.pipes.ily
index a000d88..43329ac 100644
--- a/2-4_marches/caller_herrin/notes.pipes.ily
+++ b/2-4_marches/caller_herrin/notes.pipes.ily
@@ -1,15 +1,18 @@
 % 2/4 Caller Herrini
 % Pipes
 \version "2.18.2"
-composerPipes = "Trad., arr: A.M. Cairns"
-pipeglobal = {}
+composerPipes = "Trad."
+arrangerPipes = "A.M. Cairns"
+pipeglobal = {
+	\key d \major
+}
 pipesA = {
 	\grg a8 |
 	\grg d4 \grg d8 [ \grG e8 ] |
 	\dblc c4 \thrwd d8. [ e16 ] |
 	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
-	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | 
-	
+	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] |
+
 	\grg d4 \grg d8 [ \grG e8 ] |
 	\dblc c4 \thrwd d8. [ e16 ] |
 	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
@@ -21,31 +24,15 @@ pipesB = {
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
 	\dblc c8 [ b8 ] \grG a8 [ A8 ] |
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
-	\dblc c8 [ b8 ] \grG a8 [ A8 ] | 
-	
+	\dblc c8 [ b8 ] \grG a8 [ A8 ] |
+
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
 	\dbld d8 [ c8 ] \grg d8. [ e16 ] |
 	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
-	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | 
-	
+	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] |
+
 	\grg d4 \grg d8 [ \grG e8 ] |
 	\dblc c4 \thrwd d8. [ e16 ] |
 	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
-	\thrwd d4 \slurd d8 A8 
-}
-
-pipesC = {
-	g16  f16  \grg e16  d16  	\grg c16  b16  \grG a16  A16  |
-	g16  f16  \grg e16  d16  	\grg c16  b16  \grG a16  A16  |
-	g16  f16  \grg e16  d16  	\grg d16  c16  \grg e16.  f32  |
-	\grg f16  b16  \grg e16.  d32	\dblc c16  a16  \grg b16  c16  |
-
-	\thrwd d8  \grg d16 \grG d16 	\dblc c8  \grg d16. e32  |
-	\grg f16  g16  \grA e16.  f32 
-}
-pipesCA = {
-	\thrwd d8 [ \slurd d16 A16 ]
-}
-pipesCB = {
-	\thrwd d8 [ \slurd d8]
+	\thrwd d4 \slurd d8
 }
diff --git a/2-4_marches/caller_herrin/notes.pipes.seconds.ily b/2-4_marches/caller_herrin/notes.pipes.seconds.ily
index 5838450..c311c83 100644
--- a/2-4_marches/caller_herrin/notes.pipes.seconds.ily
+++ b/2-4_marches/caller_herrin/notes.pipes.seconds.ily
@@ -2,19 +2,21 @@
 % Pipes
 \version "2.18.2"
 composerPipesSec = "Trad., arr: A.M. Cairns"
-pipesSecglobal = {}
+pipesSecglobal = {
+	\key d \major
+}
 pipesSecA = {
 \grg a8 |
  \grg d4 \grg d8 [ \grG c8 ] |
  \dblc c4 \thrwd d8. [ e16 ] |
  \dbld d8 [ f8 ] \dblc c8. [ b16 ] |
- \dble e8 [ \grg c8 ] \dblb d8 [ e8 ] | 
+ \dble e8 [ \grg c8 ] \dblb d8 [ e8 ] |
 
  \grg d4 \grg d8 [ \grG c8 ] |
  \dblc c4 \thrwd d8. [ e16 ] |
  \dbld d8 [ f8 ] \dblc c8. [ b16 ] |
  \dblf f4 \gre f8
- 
+
  }
 
 pipesSecB = {
@@ -22,31 +24,15 @@ pipesSecB = {
  \grg e8 [ d8 ] \dblc c8 [ b8 ] |
  \grg a8 [ d8 ] \grg c8 [ f8 ] |
  \grg e8 [ d8 ] \dblc c8 [ b8 ] |
- \grg a8 [ d8 ] \dblc c8 [ f8 ] | 
+ \grg a8 [ d8 ] \dblc c8 [ f8 ] |
 
  \grg e8 [ d8 ] \dblc c8 [ b8 ] |
  \grg b8 [ a8 ] \grg b8. [ c16 ] |
  \dbld d8 [ f8 ] \dblc c8. [ b16 ] |
- \grg a8 [ \gre c8 ] \grg d8 [ e8 ] | 
+ \grg a8 [ \gre c8 ] \grg d8 [ e8 ] |
 
 \thrwd d4 \grg d8 [ \grG c8 ] |
  \dblc c4 \grg d8. [ e16 ] |
  \dbld d8 [ e8 ] \grA c8. [ d16 ] |
- \dblf f4 \gre f8 \gre f8 
-}
-
-pipesSecC = {
- \grg e16  d16  \grg b16  c16	\grg a16  d16  \grg c16  f16  |
- \grg e16  d16  \grg b16  c16	\grg a16  d16  \grg c16  f16  |
- \grg e16  d16  \grg b16  c16	\grg b16  a16  \grg b16. c32  |
- \grg d16  f16  \grg c16. b32	\grg a16  c16  \grg d16  e16  |
- \thrwd d8  \grg d16 \grG d16	\dblc c8  \grg d16. e32  |
- \grg d16  e16  \grg c16.  d32  
-}
-
-pipesSecCA = {
-	\dblf f8  \gre f16 \gre f16 
-}
-pipesSecCB = {
-	\dblf f8  \gre f8 
-}
+ \dblf f4 \gre f8
+}
\ No newline at end of file
diff --git a/2-4_marches/caller_herrin/pipes.full.ly b/2-4_marches/caller_herrin/pipes.full.ly
index b4b04db..66c6718 100644
--- a/2-4_marches/caller_herrin/pipes.full.ly
+++ b/2-4_marches/caller_herrin/pipes.full.ly
@@ -6,54 +6,47 @@
 \include "./notes.pipes.ily"
 \include "./notes.pipes.seconds.ily"
 
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
 \score {
 	\new StaffGroup <<
-		\new Staff = "pipes"  {
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
 			\global
 			\pipeglobal
-			\bagpipeKey
-			\set Staff.instrumentName = \markup{ \instrumentPipes }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
 					\repeat volta 2 {
-						\part \line
+						\part \halfline
+						\halfline
 					}\break
-	
+
 					\part \halfline \line
-	
-					\repeat volta 2 {
-						\halfline s2 s1
-						}
-					\alternative {
-						{ s2 }
-						{s2}
-					}
+					\bar "|."
 				}%Format
 				{
 					\pipesA s8
-	
+
 					\pipesB
 
-					\pipesC
-					\pipesCA
-					\pipesCB
 				}%Pipes
 			>>
 		}
-		\new Staff = "seconds" {
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
 			\pipesSecglobal
-			\bagpipeKey
-			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
-			
+
 			\pipesSecA s8
 
 			\pipesSecB
 
-			\pipesSecC
-			\pipesSecCA
-			\pipesSecCB
 		}
 	>>
 	\header {
diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
index 97bef70..068999c 100644
--- a/2-4_marches/caller_herrin/pipes.ly
+++ b/2-4_marches/caller_herrin/pipes.ly
@@ -8,31 +8,24 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
 		<<
 			{
 				\repeat volta 2 {
 					\part \halfline
-				}\break
-
-				\part \halfline \line
-
-				\repeat volta 2 {
-					\halfline s2 s1
-				}
-				\alternative {
-					{ s1 }
-					{s1}
+					\halfline
 				}
+				\break
+
+				\part \halfline
+				\break
+				\line
+				\bar "|."
 			}
 			{
 			\pipesA s8
 
 			\pipesB
 
-			\pipesC
-			\pipesCA
-			\pipesCB
 			}
 		>>
 	}
@@ -41,5 +34,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
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 ede5625..fae83d8 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
@@ -1,7 +1,7 @@
-% /6/8 10th Btn HLI Crossing the Rhine
+% 6/8 10th Btn HLI Crossing the Rhine
 % Pipes
 \version "2.18.2"
-composerPipes = ""
+composerPipes = "PM D.S. Ramsay"
 arrangerPipes = ""
 pipeglobal = {
 	\key d \major
diff --git a/6-8_marches/gliding_to_arnhem/notes.pipes.ily b/6-8_marches/gliding_to_arnhem/notes.pipes.ily
index 9c918e6..d323ac8 100644
--- a/6-8_marches/gliding_to_arnhem/notes.pipes.ily
+++ b/6-8_marches/gliding_to_arnhem/notes.pipes.ily
@@ -12,7 +12,7 @@ pipesA = {
     \dblA A8. [ e16 c8 ] \grg a8. [ \grd c16 e8 ] |
     \grg f8. [ d16 f8 ] \dble e8. [ c16 \grG a8 ] |
     \dblA A8. [ e16 c8 ] \grg a8. [ \grd c16 e8 ] |
-    \grg f8. [ b16 \grG b8 ] \slurb b4 \dblg g8 |
+    \grg f8. [ b16 \grG b8 ] \slurb b4 \dblg g8 | | \break
 
     \dblA A8. [ e16 c8 ] \grg a8. [ \grd c16 e8 ] |
     \grg f8. [ d16 f8 ] \dble e8. [ c16 \grG a8 ] |
@@ -25,7 +25,7 @@ pipesB = {
     \grg c8. [ e16 A8 ] \thrwd d8. [ \grg f16 A8 ] |
     \grg c8. [ e16 A8 ] \dble e8. [ c16 \grG a8 ] |
     \thrwd d8. [ \grg f16 A8 ] \hdble e8. [ \grg c16 e8 ] |
-    \dblc c8. [ b16 \grG b8 ] \grg b8. [ c16 d8 ] |
+    \dblc c8. [ b16 \grG b8 ] \grg b8. [ c16 d8 ] | \break
 
     \grg c8. [ e16 A8 ] \thrwd d8. [ \grg f16 A8 ] |
     \hdble e8. [ \grg c16 e8 ] \dblc c8. [ b16 \grG a8 ] |
@@ -38,7 +38,7 @@ pipesC = {
     \dblc c8. [ b16 \grG a8 ] \dble e8. [ c16 \grG a8 ] |
     \grg f8. [ d16 A8 ] \hdble e8. [ c16 \grG a8 ] |
     \dblc c8. [ b16 \grG a8 ] \dble e8. [ c16 \grG a8 ] |
-    \grg f8. [ b16 \grG b8 ] \grg b8. [ c16 d8 ] |
+    \grg f8. [ b16 \grG b8 ] \grg b8. [ c16 d8 ] | \break
 
     \dblc c8. [ b16 \grG a8 ] \dble e8. [ c16 \grG a8 ] |
     \grg f8. [ d16 A8 ] \hdble e8. [ c16 \grG a8 ] |
@@ -51,7 +51,7 @@ pipesD = {
     A4 \grip A8 f8. [ g16 A8 ] |
     \hdble e8. [ \grg c16 e8 ] \dblc c8. [ b16 \grG a8 ] |
     A4 \grip A8 f8. [ g16 A8 ] |
-    \hdble e8. [ \grg c16 e8 ] \slurb b4 \hslurg g8 |
+    \hdble e8. [ \grg c16 e8 ] \slurb b4 \hslurg g8 | \break
 
     A4 \grip A8 f8. [ g16 A8 ] |
     \hdble e8. [ \grg c16 e8 ] \dblc c8. [ b16 \grG a8 ] |