diff --git a/changelog.txt b/changelog.txt
index 68f31a18..7f4ceab4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+01-jan-2009 - adelikat - Win32 - Timing - "disable throttling when sound is off" now only affects FCEUX when sound is off
 26-dec-2008 - adelikat - Metadata - remember window position
 24-dec-2008 - adelikat - auto-save fixes, prevent loading an auto-save from previous session.  Win32 - added flags for enabling auto-save menu item.
 24-dec-2008 - adelikat - added undo/redo savestate hotkey.  Win32 - made undo/redo default key mapping Ctrl+Z
diff --git a/src/drivers/win/args.cpp b/src/drivers/win/args.cpp
index f61eee38..cfdd6d98 100644
--- a/src/drivers/win/args.cpp
+++ b/src/drivers/win/args.cpp
@@ -23,19 +23,18 @@
 #include "common.h"
 #include "../common/args.h"
 
-char* MovieToLoad = 0;
-char* StateToLoad = 0;
-char* ConfigToLoad = 0;
+char* MovieToLoad = 0;		//Loads a movie file on startup
+char* StateToLoad = 0;		//Loads a savestate on startup (after a movie is loaded, if any)
+char* ConfigToLoad = 0;		//Loads a specific .cfg file (loads before any other commandline options
 extern bool turbo;
 
 // TODO: Parsing arguments needs to be improved a lot. A LOT.
 
-/**
-* Parses commandline arguments
-**/
+//-------------------------------------------------------------
+// Parses commandline arguments
+//-------------------------------------------------------------
 char *ParseArgies(int argc, char *argv[])
 {         
-        //int x;  //mbg merge 7/17/06 removed
         static ARGPSTRUCT FCEUArgs[]={
          {"-pal",0,&pal_emulation,0},
          {"-noicon",0,&status_icon,0},
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 3c59ca29..8d126f98 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -673,7 +673,7 @@ int main(int argc,char *argv[])
 	SetAutoFirePattern(AFon, AFoff);
 	UpdateCheckedMenuItems();
 doloopy:
-	UpdateFCEUWindow();  
+	UpdateFCEUWindow();
 	if(GameInfo)
 	{
 		while(GameInfo)
@@ -776,7 +776,7 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
 	//MBG TODO - think about this logic
 	//throttle
 	
-	if(!(eoptions&EO_NOTHROTTLE)) //if throttling is enabled..
+	if(!(eoptions&EO_NOTHROTTLE) && (!soundo)) //if throttling is enabled..
 		if(!turbo) //and turbo is disabled..
 			if(!FCEUI_EmulationPaused() 
 				||JustFrameAdvanced