diff --git a/changelog.txt b/changelog.txt
index b895188c..deadb27d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,5 @@
 ---version 2.0.2 released---
-
+13-aug-2008 - punkrockguy318 - SDL: fixed --input(1-4) options.  input1 and 2 are regular inputs, input3 and 4 are famicom expansion inputs
 12-aug-2008 - zeromus - fix SDL configfile woes. configfile now goes to ~/.fceux/fceux.cfg
 12-aug-2008 - zeromus - SF [ 2047986 ] palflag 1 in .fm2 files crashes fceux
 12-aug-2008 - adelikat - movie replay dialog displays fractions of a second
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 7ef815ed..2fead875 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -80,9 +80,11 @@ char *DriverUsage="\
 --volume     {0 - 100} Sets volume.\n\
 --lowpass      {0|1}   Enables low-pass filter if x is nonzero.\n\
 --soundrecord   f      Records sound to file f.\n\
---input1        d      Set the input device for controller input1\n\
---input(2,3,4)  d      Set the input device for controller input(2, 3, 4)\n\
-                    Devices:  none, gamepad, zapper, powerpada, powerpadb\n\
+--input(1,2)    d      Set the input device for controller input 1 or 2.\n\
+                          Devices:  gamepad zapper powerpad.0 powerpad.1 arkanoid\n\
+--input(3,4)    d      Set the famicom expansion device for controller input(3, 4)\n\
+                          Devices: quizking hypershot mahjong toprider ftrainer\n\
+                            familykeyboard oekakids arkanoid shadow bworld 4player\n\
 --inputcfg      d      Configures input device d on startup (gamepad1, gamepad2).\n\
 --playmov       f      Plays back a recorded movie from filename f.\n\
 --loadlua       f      Loads lua script from filename f.\n";
diff --git a/src/fceu.cpp b/src/fceu.cpp
index f88f1838..693ca4f4 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -347,8 +347,6 @@ FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode)
 
 	GetFileBase(fp->filename.c_str());
 
-	//free(ipsfn);
-
 	if(!fp) {
 		FCEU_PrintError("Error opening \"%s\"!",name);
 		return 0;
diff --git a/src/file.cpp b/src/file.cpp
index 40e28745..b1127d0c 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -216,10 +216,11 @@ FileBaseInfo DetermineFileBase(const char *f) {
 	//	FileExt[0]=0;
 	//}
 
-	char drv[1000], dir[1000], name[1000], ext[1000];
+	char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX];
 	splitpath(f,drv,dir,name,ext);
 
 	return FileBaseInfo((std::string)drv + dir,name,ext);	
+	
 }
 
 inline FileBaseInfo DetermineFileBase(const std::string& str) { return DetermineFileBase(str.c_str()); }