diff --git a/lilydrum/embellishments.ily b/lilydrum/embellishments.ily
old mode 100644
new mode 100755
diff --git a/lilydrum/flourish_symbols/butterfly.eps b/lilydrum/flourish_symbols/butterfly.eps
old mode 100644
new mode 100755
diff --git a/lilydrum/flourish_symbols/st_andrews_crss.eps b/lilydrum/flourish_symbols/st_andrews_crss.eps
old mode 100644
new mode 100755
diff --git a/lilydrum/flourish_symbols/stop.eps b/lilydrum/flourish_symbols/stop.eps
old mode 100644
new mode 100755
diff --git a/lilydrum/flourishing.ily b/lilydrum/flourishing.ily
old mode 100644
new mode 100755
diff --git a/lilydrum/layout_tweaks.ily b/lilydrum/layout_tweaks.ily
old mode 100644
new mode 100755
index 054fdbd..7c5580f
--- a/lilydrum/layout_tweaks.ily
+++ b/lilydrum/layout_tweaks.ily
@@ -95,6 +95,15 @@ drumPitchNames =
 		\accepts "PipeBandDrumStaff"
 	}
 }
+\midi {
+	\context {
+		\DrumStaff
+		\name PipeBandDrumStaff
+		\alias DrumStaff
+
+		\override DrumStaff.midiInstrument = #"drums"
+	}
+}
 
 % ===================================================	%
 % 	*Shorts* for Naming									%
@@ -111,4 +120,4 @@ shortInstrumentPipes = "P."
 composerSide  = ""
 composerTenor = ""
 composerBass  = ""
-composerPipes = ""
\ No newline at end of file
+composerPipes = ""
diff --git a/lilydrum/musical_functions.ily b/lilydrum/musical_functions.ily
old mode 100644
new mode 100755
diff --git a/lilydrum/special_sticking.ily b/lilydrum/special_sticking.ily
old mode 100644
new mode 100755
diff --git a/makedrum b/makedrum
index 549a7e9..7447246 100755
--- a/makedrum
+++ b/makedrum
@@ -11,10 +11,10 @@ from argparse import ArgumentParser
 class MakeDrum:
 	LILYPOND = 'lilypond'
 	VERSION  = '0.9.5'
-	TMP_DIR  = './tmp'
-	TMP_PREFIX = 'tmp_'
 	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
 	RUN_DIR = os.path.abspath(os.curdir)
+	TMP_DIR  = './tmp'
+	TMP_PREFIX = 'tmp_'
 
 	def __init__(self):
 		# Gather options and create the template file
@@ -29,7 +29,7 @@ class MakeDrum:
 			help='show Lilypond version and exit')
 
 		parser.add_argument('-x', '--drumfile',
-			dest='lilydrum', default='lilydrum.ly',
+			dest='lilydrum', default=os.path.join(self.MASTER_DIR,'lilydrum.ly'),
 			help='Use the specified file for drums')
 		parser.add_argument('-c', '--pipefile',
 			dest='lilypipe', default='bagpipe.ly',
@@ -115,14 +115,12 @@ class MakeDrum:
 				print('Seems like no output directory can be created')
 				return
 
-		os.chdir(self.MASTER_DIR)
 		for file_path in self.args.music_file:
 			self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path), self.args.gen_out, self.args.compile)
 
 		#if not
 		#os.rmdir(self.TMP_DIR)
 
-		os.chdir(self.RUN_DIR)
 
 	def processit(self, tmp_dir, file, gen_out, compile):
 		tmp_file = self.maketemplate(tmp_dir, file)
@@ -196,8 +194,10 @@ class MakeDrum:
 			lily_includes = lily_includes + "\n\\include \"{}\"".format(f)
 
 		# set up a tmp file with template and file combined
-		tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-'))
+		tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('../music-','',1).replace('/', '-'))
 
+		print(file + ' is to be templated')
+		print(tmp_file + ' is templated file')
 		out_file = codecs.open(tmp_file, 'w+', 'utf8')
 		out_file.write(u'\ufeff')