diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
index 59d1b0b..dd99a74 100644
--- a/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
+++ b/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
@@ -8,16 +8,16 @@ sideglobal = {
 %%music
 snareAA = \drummode {
 	\flamdr d8. g16		d4:32(\<		d8)\! \fr d8:32( |
-	\tuplet 3/2 { g16) d g } \flam d8		\flam g4		d4:32( |
+	\tuplet 3/2 { g16) d g } \flam d8		\flam g4		d4:32(\< |
 
-	d8.) g16		d8:32(-> \dr \tuplet 3/2 { g16) d g }		d8:32(-> g8:32)(-> |
+	d8.)\! g16		d8:32(-> \dr \tuplet 3/2 { g16) d g }		d8:32(-> g8:32)(-> |
 	\tuplet 3/2 { d16) g d-> } g16. g32		\flam d8 d8:32(	g16.) d32-> g16. g32 |
 }
 snareAB = \drummode {
-	d8:32->( g)\fr		d4:32(		d8) d8:32( |
-	\tuplet 3/2 { g16) d g } \flam d8		d4:32(		d4) |
+	d8:32( g)->\fr		d4:32(\<		d8)\! d8:32( |
+	\tuplet 3/2 { g16) d g } \flam d8		d4:32(\p		d4) |
 
-	\flam d8. g16		d4:32(-\tag #'tutti \dr		d8:32)(-> \tuplet 3/2 { g16) d g } |
+	\flam d8.\mf g16		d4:32(-\tag #'tutti \dr		d8:32)(-> \tuplet 3/2 { g16) d g } |
 	d16. d32 \flam g8		d4:32(		d4)-\tag #'tutti \fr
 }
 % Part 2
@@ -30,8 +30,8 @@ snareBA = \drummode {
 }
 snareBB = \drummode {
 	d8. \fr g16		d8:32( g8)		d4:32( |
-	\tuplet 3/2 { g16) d g } \flamd d8		d4:32(		d4) |
+	\tuplet 3/2 { g16) d g } \flamd d8		d4:32(\p		d4) |
 
-	\flam d8. g16		d4:32(\dr		d8:32)(-> \tuplet 3/2 { g16) d g } |
+	\flam d8.\mf  g16		d4:32(\dr		d8:32)(-> \tuplet 3/2 { g16) d g } |
 	d16. d32 \flam g8		d4:32(		d4) \fr
 }
diff --git a/airs/alexander_mackenzie/drums.ly b/airs/alexander_mackenzie/drums.ly
index 997a3c0..8a6893a 100644
--- a/airs/alexander_mackenzie/drums.ly
+++ b/airs/alexander_mackenzie/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" {
@@ -36,9 +41,9 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			s8 \tenorAA \tenorAB s8
+			r8 \tenorAA \tenorAB s8
 
-			s8 \tenorBA s8
+			\tenorBA s8
 			\tenorBB s8
 			r8 \tenorAB s8
 		}
diff --git a/airs/alexander_mackenzie/mid.ly b/airs/alexander_mackenzie/mid.ly
index 7839c12..c8e587b 100644
--- a/airs/alexander_mackenzie/mid.ly
+++ b/airs/alexander_mackenzie/mid.ly
@@ -26,7 +26,7 @@
 					\bar "|."
 				}%Format
 				{ 
-					r8 \tenorAA r8
+					r8 \tenorAA
 					\tenorAB s8
 
 					\tenorBA s8
diff --git a/airs/alexander_mackenzie/notes.bass.ily b/airs/alexander_mackenzie/notes.bass.ily
index 021a87c..151d64d 100644
--- a/airs/alexander_mackenzie/notes.bass.ily
+++ b/airs/alexander_mackenzie/notes.bass.ily
@@ -1,32 +1,32 @@
 % 6/8 Alexander MacKenzie
 % Bass
 \version "2.18.2"
-composerBass  = "v0.5, E.T. de Boone, 2016"
+composerBass  = "v0.8, E.T. de Boone, 2016"
 bassglobal = {}
 % Music
 bassAA = \drummode {
 	d8 g4	d4 g8 |
-	d8 g4	d4. |
+	d4.	g4. |
 	d4 g8	d8 g d |
-	d4 g8 	d4. |
+	g4 g8 	d4. |
 }
 bassAB = \drummode {
 	d8 g4	d4 g8 |
 	d8 g4	d4. |
-	d8 d4	g8 d4 |
-	d4. 	d4. |
+	d4.	g4. |
+	d4. 	g4. |
 }
 
 
 bassBA = \drummode {
-  d4 g8		d8 g d |
-  g8. d8 g16	d4 g8 |
-  d4 g8		d8 g d |
-  d4.		d4. |
+	d4 g8		d8 g d |
+	g4 g8	d4 g8 |
+	d4.		d8 g d |
+	g4.		g4. |
 }
 bassBB = \drummode {
-  d4 g8		d8 g d |
-  d8. d8 g16	d4 g8 |
-  d8 d4		g8 d4 |
-  d4. 	d4. |
+	d4 g8		d8 g d |
+	g4 g8	d4 g8 |
+	d4.		g4. |
+	d4. 	g4. |
 }
diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily
index f6149b4..7b6c29b 100644
--- a/airs/alexander_mackenzie/notes.side.ily
+++ b/airs/alexander_mackenzie/notes.side.ily
@@ -1,7 +1,7 @@
 % 6/8 Alexander MacKenzie
 % Side
 \version "2.18.2"
-composerSide = "v1.3, E.T. de Boone, 2016"
+composerSide = "v1.4, E.T. de Boone, 2016"
 sideglobal = {
 	\sixteenthCompoundBeaming
 }
@@ -11,7 +11,7 @@ snareAA = \drummode {
 	\tutti {
 		\dragd d16. d32-> g16. g32 \flamd d8 d4.:32( \< |
 
-		d4) \!
+		d4) \v \!
 	}  d16. g32 d8:32( d8) g8 |
 	\tutti {
 		\flamd d16.\< g32 d16. \flamg g32 d16. g32 \flamd d4 \!
@@ -34,9 +34,9 @@ snareAB = \drummode {
 snareBA = \drummode {
 	d8:32( |
 	g4) \tutti {
-		\flam d16. g32 d8:32(\< d8) \flamd d8\!
+		\flam d16. g32 d8:32(\< d8) \flamd g8\!
 	} |
-	d32-> g d g d g d g-> d g d g		d4-> d8:32(
+	\flam d16. g32 d16. g32-> d g d g		d4-> d8:32(
 
 	g4) \tutti {
 		\flam d16. g32 d8:32( d8) g |
@@ -46,8 +46,8 @@ snareBA = \drummode {
 snareBB = \drummode {
 	d8:32( |
 	g4) \tutti {
-		\flam d16. g32 d8:32( d8) \flamd d8 |
-		d32-> g d g d g d g-> d g d  g d4.-> |
+		\flam d16. g32 d8:32( d8) \flamd g8 |
+		\flam d16. g32 d16. g32-> d g d g		d4.-> |
 		
 		d8:32(\< g16.)\!
 	}  d32-> g16. g32	\tutti {
diff --git a/airs/alexander_mackenzie/notes.tenor.ily b/airs/alexander_mackenzie/notes.tenor.ily
index 39226b4..262334c 100644
--- a/airs/alexander_mackenzie/notes.tenor.ily
+++ b/airs/alexander_mackenzie/notes.tenor.ily
@@ -1,19 +1,19 @@
 % 6/8 Alexander MacKenzie
 % Tenor
 \version "2.18.2"
-composerTenor = "v0.9, E.T. de Boone, 2016"
+composerTenor = "v1.0, E.T. de Boone, 2016"
 tenorglobal = {}
 % Music
 tenorAA = \drummode {
   d8 g4 	d4. |
   d8 g16 d g8	d4 d16 \< g16 |
   d4.-> \!	d8 g d |
-  g8 d16\< g d g	d4\!
+  g8 d16\< g d g	d4.\!
 }
 tenorAB = \drummode {
   d8 g4		d4. |
   d8 g16 d g8	d4. |
-  d8 d8.-> g16	d8 d8.-> g16 |
+  d8 d4->	d8 d4-> |
   d4 g8	d4
 }
 
@@ -29,6 +29,6 @@ tenorBB = \drummode {
   d8 |
   g4-> d16 g	d8 g d |
   d16-> g d g d-> g		d4 d8 |
-  d8 d8.-> g16	d8 d8.-> g16 |
+  d8 d4->	d8 d4-> |
   d4 g8	d4
 }
diff --git a/airs/alexander_mackenzie/tenor.ly b/airs/alexander_mackenzie/tenor.ly
index 25975af..4fcbcbb 100644
--- a/airs/alexander_mackenzie/tenor.ly
+++ b/airs/alexander_mackenzie/tenor.ly
@@ -11,13 +11,13 @@
 	\tenorglobal
 	<<
 			{
-			\repeat volta 2 { \line \break } \break
+			\repeat volta 2 { \part \line \break } \break
 			\repeat volta 2 { \part \halfline \break }
 				\alternative{ {\part \halfline \break}{\part \halfline \break} }
 			\bar "|."
 		}
 		{
-			\tenorAA s8
+			r8 \tenorAA
 			\tenorAB s8
 
 			\tenorBA s8