diff --git a/.gitignore b/.gitignore
index c619e73..a8b4a83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 to_process/
 piobaireachd/
-sets/
+sets
 tmp/
diff --git a/2-4_marches/black_bear/.tenor.ly.swp b/2-4_marches/black_bear/.tenor.ly.swp
deleted file mode 100644
index 1365de3..0000000
Binary files a/2-4_marches/black_bear/.tenor.ly.swp and /dev/null differ
diff --git a/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp b/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp
deleted file mode 100644
index 04d9dd8..0000000
Binary files a/4-4_marches/the_pikemans_march/.notes.pipes.ily.swp and /dev/null differ
diff --git a/4-4_marches/the_pikemans_march/.pipes.ly.swp b/4-4_marches/the_pikemans_march/.pipes.ly.swp
deleted file mode 100644
index d682213..0000000
Binary files a/4-4_marches/the_pikemans_march/.pipes.ly.swp and /dev/null differ
diff --git a/fix.sh b/fix.sh
index 8665cb1..a156227 100644
--- a/fix.sh
+++ b/fix.sh
@@ -2,3 +2,12 @@
 COMMAND=''
 
 sed "s/\"\(.*.ily\)\"/\".\/\1\"/g"  -i **/**/*.ly **/*.ly
+
+
+
+
+
+
+
+## dr|fr to tutti
+#:%s/\([^\s ]*\)\s*\\dr\(.\{-}\)\\fr/\\tutti { \1 \2 }
diff --git a/makedrum b/makedrum
index 833ff04..ce6075b 100644
--- a/makedrum
+++ b/makedrum
@@ -13,7 +13,7 @@ class MakeDrum:
 	VERSION  = '0.9.7'
 	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
 	RUN_DIR = os.path.abspath(os.curdir)
-	TMP_DIR  = '.'
+	TMP_DIR  = 'tmp'
 	TMP_PREFIX = 'tmp_'
 	OUT_DIR = '.'
 
diff --git a/sets/set_5.full.ly b/sets/set_5.full.ly
deleted file mode 100644
index 5531692..0000000
--- a/sets/set_5.full.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.18.2"
-
-\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
-\paper {#(define page-breaking ly:minimal-breaking)}
-#(ly:set-option 'relative-includes #t)
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/full.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-full.ly"
diff --git a/sets/set_5.pipes.ly b/sets/set_5.pipes.ly
deleted file mode 100644
index 1c2768e..0000000
--- a/sets/set_5.pipes.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.18.2"
-
-\header {title = "Set 5: Scotland the Brave / Wings / Rowan Tree / Scotland the brave (high)"}
-\paper {#(define page-breaking ly:minimal-breaking)}
-#(ly:set-option 'relative-includes #t)
-
-
-%Scores
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/wings/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/rowan_tree/pipes.ly"
-\include "/home/ericteunis/public/www/pipeband-drumming/music/4-4_marches/scotland_the_brave/high-pipes.ly"
diff --git a/standards/.standards.mid.ly.swp b/standards/.standards.mid.ly.swp
deleted file mode 100644
index d3dde9c..0000000
Binary files a/standards/.standards.mid.ly.swp and /dev/null differ
diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily
index 73a493a..fc236dd 100644
--- a/standards/standards.tenor.ily
+++ b/standards/standards.tenor.ily
@@ -73,14 +73,14 @@ tenorFourfoursOneB = \drummode {
 % 6/8s
 % --------------------------
 tenorSixeightsOneA = \drummode {
-				d4.\up g\up |
+				\flourish d4. \flourish g  |
 				d^\splitTheFeather r |
 				d g |
 				\scoop { d8 r8 g8 d4. } |
 				\flourish d4. \flourish g |
 				d^\splitTheFeather r |
 				d g |
-				\scoop { d8r8 g8 d4. } |
+				\scoop { d8 r8 g8 d4. } |
 }
 
 tenorSixeightsOneB = \drummode {
diff --git a/standards/standards.tenor.ly b/standards/standards.tenor.ly
index 43b30bb..8e6c9c1 100644
--- a/standards/standards.tenor.ly
+++ b/standards/standards.tenor.ly
@@ -89,10 +89,9 @@
 
 		\drummode {
 			\repeat volta 2 {
+			  \repeat volta 2 {
 				\tenorNineeightsOneA
-				\bar "||"
-				\break
-				\tenorNineeightsOneB
+			  }
 			}
 		}
 	}
diff --git a/strathspeys/molly_connell/notes.tenor.ily b/strathspeys/molly_connell/notes.tenor.ily
index 4343725..e95f9f6 100644
--- a/strathspeys/molly_connell/notes.tenor.ily
+++ b/strathspeys/molly_connell/notes.tenor.ily
@@ -19,5 +19,5 @@ tenorBB = \drummode {
 	d4^\up g4^\up \flourish { d4 g4 } |
 	d4 \parenthesize d8. g16 r8. g16 d4 |
 	d4 g4 d8. g16 d4 |
-	d4^\up g4^\up \flourish d4 \flourish g4 |
+	\flourish d4 \flourish g4 d4^\up g4^\up |
 }