diff --git a/6-8_marches/kilaloe/config.ily b/6-8_marches/kilaloe/config.ily
index 3b1bde9..1f7689c 100644
--- a/6-8_marches/kilaloe/config.ily
+++ b/6-8_marches/kilaloe/config.ily
@@ -2,10 +2,11 @@
 %% Globals
 global = {
 	\time 6/8
-	}
+	\key d \major
+}
 confTempo = { 
 	\tempo 4. = 80 
-	}
+}
 %% Format
 part = { \partial 8 \grace {s4} s8 }
 measure = { \grace {s4 } s2. | }
diff --git a/6-8_marches/kilaloe/full.48th.ly b/6-8_marches/kilaloe/full.48th.ly
deleted file mode 100644
index 5738312..0000000
--- a/6-8_marches/kilaloe/full.48th.ly
+++ /dev/null
@@ -1,136 +0,0 @@
-\version "2.19.0"
-
-\include "bagpipe.ly"
-\include "lilydrum.ly"
-
-\include "./config.ily"
-%\include "./notes.bass.ily"
-\include "./notes.tenor.ily"
-\include "./notes.side.48th.ily"
-\include "./notes.pipes.ily"
-%\include "./notes.pipes.seconds.ily"
-%\include "./notes.lyrics.ily"
-
-part = { \partial 4. \grace {s4} s4. }
-\score {
-	\new StaffGroup <<
-		\new Staff \with {
-			instrumentName = \markup{ \instrumentPipes }
-			shortInstrumentName = \markup{ \shortInstrumentPipes }
-		} {
-			\global
-			\pipeglobal
-			<<
-				\new NullVoice = "format" {
-					\part
-					\line
-					\break
-					\line \bar "||"
-					\break
-
-					\part
-					\line
-					\break
-					\line
-					\bar ".|:-||"
-
-					\break
-					\repeat volta 2 {
-						\part
-						\line
-						\break
-						\line
-						\measure
-					}
-
-				}%Format
-
-				\new Voice = "pipes" {
-					r4 \pipesA s4.
-
-					\pipesB s4.
-
-					\pipesC s4.
-				}%Pipes
-			>>
-		}
-%		\new Staff = "song" {
-%  			\lyricsglobal
-%			\new Voice = "lyrics" {
-%
-%			}
-%		}
-%		\new Lyrics = "verse1" {
-%		  \lyricsglobal
-%		  \lyricsto "lyrics" {
-%			\verseA
-%		  }
-%		}
-%		\new Staff = "seconds" \with {
-%			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-%		} {
-%			\pipessecndglobal
-%
-%
-%		}
-		\new PipeBandDrumStaff = "side" \with {
-			instrumentName = \markup { \instrumentSide }
-			shortInstrumentName = \markup{ \shortInstrumentSide }
-		} {
-			\sideglobal
-
-			\repeat unfold 2 {
-				\snareA \snareA s4.
-			}
-
-			\snareC s4.
-
-		}
-		\new PipeBandDrumStaff = "tenor" \with {
-			instrumentName = \markup{ \instrumentTenor }
-			shortInstrumentName = \markup{ \shortInstrumentTenor }
-		} {
-			\tenorglobal
-
-			\repeat unfold 2 {
-				r4. \tenorAA r4. |
-				\tenorAB s4. |
-			}
-
-			r4. \tenorBA r4. |
-			\tenorBB s4. |
-			| % Volta bracket for pipes
-		}
-%		\new PipeBandDrumStaff = "bass" \with {
-%			instrumentName = \markup{ \instrumentBass }
-%			shortInstrumentName = \markup{ \shortInstrumentBass }
-%		} {
-%			\bassglobal
-%
-%		}
-	>>
-	\header {
-		title = \title
-		band = "48th HIGHRS"
-		meter = \meter
-		composer = \markup \large {
-			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
-			}
-			\column \right-align {
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
-				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
-				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
-				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
-				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
-				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
-			}
-		}
-	}
-}
diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily
index 34a3395..ca4861a 100644
--- a/standards/standards.tenor.ily
+++ b/standards/standards.tenor.ily
@@ -31,10 +31,10 @@ tenorTwofoursOneB = \drummode {
 }
 tenorTwoFoursPI = \drummode {
 	\repeat unfold 2 {
-		d4^\markup{"Swing"} \flourish { d4 g d } |
+		d4^\markup{"Swing"} \flourish { g4 d g } |
 	}
-	d4^\markup{"Swing"} \flourish { d4 g d } |
-	d4^\markup{"Swing"} d4 g4 \stf d4 |
+	d4^\markup{"Swing"} \flourish { g4 d g } |
+	d4^\markup{"Swing"} g4 d4 \stf g4 |
 }
 
 tenorTwoFoursPII = \drummode {