diff --git a/4-4_marches/wings/full.ly b/4-4_marches/wings/full.ly
index 1a7722e..0458e24 100644
--- a/4-4_marches/wings/full.ly
+++ b/4-4_marches/wings/full.ly
@@ -20,9 +20,11 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				\new NullVoice = "format" {
-					\part \line \bar "|."
+					\part \line \bar "||"
+					\line \bar "|."
 					\break
-					\part \line \bar "|."
+					\part \line \bar "||"
+					\line \bar "|."
 				}%Format
 
 				\new Voice = "pipes" {
diff --git a/4-4_marches/wings/side.bak b/4-4_marches/wings/side.bak
deleted file mode 100644
index f77013d..0000000
--- a/4-4_marches/wings/side.bak
+++ /dev/null
@@ -1,38 +0,0 @@
-\version "2.18.2"
-
-\include "config.ily"
-\include "notes.side.ily"
-
-\score {
-    \new PipeBandDrumStaff {
-        \global
-        <<
-			{
-				\partial 8 s8
-				\repeat volta 2 {
-					\halfline
-				}
-				\alternative {
-					{ \halfline }
-					{ \measure | s2^"Fine" s4 s8 \bar "|."}
-				}
-				\partial 8 s8
-				\halfline
-				\measure
-				s1^"D.C. al Fine" \bar "||"
-			}
-			{
-				\snareAA
-					\snareABA
-					\snareABB
-				\snareBA
-			}
-		>>
-	}
-	\header {
-		title = \title
-		meter = \meter
-		instrument = \instrumentSide
-		composer = \composerSide
-	}
-}
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index cf9bb63..6d0d153 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -36,8 +36,8 @@ markTextEol = #(define-music-function (parser location text) (string?) #{
 			
 			\new DrumVoice = "side" {
 				\snareAA
-					\snareABA s4
-					\snareABB
+					\snareABA
+					\snareABB r8 s8
 				\snareBA 
 			}
 		>>
diff --git a/4-4_marches/wings/side.nofine.ly b/4-4_marches/wings/side.nofine.ly
new file mode 100644
index 0000000..67b879e
--- /dev/null
+++ b/4-4_marches/wings/side.nofine.ly
@@ -0,0 +1,35 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+        <<
+			\new NullVoice = "format" {
+				\partial 8 s8 \line \bar "||"
+				\line \bar "||"
+				\break
+				\partial 8 s8 \line \bar "||"
+				\line \bar "|."
+			}%Format
+
+			\new DrumVoice = "side" {
+				\snareAA	\snareABA
+					\removeWithTag #'tutti { \snareAAI \snareABB r8 s8 }
+				\snareBA 
+					\removeWithTag #'tutti { \snareAAI \snareABB r8 s8 }
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}
diff --git a/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily b/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
index 9dbc9de..41c3568 100644
--- a/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
+++ b/6-8_marches/piobaireachd_of_donald_dubh/notes.pipes.ily
@@ -3,57 +3,70 @@
 \version "2.18.2"
 composerPipes = ""
 pipeglobal = {
-	\bagpipeKey
+  \bagpipeKey
 	}
+mbreak = \break
 % Music
 pipesA = {
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ g16 A8 ] \bar "|"
-	\hdble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ g16 A8 ] \bar "|"
-	\hdble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 \bar "|" \break
-
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ g16 A8 ] \bar "|"
-	\hdble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\slurb b4 c8 \thrwd d8. [ e16 f8 ] \bar "|"
-	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 
+	\repeat unfold 2 {
+		\dble e8. [ c16 \grG c8 ] \grg f8. [ g16 A8 ] |
+		\hdble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] |
+	} \alternative {
+		{
+		  \dble e8. [ c16 \grG c8 ] \grg f8. [ g16 A8 ] |
+		  \hdble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 \mbreak |
+		}
+		{
+		  \slurb b4 c8 \thrwd d8. [ e16 f8 ] |
+		  \dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 |
+		}
+	}
 }
 pipesB = {
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ d16 \grG d8 ] \bar "|"
-	\dble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ d16 \grG d8 ] \bar "|"
-	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 \bar "|" \break
-
-	\dble e8. [ c16 \grG c8 ] \grg f8. [ d16 \grG d8 ] \bar "|"
-	\dble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\slurb b4 c8 \thrwd d8. [ e16 f8 ] \bar "|"
-	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 
+	\repeat unfold 2 {
+		\dble e8. [ c16 \grG c8 ] \grg f8. [ d16 \grG d8 ] |
+		\dble e8. [ c16 \grG c8 ] \dblc c8. [ b16 \grG a8 ] |
+	} \alternative {
+		{
+		  \dble e8. [ c16 \grG c8 ] \grg f8. [ d16 \grG d8 ] |
+		  \dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 \mbreak |
+		}
+		{
+		  \slurb b4 c8 \thrwd d8. [ e16 f8 ] |
+		  \dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 |
+		}
+	}
 }
 pipesC = {
-	\grip e4 \grg a8 \grip f4 \grg a8 \bar "|"
-	\grip e4 \grg a8 \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\grip e4 \grg a8 \grip f4 \grg a8 \bar "|"
-	\grip e4 c8 \dblb b4 \grG a8 \bar "|" \break
-
-	\grip e4 \grg a8 \grip f4 \grg a8 \bar "|"
-	\grip e4 \grg a8 \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\slurb b4 c8 \thrwd d8. [ e16 f8 ] \bar "|"
-	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 
+	\repeat unfold 2 {
+		\grip e4 \grg a8 \grip f4 \grg a8 |
+		\grip e4 \grg a8 \dblc c8. [ b16 \grG a8 ] |
+	} \alternative {
+		{
+		  \grip e4 \grg a8 \grip f4 \grg a8 |
+		  \grip e4 c8 \dblb b4 \grG a8 \mbreak |
+		}
+		{
+		  \slurb b4 c8 \thrwd d8. [ e16 f8 ] |
+		  \dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 |
+		}
+	}
 }
 pipesDA = {
-	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] \bar "|"
-	A8. [ e16 \grg e8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] \bar "|"
-	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 \bar "|" 
+	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] |
+	A8. [ e16 \grg e8 ] \dblc c8. [ b16 \grG a8 ] |
+	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] |
+	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 | 
 }
 pipesDBA = {
-	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] \bar "|"
-	A8. [ e16 \grg e8 ] \dblc c8. [ b16 \grG a8 ] \bar "|"
-	\slurb b4 c8 \thrwd d8. [ e16 f8 ] \bar "|"
+	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] |
+	A8. [ e16 \grg e8 ] \dblc c8. [ b16 \grG a8 ] |
+	\slurb b4 c8 \thrwd d8. [ e16 f8 ] |
 	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 
 }
 pipesDBB = {
-	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] \bar "|"
-	A4 \grip A8 \hdblc c8. [ b16 \grG a8 ] \bar "|"
-	\slurb b4 c8 \thrwd d8. [ e16 f8 ] \bar "|"
+	A8. [ e16 \grg e8 ] A8. [ f16 \grg f8 ] |
+	A4 \grip A8 \hdblc c8. [ b16 \grG a8 ] |
+	\slurb b4 c8 \thrwd d8. [ e16 f8 ] |
 	\dble e8. [ c16 \grG a8 ] \dblb b4 \grG a8 
 }
