diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib
index d15d578f9..1be2d504e 100644
--- a/English.lproj/MainMenu.nib/classes.nib
+++ b/English.lproj/MainMenu.nib/classes.nib
@@ -117,6 +117,7 @@
             OUTLETS = {
                 bitrateField = NSTextField; 
                 lengthField = NSTextField; 
+                outputDevices = NSArrayController; 
                 playButton = NSButton; 
                 playlistController = PlaylistController; 
                 playlistView = PlaylistView; 
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index 61b2b0f21..9527fd92c 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -7,17 +7,17 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1063</key>
-		<string>0 228 136 49 0 0 1024 746 </string>
+		<string>0 320 136 49 0 0 1680 1028 </string>
 		<key>1156</key>
-		<string>391 336 241 366 0 0 1024 746 </string>
+		<string>719 527 241 366 0 0 1680 1028 </string>
 		<key>1324</key>
-		<string>453 438 137 182 0 0 1024 746 </string>
+		<string>788 657 137 182 0 0 1680 1028 </string>
 		<key>29</key>
-		<string>-3 696 383 44 0 0 1024 746 </string>
+		<string>-3 976 383 44 0 0 1680 1028 </string>
 		<key>463</key>
-		<string>341 447 341 145 0 0 1024 746 </string>
+		<string>669 637 341 145 0 0 1680 1028 </string>
 		<key>513</key>
-		<string>204 571 125 137 0 0 1024 746 </string>
+		<string>353 835 125 137 0 0 1680 1028 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -34,16 +34,16 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1307</integer>
-		<integer>513</integer>
-		<integer>1324</integer>
-		<integer>21</integer>
-		<integer>463</integer>
 		<integer>29</integer>
+		<integer>513</integer>
+		<integer>463</integer>
 		<integer>1063</integer>
+		<integer>21</integer>
+		<integer>1324</integer>
+		<integer>1307</integer>
 		<integer>1156</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8L127</string>
+	<string>8P2137</string>
 </dict>
 </plist>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index aa7359f32..f43048365 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 924334000..381300248 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -400,9 +400,9 @@
 
 - (void)setCurrentEntry:(PlaylistEntry *)pe
 {
-	[currentEntry setCurrent:NO];
+	[currentEntry setCurrent:[NSNumber numberWithBool:NO]];
 	
-	[pe setCurrent:YES];
+	[pe setCurrent:[NSNumber numberWithBool:YES]];
 	[tableView scrollRowToVisible:[[pe index] intValue]];
 	
 	[pe retain];
diff --git a/Playlist/PlaylistEntry.h b/Playlist/PlaylistEntry.h
index 8ac1fa9ea..021bdd87d 100644
--- a/Playlist/PlaylistEntry.h
+++ b/Playlist/PlaylistEntry.h
@@ -25,11 +25,10 @@
 	NSNumber *bitsPerSample;
 	NSNumber *sampleRate;
 	
-	BOOL current;
+	NSNumber *current;
 	
 	NSNumber *idx;
 	NSNumber *shuffleIndex;
-	NSNumber *displayIndex;
 }
 
 - (void)setIndex:(NSNumber *)i;
@@ -40,8 +39,8 @@
 
 - (void)setURL:(NSURL *)u;
 - (NSURL *)url;
-- (void)setCurrent:(BOOL) b;
-- (BOOL)current;
+- (void)setCurrent:(NSNumber *) b;
+- (NSNumber *)current;
 
 - (void)setArtist:(NSString *)s;
 - (NSString *)artist;
diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index 142a3770e..4afeb2c51 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -17,8 +17,25 @@
 	self = [super init];
 	if (self)
 	{
-		[self setIndex:nil];
-		[self setURL:nil];
+		url = nil;
+
+		artist = nil;
+		album = nil;
+		title = nil;
+		genre = nil;
+
+		year = nil;
+		track = nil;
+		length = nil;
+		bitrate = nil;
+		channels = nil;
+		bitsPerSample = nil;
+		sampleRate = nil;
+		
+		current = nil;
+		
+		idx = nil;
+		shuffleIndex = nil;
 	}
 
 	return self;
@@ -27,6 +44,20 @@
 - (void)dealloc
 {
 	[url release];
+	[artist release];
+	[album release];
+	[title release];
+	[genre release];
+	[year release];
+	[track release];
+	[length release];
+	[bitrate release];
+	[channels release];
+	[bitsPerSample release];
+	[sampleRate release];
+	[current release];
+	[idx release];
+	[shuffleIndex release];
 	
 	[super dealloc];
 }
@@ -69,12 +100,14 @@
 	return url;
 }
 
--(void)setCurrent:(BOOL) b
+-(void)setCurrent:(NSNumber *) b
 {
+	[b retain];
+	[current release];
 	current = b;
 }
 
--(BOOL)current
+-(NSNumber *)current
 {
 	return current;
 }
@@ -229,8 +262,8 @@
 - (void)setSampleRate:(NSNumber *)s
 {
 	[s retain];
-	[s release];
-	
+	[sampleRate release];
+
 	sampleRate = s;
 }
 - (NSNumber *)sampleRate