diff --git a/Changelog b/Changelog
index eda676e74..aa8f2c5a2 100644
--- a/Changelog
+++ b/Changelog
@@ -2,11 +2,12 @@
 ----
 Dragging to the dock icon now works in 10.3.
 Selection now selects the first song added when adding new files.
-Now seeds the random number for shuffle mode.
+Now seeds the random number generator for shuffle mode.
 Redesigned UI thanks to Julian Mayer <julianmayer (at) mac.com>.
-If nothing is selected when the user presses play, the first song is played.
+If nothing is selected when the user presses play, the first song is selected and played.
 Double-clicking when out of focus now behaves as expected.
 Now has a simple dock menu courtesy of Nathanael Weldon <nathanael (at) mailblocks.com>.
+The playlist index now starts at 1.
 
 0.04
 ----
diff --git a/DBLog.c b/DBLog.c
index 47d0a585b..db96956ab 100644
--- a/DBLog.c
+++ b/DBLog.c
@@ -2,13 +2,14 @@
  *  NSDebug.c
  *  Cog
  *
- *  Created by Zaphod Beeblebrox on 5/30/05.
- *  Copyright 2005 __MyCompanyName__. All rights reserved.
+ *  Created by Vincent Spader on 5/30/05.
+ *  Copyright 2005 Vincent Spader All rights reserved.
  *
  */
 
 #include "DBLog.h"
 
+
 void DBLog(NSString *format, ...)
 {
 #ifdef DEBUG
diff --git a/DBLog.h b/DBLog.h
index 230d32f09..8c3fb0825 100644
--- a/DBLog.h
+++ b/DBLog.h
@@ -2,8 +2,8 @@
  *  NSDebug.h
  *  Cog
  *
- *  Created by Zaphod Beeblebrox on 5/30/05.
- *  Copyright 2005 __MyCompanyName__. All rights reserved.
+ *  Created by Vincent Spader on 5/30/05.
+ *  Copyright 2005 Vincent Spader All rights reserved.
  *
  */
 
@@ -18,4 +18,4 @@ extern "C"
 	
 #ifdef __cplusplus
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index 193f62d08..168df6fad 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -21,8 +21,8 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>21</integer>
 		<integer>463</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8B15</string>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 7ac2ea49f..af16ef9f1 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Feedback/FeedbackController.h b/Feedback/FeedbackController.h
index 69e4d531a..ec38c69bc 100644
--- a/Feedback/FeedbackController.h
+++ b/Feedback/FeedbackController.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/26/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Feedback/FeedbackController.m b/Feedback/FeedbackController.m
index 6129e94a6..48f7e6f0a 100644
--- a/Feedback/FeedbackController.m
+++ b/Feedback/FeedbackController.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/26/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "FeedbackController.h"
diff --git a/Feedback/FeedbackSocket.h b/Feedback/FeedbackSocket.h
index dcd2bff13..4ae3edb7d 100644
--- a/Feedback/FeedbackSocket.h
+++ b/Feedback/FeedbackSocket.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/27/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Feedback/FeedbackSocket.m b/Feedback/FeedbackSocket.m
index 8d9dfcd10..0eeb24b51 100644
--- a/Feedback/FeedbackSocket.m
+++ b/Feedback/FeedbackSocket.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/27/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "FeedbackSocket.h"
diff --git a/Playlist/PlaylistController.h b/Playlist/PlaylistController.h
index 9ca027d64..bb68b48d2 100644
--- a/Playlist/PlaylistController.h
+++ b/Playlist/PlaylistController.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/18/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 5d1c20e02..14bdfdcab 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/18/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "PlaylistController.h"
@@ -41,7 +41,7 @@
 		PlaylistEntry *pe = [[PlaylistEntry alloc] init];
 
 		[pe	setFilename:filename]; //Setfilename takes car of opening the soundfile..cheap hack, but works for now
-		[pe setIndex:index];
+		[pe setIndex:(index+1)];
 		[pe readTags];
 		[pe readInfo];
 		
@@ -207,7 +207,7 @@
 		PlaylistEntry *p;
 		p = [[self content] objectAtIndex:j];
 		
-		[p setIndex:j];
+		[p setIndex:(j+1)];
 	}
 }
 