diff --git a/build-all b/build-all
new file mode 100755
index 0000000..fb3a179
--- /dev/null
+++ b/build-all
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./build {*marches,airs,christmas,hornpipes,jigs,other,reels,sinterklaas,strathspeys}/**/*.ly standards/*.ly
diff --git a/other/band_of_brothers/pipes.ly b/other/band_of_brothers/pipes.ly
index c3bdf61..551ecec 100644
--- a/other/band_of_brothers/pipes.ly
+++ b/other/band_of_brothers/pipes.ly
@@ -9,14 +9,12 @@
 \layout {
 	indent = 0
 	\set Score.markFormatter = #format-mark-box-alphabet
-	\context {
-		\Staff
-		\numericTimeSignature
-%		\hideKeySignature
-	}
 }
 \score {
 	\new Staff = "staff_pipes" {
+		\numericTimeSignature
+		\bagpipeKey
+
 		\compressMMRests {
 			\tempo 2. = 32
 			\time 3/4
@@ -29,9 +27,11 @@
 
 		\bar "||"
 		\mark \default
-			\tempo 4 = 108
 			\time 4/4
-			R1*3
+			<<
+			  { s8 \tempo 4 = 108 }
+			  {	R1*3 }
+			>>
 
 			\time 2/4
 			R2
diff --git a/standards/24_44_standards.side.ily b/standards/24_44_standards.side.ily
index 703c6f6..2414887 100644
--- a/standards/24_44_standards.side.ily
+++ b/standards/24_44_standards.side.ily
@@ -59,7 +59,7 @@ endone = \drummode {
 
 endtwo = \drummode {
 	<<
-	  \tag #'tutti \tutti { s8 | s4 s4 s4 r8 }
+	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
 	  {
 		d8:32( |
 		g8) \flamd d16. g32		d16. \flamg g32 d16. g32
@@ -80,7 +80,7 @@ endthree = \drummode {
 }
 endfour = \drummode {
 	<<
-	  \tag #'tutti \tutti { r8 | s4 s4 s4 s8 }
+	  \tag #'tutti \tutti { s8 | s4 s4 s4 s8 }
 	  {
 		d8:32( |
 		\triplet { g16) d g } \flam d16. g32	d32 g d g d16. g32