diff --git a/3-4_marches/my_land/notes.pipes.ily b/3-4_marches/my_land/notes.pipes.ily
index 938498d..23eb5cb 100644
--- a/3-4_marches/my_land/notes.pipes.ily
+++ b/3-4_marches/my_land/notes.pipes.ily
@@ -2,7 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "N. MacLean"
-arrangerPipes = "Seaforth Highlanders (1936)"
+arrangerPipes = "1936"
 pipeglobal = {
 	\bagpipeKey
 }
diff --git a/4-4_marches/flett_of_flotta/full.ly b/4-4_marches/flett_of_flotta/full.ly
index d95f574..97c0b20 100644
--- a/4-4_marches/flett_of_flotta/full.ly
+++ b/4-4_marches/flett_of_flotta/full.ly
@@ -11,11 +11,12 @@
 
 \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 }
 			<<
 				{
 					\repeat volta 2 {
@@ -36,10 +37,11 @@
 				}%Pipes
 			>>
 		}
-		\new PipeBandDrumStaff = "side" {
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup \column {\instrumentSide}
+			shortInstrumentName = \markup{\shortInstrumentSide}
+		} {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 			r8 \snareA s4
 
 			\snareB s4
diff --git a/4-4_marches/flett_of_flotta/notes.side.ily b/4-4_marches/flett_of_flotta/notes.side.ily
index 558542d..d8fe8e1 100644
--- a/4-4_marches/flett_of_flotta/notes.side.ily
+++ b/4-4_marches/flett_of_flotta/notes.side.ily
@@ -2,6 +2,7 @@
 % Snare
 \version "2.18.2"
 composerSide = "v1.4"
+arrangerSide = "E.T. de Boone"
 sideglobal = {
 	\eighthBeaming
 	}
diff --git a/4-4_marches/flett_of_flotta/side.ly b/4-4_marches/flett_of_flotta/side.ly
index 05a6da9..93e303b 100644
--- a/4-4_marches/flett_of_flotta/side.ly
+++ b/4-4_marches/flett_of_flotta/side.ly
@@ -26,5 +26,6 @@
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
+		arranger = \arrangerSide
 	}
 }
diff --git a/init-sets b/init-sets
index f75ae7a..e0efbe2 100755
--- a/init-sets
+++ b/init-sets
@@ -24,7 +24,7 @@ $COM $D/set_2.$f.ly -t "Set 2: High Road to Gairloch / Brown Haired Maiden / Mai
 ;
 
 $COM $D/set_3.$f.ly -t "Set 3: Green Hills of Tyrol / When the Battle is Over / My Land" \
-3-4_marches/green_hill_of_tyrol/$f.ly \
+3-4_marches/green_hills_of_tyrol/$f.ly \
 3-4_marches/when_the_battle_is_over/$f.ly \
 3-4_marches/my_land/$f.ly \
 ;
diff --git a/shadowdir b/shadowdir
index 16bdbf6..3450f2e 100755
--- a/shadowdir
+++ b/shadowdir
@@ -26,6 +26,7 @@ find "$DIRLINK/" -print0 |
 			*.git*) continue;;
 			*.pdf )	continue;;
 			*.png ) continue;;
+			*.midi ) continue;;
 		esac
 
 		name="${oname/$DIRLINK\/}"
diff --git a/standards/98_standards.side.ily b/standards/98_standards.side.ily
index 622e8d8..adffcbe 100644
--- a/standards/98_standards.side.ily
+++ b/standards/98_standards.side.ily
@@ -6,7 +6,7 @@ composerSide = "E.T. de Boone, 05-01-2017"
 midone = \drummode {
 	\tutti {
 		g8 |
-		\flam d8. d16 g8
+		\flam d8. g16 g8
 		d4.:32(\<
 		d4)\! g8
 		|
@@ -60,34 +60,34 @@ pthree = \drummode {
 	d4
 }
 pfour = \drummode {
-  d8:32( |
-  g8.) g16 \flam d8
-  d16 g d g d8
-  \flam d8. d16 \flam g8
-  |
-  \flam d8.-> g16 \flam g8
-  d4.:32~
-  d4
+	d8:32( |
+	g8.) g16 \flam d8
+	d16 g d g d8
+	\flam d8. d16 \flam g8
+	|
+	\flam d8.-> g16 \flam g8
+	d4.:32~
+	d4
 }
 pfive = \drummode {
-  g8 |
-  \flam d8. d16 g8
-  d8.:64~ d16 g8
-  d4:32~->\> g8\!
-  |
-  d16 g d g d8
-  \flam d8. d16 g8
-  \flam d4
+	g8 |
+	\flam d8. d16 g8
+	d8.:64~ d16 g8
+	d4:32~->\> g8\!
+	|
+	d16 g d g d8
+	\flam d8. d16 g8
+	\flam d4
 }
 psix = \drummode {
-  g8 |
-  d4.:32(->
-  d4.:32)(->
-  d16) g d g d8
-  |
-  \flam d8.[ g16 \drag d8]
-  d16 g d g d8
-  \flam g4
+	g8 |
+	d4.:32(->
+	d4.:32)(->
+	d16) g d g d8
+	|
+	\flam d8.[ g16 \drag d8]
+	d16 g d g d8
+	\flam g4
 }
 pseven = \drummode {
 	g8 |
@@ -119,4 +119,3 @@ pnine = \drummode {
 	d4.:32(
 	d4)
 }
-	|