diff --git a/English.lproj/VLDocument.nib/info.nib b/English.lproj/VLDocument.nib/info.nib
index 7c13fb8..4c83955 100644
--- a/English.lproj/VLDocument.nib/info.nib
+++ b/English.lproj/VLDocument.nib/info.nib
@@ -8,10 +8,10 @@
 	<string>460.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>216</integer>
-		<integer>196</integer>
-		<integer>5</integer>
 		<integer>144</integer>
+		<integer>196</integer>
+		<integer>216</integer>
+		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9A412</string>
diff --git a/English.lproj/VLDocument.nib/keyedobjects.nib b/English.lproj/VLDocument.nib/keyedobjects.nib
index f03ab66..ec78887 100644
Binary files a/English.lproj/VLDocument.nib/keyedobjects.nib and b/English.lproj/VLDocument.nib/keyedobjects.nib differ
diff --git a/Sources/VLDocument.mm b/Sources/VLDocument.mm
index e5ed3a3..df59bdf 100644
--- a/Sources/VLDocument.mm
+++ b/Sources/VLDocument.mm
@@ -472,10 +472,12 @@
 	[self willChangeValueForKey:@"songKey"];
 	[self willChangeValueForKey:@"songTime"];
 	[self willChangeValueForKey:@"songDivisions"];
+	[self willChangeValueForKey:@"songGroove"];
 	song->swap(*[savedSong song]);
 	[self didChangeValueForKey:@"songKey"];
 	[self didChangeValueForKey:@"songTime"];
 	[self didChangeValueForKey:@"songDivisions"];
+	[self didChangeValueForKey:@"songGroove"];
 	[self didChangeSong];
 }
 
diff --git a/Sources/VLKeyValueUndo.mm b/Sources/VLKeyValueUndo.mm
index 6e1239b..dadb615 100644
--- a/Sources/VLKeyValueUndo.mm
+++ b/Sources/VLKeyValueUndo.mm
@@ -23,7 +23,7 @@
 		[owner addObserver:self forKeyPath:key 
 			   options:NSKeyValueObservingOptionOld|NSKeyValueObservingOptionNew
 			   context:[keysAndNames objectForKey:key]];
-
+		
 	return self;
 }
 
diff --git a/Sources/VLMIDIDocument.mm b/Sources/VLMIDIDocument.mm
index adc60a3..638a7ec 100644
--- a/Sources/VLMIDIDocument.mm
+++ b/Sources/VLMIDIDocument.mm
@@ -48,7 +48,8 @@
 
 
 - (void)mmaDone:(NSNotification *)notification {
-	[[NSNotificationCenter defaultCenter] removeObserver: self];
+	[[NSNotificationCenter defaultCenter] removeObserver: self 
+		name:NSTaskDidTerminateNotification object:[notification object]];
     int status = [[notification object] terminationStatus];
     if (!status) {
 		;
diff --git a/Sources/VLPDFDocument.mm b/Sources/VLPDFDocument.mm
index 4789c98..81aec2a 100644
--- a/Sources/VLPDFDocument.mm
+++ b/Sources/VLPDFDocument.mm
@@ -51,7 +51,8 @@
 
 
 - (void)pdfDone:(NSNotification *)notification {
-	[[NSNotificationCenter defaultCenter] removeObserver: self];
+	[[NSNotificationCenter defaultCenter] removeObserver: self 
+		name:NSTaskDidTerminateNotification object:[notification object]];
     int status = [[notification object] terminationStatus];
     if (!status) {
 		;
diff --git a/Sources/VLSheetView.mm b/Sources/VLSheetView.mm
index 5019597..9f8696f 100644
--- a/Sources/VLSheetView.mm
+++ b/Sources/VLSheetView.mm
@@ -943,8 +943,7 @@ static int8_t sSharpAcc[] = {
 		removeIndex = 11;
 	if (removeIndex >= 0)
 		[fGrooveMenu removeItemAtIndex:removeIndex];
-	[[[fGrooveMenu menu] insertItemWithTitle:groove action:@selector(selectGroove:) 
-		keyEquivalent:@"" atIndex:2] setTarget:self];
+	[fGrooveMenu insertItemWithTitle:groove atIndex:2];
 	[fGrooveMenu selectItemAtIndex:2];
 	NSArray * grooves = [fGrooveMenu itemTitles];
 	grooves = [grooves subarrayWithRange:NSMakeRange(2, [grooves count]-2)];