diff --git a/SConstruct b/SConstruct
index 9530212c..e51a8d28 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,7 +4,7 @@ import sys
 # XXX path separator fixed right now
 opts = Options()
 opts.AddOptions(
-  BoolOption('FRAMESKIP', 'Enable frameskipping', 0),
+  BoolOption('FRAMESKIP', 'Enable frameskipping', 1),
   BoolOption('OPENGL',    'Enable OpenGL support (SDL only)', 1)
 )
 
diff --git a/changelog.txt b/changelog.txt
index 2f0bc1c0..3d35e726 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,10 @@
 ---version 2.0.2 released---
-10-aug-2008 - punkrockguy318 - Added lua script loading hotkey in sdl build (f3).  Non win32 SDL requires zenity for this to function.
-10-aug-2008 - punkrockguy318 - Build script cleanup
+10-aug-2008 - punkrockguy318 - SDL: Changed default A/B from numpad 2/3 to j/k.
+10-aug-2008 - punkrockguy318 - SDL: Enable frameskip by default
+10-aug-2008 - punkrockguy318 - SDL: Fixed a bug that would crash fceux if the emulation speed was overincreased
+10-aug-2008 - punkrockguy318 - SDL: New default hotkeys to more closely match win32 defaults
+10-aug-2008 - punkrockguy318 - SDL: Added lua script loading hotkey (f3).  Non win32 SDL requires zenity for this to function.
+10-aug-2008 - punkrockguy318 - SDL: Build script cleanup
 10-aug-2008 - zeromus - SF [ 2030405 ] Avi recording: no sound b0rks format
 10-aug-2008 - zeromus - SF [ 2037878 ] Convert .fcm doesn't do special characters
 09-aug-2008 - zeromus - SF [ 2040463 ] Add an "author" text field in the record movie dialog
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index 048bb11c..a288633f 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -264,19 +264,19 @@ InitConfig()
     
     // Hotkeys
     prefix = "SDL.Hotkeys.";
-    config->addOption(prefix + "CheatMenu", SDLK_F2);
+    config->addOption(prefix + "CheatMenu", SDLK_F1);
     config->addOption(prefix + "LoadLua", SDLK_F3);
     config->addOption(prefix + "RenderBG", SDLK_F4);
     config->addOption(prefix + "SaveState", SDLK_F5);
     config->addOption(prefix + "LoadState", SDLK_F7);
-    config->addOption(prefix + "Screenshot", SDLK_F9);
-    config->addOption(prefix + "Reset", SDLK_F10);
-    config->addOption(prefix + "Power", SDLK_F11);
+    config->addOption(prefix + "Reset", SDLK_F9);
+    config->addOption(prefix + "Screenshot", SDLK_F12);
     config->addOption(prefix + "Quit", SDLK_ESCAPE);
-    config->addOption(prefix + "Pause", SDLK_BACKSLASH);
+    config->addOption(prefix + "Pause", SDLK_PAUSE);
     config->addOption(prefix + "DecreaseSpeed", SDLK_MINUS);
     config->addOption(prefix + "IncreaseSpeed", SDLK_EQUALS);
-    config->addOption(prefix + "FrameAdvance", SDLK_RCTRL);
+    config->addOption(prefix + "FrameAdvance", SDLK_BACKSLASH);
+    config->addOption(prefix + "Power", 0);
     
     
 
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index d581fb78..f82df020 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -307,11 +307,13 @@ KeyboardCommands()
     if(_keyonly(key)) {
         FCEUI_ToggleEmulationPause();
     }
+    
     g_config->getOption("SDL.Hotkeys.FrameAdvance", &key);
     if(_keyonly(key)) {
-        // this currently crashes fceu for me, is this broken?
+        // 8-10-08 - this freezes fceux for me - punkrockguy318
         FCEUI_FrameAdvance();
     }
+    
 
     
     g_config->getOption("SDL.Hotkeys.Reset", &key);
@@ -1521,7 +1523,7 @@ const char *GamePadNames[GAMEPAD_NUM_BUTTONS] =
 const char *DefaultGamePadDevice[GAMEPAD_NUM_DEVICES] =
     {"Keyboard", "None", "None", "None"};
 const int DefaultGamePad[GAMEPAD_NUM_DEVICES][GAMEPAD_NUM_BUTTONS] =
-    { { SDLK_KP2, SDLK_KP3, SDLK_TAB, SDLK_RETURN,
+    { { SDLK_j, SDLK_k, SDLK_TAB, SDLK_RETURN,
         SDLK_w, SDLK_s, SDLK_a, SDLK_d, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
       { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
diff --git a/src/drivers/sdl/sdl-throttle.cpp b/src/drivers/sdl/sdl-throttle.cpp
index ebaab612..dcc061db 100644
--- a/src/drivers/sdl/sdl-throttle.cpp
+++ b/src/drivers/sdl/sdl-throttle.cpp
@@ -71,7 +71,7 @@ IncreaseEmulationSpeed()
     int i = 0;
 
     // find the next entry in the FPS rate table
-    while(i < (FPS_TABLE_SIZE - 1) && s_fpsScaleTable[i] < g_fpsScale) {
+    while(i < (FPS_TABLE_SIZE - 2) && s_fpsScaleTable[i] < g_fpsScale) {
         i++;
     }
     g_fpsScale = s_fpsScaleTable[i+1];