diff --git a/hornpipes/the_walrus/bass.ly b/hornpipes/the_walrus/bass.ly
index 11f3f79..6b56418 100644
--- a/hornpipes/the_walrus/bass.ly
+++ b/hornpipes/the_walrus/bass.ly
@@ -8,7 +8,7 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-	\bassglobal
+		\bassglobal
 		<<
 			{\repeat volta 2 { \part \line }
 				\break
@@ -21,7 +21,14 @@
 					\repeat volta 2 { \part \halfline}
 					\alternative{ {\halfline} {\halfline}}
 			}
-			{ }
+			{
+				\bassAA
+				\bassAB s8
+
+				\bassBA
+				\bassBBA s8
+				\bassAB s8
+			}
 		>>
 	}
 	\header {
diff --git a/hornpipes/the_walrus/drums.ly b/hornpipes/the_walrus/drums.ly
index 13a425b..1893b4e 100644
--- a/hornpipes/the_walrus/drums.ly
+++ b/hornpipes/the_walrus/drums.ly
@@ -21,12 +21,15 @@
 				\break
 					\repeat volta 2 { \part \halfline}
 					\alternative{ {\halfline} {\halfline}}
+				\bar "||"
 				\break
 					\repeat volta 2 { \part \halfline}
 					\alternative{ {\halfline} {\halfline}}
+				\bar "||"
 				\break
 					\repeat volta 2 { \part \halfline}
 					\alternative{ {\halfline} {\halfline}}
+				\bar "|."
 }%Format
 				{
 					\snareAA
@@ -34,26 +37,38 @@
 
 					\snareBA
 					\snareBBA s8
-					\snareAB s8
+					\snareBBB s8
 
 					\snareCA
 					\snareCBA s8
-					\snareBBA
+					\snareCBB s8
+
+					\snareDA
+					\snareDBA s8
+					\snareDBB s8
 				
 				}%Music
 			>>
 		}
-		\new PipeBandDrumStaff = "bass" {
-			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
-		}
-		\new PipeBandDrumStaff = "tenor" {
+%{		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
+		} %}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+
+			\bassAA
+			\bassAB s8
+
+			\bassBA
+			\bassBBA s8
+			\bassAB s8
 		}
 	>>
 	\header {
diff --git a/hornpipes/the_walrus/full.ly b/hornpipes/the_walrus/full.ly
index 5afcefe..87a3810 100644
--- a/hornpipes/the_walrus/full.ly
+++ b/hornpipes/the_walrus/full.ly
@@ -9,13 +9,19 @@
 \include "./notes.side.ily"
 \include "./notes.pipes.ily"
 
+\layout {
+	indent = 5.0
+	short-indent = 2.0
+}
+
 \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 { \part \line } 	\break
@@ -49,10 +55,10 @@
 				}%Pipes
 			>>
 		}
-		\new PipeBandDrumStaff = "side" {
-			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup { \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
 
 			\snareAA 
 			\snareAB s8
@@ -69,24 +75,26 @@
 			\snareDBA s8
 			\snareDBB s8
 		}
-		\new PipeBandDrumStaff = "bass" {
+%{		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+		} %}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-   	
+
 			\bassAA
 			\bassAB s8
 
 			\bassBA
 			\bassBBA s8
 			\bassAB s8
-
 		}
-	%	\new PipeBandDrumStaff = "tenor" {
-	%		\tenorglobal
-	%		\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-	%		\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-	%	}
 	>>
 	\header {
 		title = \title
diff --git a/hornpipes/the_walrus/notes.side.ily b/hornpipes/the_walrus/notes.side.ily
index 358794d..05105c2 100644
--- a/hornpipes/the_walrus/notes.side.ily
+++ b/hornpipes/the_walrus/notes.side.ily
@@ -1,7 +1,7 @@
 % 2/4 The Walrus
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.7, 2016"
+composerSide = "E.T. de Boone, v0.8, 2016"
 sideglobal = {
 	\eighthBeaming
 }
@@ -108,7 +108,7 @@ snareCBB = \drummode {
 snareDA = \drummode {
 	d16 g |
 	\flam d8 d16 g
-	\flam d32 g d g d16 g
+	\drag d32 d g d g16 g
 	|
 	\flam d16 g32-> d g d g16->
 	d8:32(-> g16) g
@@ -121,7 +121,7 @@ snareDA = \drummode {
 }
 snareDBA = \drummode {
 	\flam d8 d16 g
-	\flam d32 g d g d16 g
+	\drag d32 d g d g16 g
 	|
 	\flam d16 g32-> d g d g16->
 	\triplet { d16 g16 d16 } \flam g16. g32