@@ -372,7 +372,7 @@
 	}
 	else
 	{
-		int i = [currentEntry index] + 1;
+		int i = ([currentEntry index] - 1) + 1;
 
 		if (i >= [[self arrangedObjects] count]) //out of tuuuunes
 		{
@@ -404,7 +404,7 @@
 	[currentEntry setCurrent:NO];
 	
 	[pe setCurrent:YES];
-	[tableView scrollRowToVisible:[(PlaylistEntry *)pe index]];
+	[tableView scrollRowToVisible:([(PlaylistEntry *)pe index]-1)];
 	
 	[pe retain];
 	[currentEntry release];
diff --git a/Playlist/PlaylistEntry.h b/Playlist/PlaylistEntry.h
index 59db67ea5..5ee9acfbf 100644
--- a/Playlist/PlaylistEntry.h
+++ b/Playlist/PlaylistEntry.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/14/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index 9e7e4396e..7e58c4702 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/14/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "PlaylistEntry.h"
diff --git a/Playlist/PlaylistView.h b/Playlist/PlaylistView.h
index 20367c946..a505a749b 100644
--- a/Playlist/PlaylistView.h
+++ b/Playlist/PlaylistView.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/20/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
index 257ccd134..9eb055872 100644
--- a/Playlist/PlaylistView.m
+++ b/Playlist/PlaylistView.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/20/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "PlaylistView.h"
diff --git a/Sound.h b/Sound.h
index 19dec99ce..17634fac9 100644
--- a/Sound.h
+++ b/Sound.h
@@ -2,8 +2,8 @@
 //  Sound.h
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 5/11/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 5/11/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Sound.m b/Sound.m
index 445cce040..e49f4090f 100644
--- a/Sound.m
+++ b/Sound.m
@@ -2,8 +2,8 @@
 //  Sound.m
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 5/11/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 5/11/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #include <mach/mach_init.h>
diff --git a/SoundFile/AACFile.h b/SoundFile/AACFile.h
index 3cb1d2ea3..00d023c45 100644
--- a/SoundFile/AACFile.h
+++ b/SoundFile/AACFile.h
@@ -2,8 +2,8 @@
 //  AACFile.h
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 5/31/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 5/31/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/AACFile.m b/SoundFile/AACFile.m
index 41fe3b046..053e176bb 100644
--- a/SoundFile/AACFile.m
+++ b/SoundFile/AACFile.m
@@ -2,8 +2,8 @@
 //  AACFile.m
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 5/31/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 5/31/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "AACFile.h"
diff --git a/SoundFile/FlacFile.h b/SoundFile/FlacFile.h
index b067b1c33..3d997ab1f 100644
--- a/SoundFile/FlacFile.h
+++ b/SoundFile/FlacFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/25/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/FlacFile.m b/SoundFile/FlacFile.m
index b5fe2e119..fdb9a113a 100644
--- a/SoundFile/FlacFile.m
+++ b/SoundFile/FlacFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/25/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "FlacFile.h"
diff --git a/SoundFile/MPEGFile.h b/SoundFile/MPEGFile.h
index edb8afb46..02b6847c4 100644
--- a/SoundFile/MPEGFile.h
+++ b/SoundFile/MPEGFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/30/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/MPEGFile.m b/SoundFile/MPEGFile.m
index f23a7b962..536c253c3 100644
--- a/SoundFile/MPEGFile.m
+++ b/SoundFile/MPEGFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/30/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "MPEGFile.h"
diff --git a/SoundFile/MonkeysFile.h b/SoundFile/MonkeysFile.h
index 3e3641dd8..59e47da9d 100644
--- a/SoundFile/MonkeysFile.h
+++ b/SoundFile/MonkeysFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/30/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/MonkeysFile.m b/SoundFile/MonkeysFile.m
index 72fb025f8..bc41cf9fb 100644
--- a/SoundFile/MonkeysFile.m
+++ b/SoundFile/MonkeysFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/30/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "MonkeysFile.h"
diff --git a/SoundFile/MusepackFile.h b/SoundFile/MusepackFile.h
index aac651cd1..fd945083f 100644
--- a/SoundFile/MusepackFile.h
+++ b/SoundFile/MusepackFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/23/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/MusepackFile.m b/SoundFile/MusepackFile.m
index 1b3062749..b05f8095c 100644
--- a/SoundFile/MusepackFile.m
+++ b/SoundFile/MusepackFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/23/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "MusepackFile.h"
diff --git a/SoundFile/ShnFile.h b/SoundFile/ShnFile.h
index 6cdc9f7b9..ff7501190 100644
--- a/SoundFile/ShnFile.h
+++ b/SoundFile/ShnFile.h
@@ -2,8 +2,8 @@
 //  ShnFile.h
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 6/6/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 6/6/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/ShnFile.m b/SoundFile/ShnFile.m
index cf598615a..6b8027d8a 100644
--- a/SoundFile/ShnFile.m
+++ b/SoundFile/ShnFile.m
@@ -2,8 +2,8 @@
 //  ShnFile.m
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 6/6/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 6/6/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "ShnFile.h"
diff --git a/SoundFile/SoundFile.h b/SoundFile/SoundFile.h
index 1ba193ab4..6a28b42d4 100644
--- a/SoundFile/SoundFile.h
+++ b/SoundFile/SoundFile.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 1/15/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/SoundFile.m b/SoundFile/SoundFile.m
index 5beb37556..b1275a0b0 100644
--- a/SoundFile/SoundFile.m
+++ b/SoundFile/SoundFile.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 1/15/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "SoundFile.h"
diff --git a/SoundFile/VorbisFile.h b/SoundFile/VorbisFile.h
index 32cd9a841..7e4c82f4c 100644
--- a/SoundFile/VorbisFile.h
+++ b/SoundFile/VorbisFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/22/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/VorbisFile.m b/SoundFile/VorbisFile.m
index 9460f269c..996d68213 100644
--- a/SoundFile/VorbisFile.m
+++ b/SoundFile/VorbisFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/22/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "VorbisFile.h"
diff --git a/SoundFile/WavPackFile.h b/SoundFile/WavPackFile.h
index b6a7a3b02..0f08fc441 100644
--- a/SoundFile/WavPackFile.h
+++ b/SoundFile/WavPackFile.h
@@ -2,8 +2,8 @@
 //  WavPackFile.h
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 6/6/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 6/6/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/WavPackFile.m b/SoundFile/WavPackFile.m
index eef27eab7..3270f33ea 100644
--- a/SoundFile/WavPackFile.m
+++ b/SoundFile/WavPackFile.m
@@ -2,8 +2,8 @@
 //  WavPackFile.m
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 6/6/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Created by Vincent Spader on 6/6/05.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "WavPackFile.h"
diff --git a/SoundFile/WaveFile.h b/SoundFile/WaveFile.h
index cce7be372..ffda228c4 100644
--- a/SoundFile/WaveFile.h
+++ b/SoundFile/WaveFile.h
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/31/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/SoundFile/WaveFile.m b/SoundFile/WaveFile.m
index 43d9106e5..e20ddf0b0 100644
--- a/SoundFile/WaveFile.m
+++ b/SoundFile/WaveFile.m
@@ -3,7 +3,7 @@
 //  zyVorbis
 //
 //  Created by Vincent Spader on 1/31/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "WaveFile.h"
diff --git a/Updates/UpdateController.h b/Updates/UpdateController.h
index 2cd802760..6bba9d37c 100644
--- a/Updates/UpdateController.h
+++ b/Updates/UpdateController.h
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/26/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/Updates/UpdateController.m b/Updates/UpdateController.m
index bc6f4ca4f..2149a5d38 100644
--- a/Updates/UpdateController.m
+++ b/Updates/UpdateController.m
@@ -3,7 +3,7 @@
 //  Cog
 //
 //  Created by Vincent Spader on 3/26/05.
-//  Copyright 2005 __MyCompanyName__. All rights reserved.
+//  Copyright 2005 Vincent Spader All rights reserved.
 //
 
 #import "UpdateController.h"
diff --git a/main.m b/main.m
index 76dde019b..b84dbff8c 100644
--- a/main.m
+++ b/main.m
@@ -2,7 +2,7 @@
 //  main.m
 //  Cog
 //
-//  Created by Zaphod Beeblebrox on 5/7/05.
+//  Created by Vincent Spader on 5/7/05.
 //  Copyright __MyCompanyName__ 2005. All rights reserved.
 //