diff --git a/AUTHORS b/AUTHORS
index 3ec04ddd..01742843 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,8 +5,8 @@ PCSX Upstream Authors:	Linuzappz     <linuzappz@pcsx.net>
 	Nik3d
 	Akumax        <akumax@pcsx.net>
 
-PCSX Copyright:	(C) 1999-2003  Pcsx Team
-	(C) 1998 Vision Thing
+PCSX Copyright:	(c) 1999-2003  Pcsx Team
+	(c) 1998 Vision Thing
 
 df Upstream Authors:	Ryan Schultz <schultz.ryan@gmail.com>
 			Andrew Burton <adb@iinet.net.au>
@@ -14,14 +14,15 @@ df Upstream Authors:	Ryan Schultz <schultz.ryan@gmail.com>
 			Marcus Comstedt <marcus@mc.pp.se>
 			Stefan Sikora <hoshy@schrauberstube.de>
 
-df Copyright:	(C) 2005 Ryan Schultz
-		(C) 2005 Andrew Burton
-		(C) 2007 Stephen Chao
-		(C) 2006 Marcus Comstedt
+df Copyright:	(c) 2005 Ryan Schultz
+		(c) 2005 Andrew Burton
+		(c) 2007 Stephen Chao
+		(c) 2006 Marcus Comstedt
 
 PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project)
 			    dario86 (Various bugfixes)
 			    edgbla (Root counters, various core/plugin fixes)
+			    Firnis (GTE code from PCSX-Revolution Project)
 			    Gabriele Gorla (MDEC decoder)
 			    maggix (Snow Leopard compile fix)
 			    NeToU (Bugfix)
@@ -34,3 +35,4 @@ PCSX-Reloaded Translators: edgbla (Russian)
 			   Giovanni Scafora (Italian)
 			   Tibério Vítor (Brazilian Portuguese)
 			   Wei Mingzhi (Simplified & Traditional Chinese)
+
diff --git a/ChangeLog b/ChangeLog
index 621c4da3..abdfa4b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ May 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
  * libpcsxcore/r3000a.c: Likewise.
  * libpcsxcore/plugins.c: Likewise.
  * libpcsxcore/misc.c: Likewise.
+ * AUTHORS: Updated info.
 
 May 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m
index 787c791c..87cb15d5 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxController.m
@@ -27,7 +27,7 @@ NSString *saveStatePath;
 		CDR_close();
 
 	// switch to another ISO if using internal image reader, otherwise eject the CD
-	if (cdrfilename[0] != '\0') {
+	if (UsingIso()) {
 		NSOpenPanel* openDlg = [NSOpenPanel openPanel];
 
 		[openDlg setCanChooseFiles:YES];
@@ -35,10 +35,10 @@ NSString *saveStatePath;
 
 		if ([openDlg runModal] == NSOKButton) {
 			NSArray* files = [openDlg filenames];
-			strcpy(cdrfilename, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
+			SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
 		}
 
-        cdOpenCase = time(NULL) + 2;
+        SetCdOpenCaseTime(time(NULL) + 2);
 	} else {
 		if (CDR_getDriveLetter() != nil) {
 			deviceName = [NSMutableString stringWithCString:CDR_getDriveLetter()];
@@ -105,7 +105,7 @@ NSString *saveStatePath;
 
 - (IBAction)runCD:(id)sender
 {
-	cdrfilename[0] = '\0';
+	SetIsoFile(NULL);
 	[EmuThread run];
 }
 
@@ -118,14 +118,14 @@ NSString *saveStatePath;
 
 	if ([openDlg runModalForDirectory:nil file:nil] == NSOKButton) {
 		NSArray* files = [openDlg filenames];
-		strcpy(cdrfilename, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
+		SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
 		[EmuThread run];
     }
 }
 
 - (IBAction)runBios:(id)sender
 {
-	cdrfilename[0] = '\0';
+	SetIsoFile(NULL);
 	[EmuThread runBios];
 }