diff --git a/Changes.txt b/Changes.txt
index 87689b67d..6eb3727ca 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -37,7 +37,11 @@
     Windows, ATI video cards, and OpenGL mode.  The sound device is now
     opened only once when Stella starts, and is paused between loading
     different ROMs.  This fixes a problem whereby sound could possibly
-    not be functional after loading the first ROM.
+    not be functional after loading the first ROM.  Related to this,
+    removed the 'audiofirst' commandline argument as it's now redundant.
+
+  * Fixed bug with displaying the ROM launcher in Windows XP; the initial
+    load was sometimes taking up to 30 seconds to complete.
 
   * Added logging facility, whereby the output of the application is
     available within Stella itself.  This can still be printed to the
@@ -69,11 +73,14 @@
     items would cause the program to crash; scrolling now works as
     expected.
 
+  * Fixed minor display issue in the debugger RAM area; some addresses
+    were being displayed as '...'.
+
   * Fixed compile issues in the latest versions of Ubuntu and Debian, and
     fixed UNIX desktop file so that Stella will launch with a ROM when
     selected from its icon.  Thanks go to Stephen Kitt for this code.
 
-  * Updated include PNG library to latest stable version.
+  * Updated included PNG library to latest stable version.
 
   * Updated the credits list in the documentation, listing people that
     have donated hardware to the Stella team.
diff --git a/docs/index.html b/docs/index.html
index c35e22585..280303f37 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1848,14 +1848,6 @@
       <td>Overlay console info on the TIA image during emulation.</td>
     </tr>
 
-    <tr>
-      <td><pre>-audiofirst &lt;1|0&gt;</pre></td>
-      <td>Initialize the audio subsystem before video when emulating a
-        ROM.  This seems to be required when using ATI video cards
-        in OpenGL mode in Windows.  Since it doesn't hurt other
-        systems, the default is 1.</td>
-    </tr>
-
     <tr>
       <td><pre>-fastscbios &lt;1|0&gt;</pre></td>
       <td>Disable Supercharger BIOS progress loading bars.</td>
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index bac5985fe..e4887a152 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.5_svn_test4"
+#define STELLA_VERSION "3.5_svn_test5"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif
diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx
index d23aeb95b..0ba12dbe3 100644
--- a/src/debugger/gui/RamWidget.cxx
+++ b/src/debugger/gui/RamWidget.cxx
@@ -102,7 +102,7 @@ RamWidget::RamWidget(GuiObject* boss, const GUI::Font& font, int x, int y)
   for(int row = 0; row < 8; ++row)
   {
     myRamLabels[row] =
-      new StaticTextWidget(boss, font, xpos + 5, ypos + row*lineHeight + 2,
+      new StaticTextWidget(boss, font, xpos + 8, ypos + row*lineHeight + 2,
                            3*fontWidth, fontHeight, "", kTextAlignLeft);
   }
 
@@ -308,7 +308,7 @@ void RamWidget::fillGrid(bool updateOld)
   myRamStart->setLabel(buf);
   for(uInt32 i = start, row = 0; i < start + 16*8; i += 16, ++row)
   {
-    BSPF_snprintf(buf, 3, "%02X:", state.rport[i] & 0x00ff);
+    BSPF_snprintf(buf, 3, "%02X", state.rport[i] & 0x00ff);
     myRamLabels[row]->setLabel(buf);
   }
 }
diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index e3aefe37e..b3035be9e 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -510,7 +510,6 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum)
   #ifdef CHEATCODE_SUPPORT
     myCheatManager->loadCheats(myRomMD5);
   #endif
-    bool audiofirst = mySettings->getBool("audiofirst");
     //////////////////////////////////////////////////////////////////////////
     // For some reason, ATI video drivers for OpenGL in Win32 cause problems
     // if the sound isn't initialized before the video
@@ -520,7 +519,7 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum)
     // http://www.atariage.com/forums/index.php?showtopic=126090&view=findpost&p=1648693
     // Hopefully it won't break anything else
     //////////////////////////////////////////////////////////////////////////
-    if(audiofirst)  myConsole->initializeAudio();
+    myConsole->initializeAudio();
     myEventHandler->reset(EventHandler::S_EMULATE);
     if(createFrameBuffer() != kSuccess)  // Takes care of initializeVideo()
     {
@@ -528,7 +527,6 @@ bool OSystem::createConsole(const string& romfile, const string& md5sum)
       myEventHandler->reset(EventHandler::S_LAUNCHER);
       return false;
     }
-    if(!audiofirst)  myConsole->initializeAudio();
 
     if(showmessage)
     {
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 81af4186c..284292200 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -117,7 +117,6 @@ Settings::Settings(OSystem* osystem)
   setInternal("ramrandom", "true");
   setInternal("avoxport", "");
   setInternal("stats", "false");
-  setInternal("audiofirst", "true");
   setInternal("fastscbios", "false");
   setExternal("romloadcount", "0");
   setExternal("maxres", "");
@@ -371,7 +370,6 @@ void Settings::usage()
     << "  -ctrlcombo    <1|0>          Use key combos involving the Control key (Control-Q for quit may be disabled!)\n"
     << "  -autoslot     <1|0>          Automatically switch to next save slot when state saving\n"
     << "  -stats        <1|0>          Overlay console info during emulation\n"
-    << "  -audiofirst   <1|0>          Initial audio before video (required for some ATI video cards)\n"
     << "  -fastscbios   <1|0>          Disable Supercharger BIOS progress loading bars\n"
     << "  -snapdir      <path>         The directory to save snapshot files to\n"
     << "  -sssingle     <1|0>          Generate single snapshot instead of many\n"