diff --git a/Changes.txt b/Changes.txt
index 22a60f4b2..278a1bc5f 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -12,7 +12,7 @@
                                Release History
 ===========================================================================
 
-3.1.2 to 3.2: (August 16, 2010)
+3.1.2 to 3.2: (August 20, 2010)
 
   * NOTE: because of the many event-related changes in this release, all
     event mapping should be reset to defaults after starting Stella for
@@ -34,12 +34,21 @@
     now works exactly like an axis in UI mode (holding down a direction
     continues that direction until the hat is released/centered).
 
-  * Several improvements to the debugger:
-      - user labels are now supported again
-      - 'runto' debugger command is now case-insensitive, and shows a
-        progressbar while searching through the disassembly
+  * Several major improvements to the debugger:
+      - the disassembler can now process multiple entry points, and
+        caches entry points as they're encountered (ie, the disassembly
+        isn't 'reset' each time a bank change occurs or you exit and
+        re-enter the debugger)
+      - preliminary support for disassembling from zero-page RAM
+      - re-added ability to change banks with the 'bank' debugger
+        prompt command and within the ROM disassembly UI
+      - user labels in disassembly are now supported again
+      - 'runto' command is now case-insensitive, and shows a progressbar
+        while searching through the disassembly
       - the debugger window can be resized between ROM loads (previously,
         the app had to be restarted)
+      - fixed bug in Distella disassembler output, where it sometimes
+        generated addresses above $FFFF
       - a vertical line separates the disassembly from the raw bytes
 
   * Fixed behaviour of SWCHB and SWBCNT; pins set to output now remember
@@ -48,15 +57,23 @@
     and test ROMs in this area.
 
   * Fixed bug when reading from illegal TIA addresses; a Space Invaders
-    hack was showing pink enemies instead of white ones.
+    hack was showing pink enemies instead of white ones.  Again, special
+    thanks to to Omegamatrix of AtariAge for advice and test ROMs in this
+    area.
 
   * Fixed bug in handling INPT4/INPT5 latches from VBLANK; a least one
     ROM was working in Stella when it didn't on real hardware.
 
+  * Added 'ramrandom' commandline argument, which is used to randomize
+    all RAM in the system; otherwise, the RAM is zeroed.  This defaults
+    to off, which is different than previous versions of Stella.
+
   * Added 'finishing touches' to some of the UI descriptions, giving a
     better explanation of the functions.  Related to this, certain
     options now show a message box explaining the option in further
-    detail (particularly the ROM Audit mode).
+    detail (particularly the ROM Audit mode).  As well, when starting
+    Stella for the first time, a prompt appears to select a ROM
+    directory.
 
   * Fixed bugs in the ROM launcher when viewing certain PNG images not
     created by Stella.  Related to this, the official PNG library is now
@@ -64,9 +81,6 @@
     snapshots for those ROMs which consist of several games.  Thanks go
     to Buzbard of AtariAge for these images.
 
-  * Fixed bug in Distella disassembler output, where it sometimes
-    generated addresses above $FFFF.
-
   * Added several fixes for crashes on 'small' systems (those systems
     where the maximum resolution is less than 640x480).
 
diff --git a/Readme.txt b/Readme.txt
index 7860d6733..509b34e7e 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -9,4 +9,4 @@ the Stella Website at:
 Enjoy,
 
 The Stella Team
-August 16, 2010
+August 20, 2010
diff --git a/docs/debugger.html b/docs/debugger.html
index 60121243e..b2cc9128f 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -64,8 +64,8 @@ feature that no other 2600 debugger has; it's <b>completely</b> cross-platform.<
 	<li>Save CLI session to a text file.</li>
 	<li>Supports hex, decimal, and binary input and output almost everywhere.
 		(disassembly is still hex).</li>
-	<li>Support for bank switching. You can see how many banks a cart has, and the
-    currently selected bank.</li>
+	<li>Support for bank switching. You can see how many banks a cart has and the
+    currently selected bank, and manually change banks.</li>
 	<li>Registers/memory that get changed by the CPU during debugging are
 		highlighted when they're displayed.<li>
 	<li>Scanline advance (like frame advance, break at beginning
@@ -598,6 +598,7 @@ can also get rid of all traps at once with the "cleartraps" command.</p>
 
 <pre>
             a - Set Accumulator to value xx
+         bank - Show # of banks, or switch to bank xx
          base - Set default base (hex, dec, or bin)
         break - Set/clear breakpoint at address xx (default=PC)
       breakif - Set breakpoint on condition xx
@@ -932,11 +933,10 @@ TIA/RIOT labels will still be present.</p>
 
 <p>The top area contains two items:
 <ul>
-<li><b>Bank (current/total)</b>: Shows the current bank in use, and the
-total number of banks.  Note that bank numbers start at 0 (as in most
-programming languages), so '0 / 1' actually means 'the first
-bank of 1 possible bank(s)'.  Due to the way the disassembler works,
-you cannot change banks; the display is for reference only.
+<li><b>Current bank (x total)</b>: Shows the current bank in use (number in textbox),
+and the total number of banks (x).  Note that bank numbers start at 0 (as in most
+programming languages).  If the cartridge contains multiple banks, the bank can
+be changed in the bank textbox, and the ROM will be re-disassembled.
 Note that certain ROMs are quite complex, and may only show has having one
 'virtual' bank when their address space can be swapped in and out in many
 different ways.</li>
@@ -960,8 +960,9 @@ red circle in this area. These are the same breakpoints as used
 by the "break" command, <b>not</b> the conditional "breakif" breakpoints
 (which makes sense: cond-breaks can break on any condition, the Program
 Counter isn't necessarily involved).</li>
-<li><b>Labels</b>: For now, only those generated by Distella, not ones from a
-DASM symbol file or any labels created by the user.</li>
+<li><b>Labels</b>: Any labels assigned to the given address, either generated
+automatically by Distella, read from a DASM symbol file or custom
+labels created by the user.</li>
 <li><b>Instruction</b>: This is a standard 6502 mnemonic (possibly with operand).
 This field also contains the cycle count for the instruction (separated by a
 semicolon).</li>
@@ -973,7 +974,10 @@ bytes in this field.</li>
 <p>The 6502 mnemonic will be UPPERCASE for all standard instructions,
 or lowercase for "illegal" 6502 instructions (like "dcp"). If resolving
 of data sections has been disabled for any reason, you'll likely see a lot
-of illegal opcodes if you scroll to a data table in ROM.</p>
+of illegal opcodes if you scroll to a data table in ROM.  This can also
+occur if the disassembler hasn't yet encountered addresses in the PC.
+If you step/trace/scanline/frame advance into such an area, the disassembler
+will make note of it, and disassemble it correctly from that point on.</p>
 
 <!-- TODO - is this true any longer?
 <p>Beware: the cycle counts don't take into account any penalty cycles
@@ -1025,11 +1029,11 @@ matches the address of the disassembly line where the mouse was clicked.</li>
 
 <ul>
 
-<li>The ROM Widget only works on ROM. If your game runs code from zero-page
-RAM, the code from RAM will not be shown, and the ROM Widget will not highlight
-any instructions.  Once your RAM routine returns, the ROM Widget will work
-normally again. You can still disassemble RAM with the "disasm" command from
-the Prompt.</li>
+<li>The ROM Widget only works on ROM or zero-page RAM separately. If your game runs
+code from zero-page RAM, the disassembly will show addresses $80 to $FF (zero-page
+RAM address space) only.  Once your RAM routine returns, the ROM Widget will switch
+back to ROM space ($1000 - $1FFF and mirrors).  The same is true of the "disasm"
+command; it will show either ROM or RAM space, not both at the same time.</li>
 
 <li>The standard VCS memory map has the cartridge port at locations
 $F000-$FFFF.  However, not all the address lines exist on a 6507, so
diff --git a/docs/graphics/chucky_cheese.png b/docs/graphics/chucky_cheese.png
index 82b1398ec..3271c25f5 100644
Binary files a/docs/graphics/chucky_cheese.png and b/docs/graphics/chucky_cheese.png differ
diff --git a/docs/graphics/circuit.png b/docs/graphics/circuit.png
index 6da16eed8..a0569be16 100644
Binary files a/docs/graphics/circuit.png and b/docs/graphics/circuit.png differ
diff --git a/docs/graphics/commandmenu.png b/docs/graphics/commandmenu.png
index 72ac7e6d0..27c11929f 100644
Binary files a/docs/graphics/commandmenu.png and b/docs/graphics/commandmenu.png differ
diff --git a/docs/graphics/console.png b/docs/graphics/console.png
index 79481bfe7..7a4f35a1b 100644
Binary files a/docs/graphics/console.png and b/docs/graphics/console.png differ
diff --git a/docs/graphics/debugger_bpstatus.png b/docs/graphics/debugger_bpstatus.png
index e3bfdd500..7d4434fba 100644
Binary files a/docs/graphics/debugger_bpstatus.png and b/docs/graphics/debugger_bpstatus.png differ
diff --git a/docs/graphics/debugger_cpuregs.png b/docs/graphics/debugger_cpuregs.png
index 4cc1ef557..ea2f588ff 100644
Binary files a/docs/graphics/debugger_cpuregs.png and b/docs/graphics/debugger_cpuregs.png differ
diff --git a/docs/graphics/debugger_dataops.png b/docs/graphics/debugger_dataops.png
index e1e565dd8..c8fb0d079 100644
Binary files a/docs/graphics/debugger_dataops.png and b/docs/graphics/debugger_dataops.png differ
diff --git a/docs/graphics/debugger_globalbuttons.png b/docs/graphics/debugger_globalbuttons.png
index a2d81026d..b15587570 100644
Binary files a/docs/graphics/debugger_globalbuttons.png and b/docs/graphics/debugger_globalbuttons.png differ
diff --git a/docs/graphics/debugger_iotab.png b/docs/graphics/debugger_iotab.png
index f5a30c7a1..67133c078 100644
Binary files a/docs/graphics/debugger_iotab.png and b/docs/graphics/debugger_iotab.png differ
diff --git a/docs/graphics/debugger_main.png b/docs/graphics/debugger_main.png
index 7e39c0a45..20f897e42 100644
Binary files a/docs/graphics/debugger_main.png and b/docs/graphics/debugger_main.png differ
diff --git a/docs/graphics/debugger_ram.png b/docs/graphics/debugger_ram.png
index 24cdb92d2..922af447f 100644
Binary files a/docs/graphics/debugger_ram.png and b/docs/graphics/debugger_ram.png differ
diff --git a/docs/graphics/debugger_ramsearch.png b/docs/graphics/debugger_ramsearch.png
index 8813ffdf8..09955e7e2 100644
Binary files a/docs/graphics/debugger_ramsearch.png and b/docs/graphics/debugger_ramsearch.png differ
diff --git a/docs/graphics/debugger_rom.png b/docs/graphics/debugger_rom.png
index b33ef806d..79bebe268 100644
Binary files a/docs/graphics/debugger_rom.png and b/docs/graphics/debugger_rom.png differ
diff --git a/docs/graphics/debugger_romcmenu.png b/docs/graphics/debugger_romcmenu.png
index 2d1a30793..566eafffa 100644
Binary files a/docs/graphics/debugger_romcmenu.png and b/docs/graphics/debugger_romcmenu.png differ
diff --git a/docs/graphics/debugger_tiainfo.png b/docs/graphics/debugger_tiainfo.png
index a6a27c7ea..d661ff978 100644
Binary files a/docs/graphics/debugger_tiainfo.png and b/docs/graphics/debugger_tiainfo.png differ
diff --git a/docs/graphics/debugger_tiaoutcmenu.png b/docs/graphics/debugger_tiaoutcmenu.png
index e496f99c2..2a8bd8552 100644
Binary files a/docs/graphics/debugger_tiaoutcmenu.png and b/docs/graphics/debugger_tiaoutcmenu.png differ
diff --git a/docs/graphics/debugger_tiatab.png b/docs/graphics/debugger_tiatab.png
index c2d45bda6..7cf7905b7 100644
Binary files a/docs/graphics/debugger_tiatab.png and b/docs/graphics/debugger_tiatab.png differ
diff --git a/docs/graphics/debugger_tiazoomcmenu.png b/docs/graphics/debugger_tiazoomcmenu.png
index 86cb8a9ce..d043fa31d 100644
Binary files a/docs/graphics/debugger_tiazoomcmenu.png and b/docs/graphics/debugger_tiazoomcmenu.png differ
diff --git a/docs/graphics/developer_stats.png b/docs/graphics/developer_stats.png
index 00f23ee75..76217b9c9 100644
Binary files a/docs/graphics/developer_stats.png and b/docs/graphics/developer_stats.png differ
diff --git a/docs/graphics/eventmapping.png b/docs/graphics/eventmapping.png
index 8c34db475..bfe661f35 100644
Binary files a/docs/graphics/eventmapping.png and b/docs/graphics/eventmapping.png differ
diff --git a/docs/graphics/eventmapping_combo.png b/docs/graphics/eventmapping_combo.png
new file mode 100644
index 000000000..63f7af82d
Binary files /dev/null and b/docs/graphics/eventmapping_combo.png differ
diff --git a/docs/graphics/eventmapping_remap.png b/docs/graphics/eventmapping_remap.png
index 43148ff98..6f74043a1 100644
Binary files a/docs/graphics/eventmapping_remap.png and b/docs/graphics/eventmapping_remap.png differ
diff --git a/docs/graphics/eventmapping_virtualdevs.png b/docs/graphics/eventmapping_virtualdevs.png
index 4c7289de3..9c70a00ee 100644
Binary files a/docs/graphics/eventmapping_virtualdevs.png and b/docs/graphics/eventmapping_virtualdevs.png differ
diff --git a/docs/graphics/jr_pacman.png b/docs/graphics/jr_pacman.png
index 52730e4c9..826bd04d2 100644
Binary files a/docs/graphics/jr_pacman.png and b/docs/graphics/jr_pacman.png differ
diff --git a/docs/graphics/launcher.png b/docs/graphics/launcher.png
index 440592116..c5407fb6c 100644
Binary files a/docs/graphics/launcher.png and b/docs/graphics/launcher.png differ
diff --git a/docs/graphics/launcher_filter.png b/docs/graphics/launcher_filter.png
index b4af9ce65..038bde1b5 100644
Binary files a/docs/graphics/launcher_filter.png and b/docs/graphics/launcher_filter.png differ
diff --git a/docs/graphics/launcher_options.png b/docs/graphics/launcher_options.png
index 9fbf21b4f..63f8be610 100644
Binary files a/docs/graphics/launcher_options.png and b/docs/graphics/launcher_options.png differ
diff --git a/docs/graphics/launcher_options_files.png b/docs/graphics/launcher_options_files.png
index af342f6b2..dcfd70f3b 100644
Binary files a/docs/graphics/launcher_options_files.png and b/docs/graphics/launcher_options_files.png differ
diff --git a/docs/graphics/launcher_override.png b/docs/graphics/launcher_override.png
index 36b489c52..45a3903f6 100644
Binary files a/docs/graphics/launcher_override.png and b/docs/graphics/launcher_override.png differ
diff --git a/docs/graphics/options.png b/docs/graphics/options.png
index fbaa5854e..ce33c1914 100644
Binary files a/docs/graphics/options.png and b/docs/graphics/options.png differ
diff --git a/docs/graphics/options_audio.png b/docs/graphics/options_audio.png
index 16b80dccf..2bd75b2e0 100644
Binary files a/docs/graphics/options_audio.png and b/docs/graphics/options_audio.png differ
diff --git a/docs/graphics/options_debugger.png b/docs/graphics/options_debugger.png
index 2a9f5a901..27f346276 100644
Binary files a/docs/graphics/options_debugger.png and b/docs/graphics/options_debugger.png differ
diff --git a/docs/graphics/options_gameinfo.png b/docs/graphics/options_gameinfo.png
index ce393338a..fa462f63c 100644
Binary files a/docs/graphics/options_gameinfo.png and b/docs/graphics/options_gameinfo.png differ
diff --git a/docs/graphics/options_input.png b/docs/graphics/options_input.png
index c3320f7a8..bfe661f35 100644
Binary files a/docs/graphics/options_input.png and b/docs/graphics/options_input.png differ
diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png
index 216d6faa0..18ca768d6 100644
Binary files a/docs/graphics/options_misc.png and b/docs/graphics/options_misc.png differ
diff --git a/docs/graphics/options_ui.png b/docs/graphics/options_ui.png
index ec853fa83..63f8be610 100644
Binary files a/docs/graphics/options_ui.png and b/docs/graphics/options_ui.png differ
diff --git a/docs/graphics/options_video.png b/docs/graphics/options_video.png
index 45d69147a..4bf3dbb59 100644
Binary files a/docs/graphics/options_video.png and b/docs/graphics/options_video.png differ
diff --git a/docs/graphics/options_video_tv.png b/docs/graphics/options_video_tv.png
index 57f4f3cf9..9916501be 100644
Binary files a/docs/graphics/options_video_tv.png and b/docs/graphics/options_video_tv.png differ
diff --git a/docs/graphics/pacman.png b/docs/graphics/pacman.png
index 8a80e4d70..bcc567895 100644
Binary files a/docs/graphics/pacman.png and b/docs/graphics/pacman.png differ
diff --git a/docs/graphics/rom_browser.png b/docs/graphics/rom_browser.png
index 4d9a4cd24..91de6b379 100644
Binary files a/docs/graphics/rom_browser.png and b/docs/graphics/rom_browser.png differ
diff --git a/docs/graphics/romaudit.png b/docs/graphics/romaudit.png
index f4f3a370e..4f612165b 100644
Binary files a/docs/graphics/romaudit.png and b/docs/graphics/romaudit.png differ
diff --git a/docs/graphics/rominfo_1x_large.png b/docs/graphics/rominfo_1x_large.png
index 67a46cdc0..c451bd906 100644
Binary files a/docs/graphics/rominfo_1x_large.png and b/docs/graphics/rominfo_1x_large.png differ
diff --git a/docs/graphics/rominfo_1x_small.png b/docs/graphics/rominfo_1x_small.png
index 4771b5624..9db78c702 100644
Binary files a/docs/graphics/rominfo_1x_small.png and b/docs/graphics/rominfo_1x_small.png differ
diff --git a/docs/graphics/rominfo_2x_small.png b/docs/graphics/rominfo_2x_small.png
index 4aabc96d3..6d2f2e07b 100644
Binary files a/docs/graphics/rominfo_2x_small.png and b/docs/graphics/rominfo_2x_small.png differ
diff --git a/docs/graphics/secret_quest.png b/docs/graphics/secret_quest.png
index d1dcde340..d26cb53a4 100644
Binary files a/docs/graphics/secret_quest.png and b/docs/graphics/secret_quest.png differ
diff --git a/docs/graphics/select_romdir.png b/docs/graphics/select_romdir.png
index a1a6dc549..23b740314 100644
Binary files a/docs/graphics/select_romdir.png and b/docs/graphics/select_romdir.png differ
diff --git a/docs/graphics/space_invaders.png b/docs/graphics/space_invaders.png
index 3d80b75fd..f7ec5eebe 100644
Binary files a/docs/graphics/space_invaders.png and b/docs/graphics/space_invaders.png differ
diff --git a/docs/index.html b/docs/index.html
index 1c31d7b3d..02536059e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2027,7 +2027,13 @@
 
     <tr>
       <td><pre>-tiadriven &lt;1|0&gt;</pre></td>
-      <td>Set unused TIA pins to be randomly driven high or low on a read/peek.</td>
+      <td>Set unused TIA pins to be randomly driven high or low on a read/peek.
+          If disabled, use the last databus value for those pins instead.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-ramrandom &lt;1|0&gt;</pre></td>
+      <td>On reset, either randomize all RAM content, or zero it out instead.</td>
     </tr>
 
     <tr>
@@ -2152,7 +2158,7 @@
           <tr><td>GL VSync</td><td>enable OpenGL vertical synchronization</td><td>-gl_vsync</td></tr>
           <tr><td>Grab mouse</td><td>keep mouse in SDL window</td><td>-grabmouse</td></tr>
           <tr><td>Show UI messages</td><td>overlay UI messages onscreen</td><td>-uimessages</td></tr>
-          <tr><td>Center window (*)</td><td>attempt to center SDL window (requires restart)</td><td>-center</td></tr>
+          <tr><td>Center window</td><td>attempt to center application window</td><td>-center</td></tr>
           <tr><td>Fast SC/AR BIOS</td><td>Skip progress loading bars for SuperCharger ROMs</td><td>-fastscbios</td></tr>
         </table>
       </td>
@@ -2315,15 +2321,26 @@
       to the selected event.  If nothing seems to happen, either Stella
       can't see the input device, or the selected event doesn't support being
       remapped to the input device.</li>
-    <li>Erase a mapping by clicking 'Erase', or cancel a remap in progress
-      by clicking 'Cancel'.</li>
-    <li>Reset default mappings by clicking 'Defaults'.</li>
+    <li>Cancel a remap in progress by clicking 'Cancel', erase a mapping by
+      clicking 'Erase', or reset to default mapping by clicking 'Reset'</li>
+    <li>Reset to default <b>all</b> mappings by clicking 'Defaults'.</li>
   </ol>
 
   <p>The following screenshots illustrate the event remapping process:<br><br>
   <img src="graphics/eventmapping.png">
   <img src="graphics/eventmapping_remap.png">
 
+  <p>There is also a 'Combo' button in the 'Emulation Events' tab, accessible
+  when a Combo event has been selected from the list of events on the left.
+  Clicking 'Combo' will show a dialog similar to the following:</p>
+  <img src="graphics/eventmapping_combo.png">
+  <p>In this dialog, you can assign various events to the selected combo event.
+  Note that this simply assigns multiple events to the combo; you still need
+  to map the combo event itself to some action, as described in the 'remap an
+  event' section above.</p>
+
+  </p>
+
   <p>Virtual devices can be configured under the 'Virtual Devs' tab, shown below:</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
     <tr>
@@ -3199,8 +3216,8 @@ Ms Pac-Man (Stella extended codes):
     <tr>
       <td VALIGN="TOP">Mark&nbsp;Grebe<br>
       (<a href="http://www.atarimac.com">http://www.atarimac.com</a>)</td>
-      <td>Author of the Macintosh OSX version of Stella starting with the
-      1.4 release until release 2.4.  Helped with Stelladaptor support.</td>
+      <td>Author of the Macintosh OSX version of Stella from releases
+      1.4 to 2.4.  Helped with Stelladaptor support.</td>
     </tr>
 
     <tr>
@@ -3242,8 +3259,8 @@ Ms Pac-Man (Stella extended codes):
 
     <tr>
       <td VALIGN="TOP">Kostas&nbsp;Nakos</td>
-      <td>Author/maintainer of the WinCE version of Stella starting with the
-        2.0 release</td>
+      <td>Author/maintainer of the WinCE version of Stella from releases 2.0
+      to  2.3.5</td>
     </tr>
 
     <tr>
@@ -3281,14 +3298,27 @@ Ms Pac-Man (Stella extended codes):
       <td>Author of the OpenStep version of Stella</td>
     </tr>
 
+    <tr>
+      <td VALIGN="TOP">Omegamatrix</td>
+      <td>Provided test ROMs which led to more accurate emulation for SWCHx/SWxCNT
+      and RIOT behaviour, and for 'illegal' TIA reads</td>
+    </tr>
+
     <tr>
       <td VALIGN="TOP">John&nbsp;Payson</td>
       <td>Provided EEPROM emulation code for AtariVox and SaveKey support</td>
     </tr>
 
+    <tr>
+      <td VALIGN="TOP">Wilbert&nbsp;Pol</td>
+      <td>Provided many ideas and some sample algorithms for greatly improving
+      'illegal HMOVE' emulation</td>
+    </tr>
+
     <tr>
       <td VALIGN="TOP">Manuel&nbsp;Polik</td>
-      <td>Author of the Windows version of Stella starting with the 1.2 release</td>
+      <td>Author of the Windows version of Stella (Cyberstella) starting with the 1.2
+      release until its retirement</td>
     </tr>
 
     <tr>
@@ -3320,7 +3350,7 @@ Ms Pac-Man (Stella extended codes):
     <tr>
       <td VALIGN="TOP">Jason&nbsp;Scott</td>
       <td>Organizer of the property file archive for early versions of
-      Stella; now he's helping with the web site</td>
+      Stella</td>
     </tr>
 
     <tr>
@@ -3394,7 +3424,8 @@ Ms Pac-Man (Stella extended codes):
 
     <tr>
       <td VALIGN="TOP">David&nbsp;Voswinkel</td>
-      <td>Maintainer of the PSP version of Stella starting with the 2.0 release</td>
+      <td>Maintainer of the PSP version of Stella starting with the 2.0 release
+      until release 2.2</td>
     </tr>
 
     <tr>
@@ -3424,7 +3455,7 @@ Ms Pac-Man (Stella extended codes):
 
     <tr>
       <td VALIGN="TOP">Alex&nbsp;Zaballa</td>
-      <td>Maintainer of the GP2X version of Stella starting with the 2.1 release</td>
+      <td>Maintainer of the GP2X version of Stella from releases 2.1 to 2.3.5</td>
     </tr>
 
   </table>
diff --git a/src/common/Array.hxx b/src/common/Array.hxx
index b77e1e286..c06fbf763 100644
--- a/src/common/Array.hxx
+++ b/src/common/Array.hxx
@@ -200,7 +200,7 @@ class Array
     }
 };
 
-}  // Namespace GUI
+}  // Namespace Common
 
 typedef Common::Array<int>   IntArray;
 typedef Common::Array<bool>  BoolArray;
diff --git a/src/common/Stack.hxx b/src/common/Stack.hxx
index f63d9b860..f5a86443f 100644
--- a/src/common/Stack.hxx
+++ b/src/common/Stack.hxx
@@ -28,6 +28,8 @@
 /**
  * Simple fixed size stack class.
  */
+namespace Common {
+
 template <class T, int MAX_SIZE = 10>
 class FixedStack
 {
@@ -68,4 +70,6 @@ class FixedStack
     int _size;
 };
 
+}  // Namespace Common
+
 #endif
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 3dba53757..bb91eddb9 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.2_test5"
+#define STELLA_VERSION "3.2"
 #define STELLA_BUILD atoi("$Rev$"+6)
 
 #endif
diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 6830dc1f7..f6b8405c7 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -37,8 +37,8 @@ CartDebug::CartDebug(Debugger& dbg, Console& console, const RamAreaList& areas)
   for(RamAreaList::const_iterator i = areas.begin(); i != areas.end(); ++i)
     addRamArea(i->start, i->size, i->roffset, i->woffset);
 
-  // Create an addresslist for each potential bank
-  for(int i = 0; i < myConsole.cartridge().bankCount(); ++i)
+  // Create an addresslist for each potential bank, and an extra one for ZP RAM
+  for(int i = 0; i < myConsole.cartridge().bankCount()+1; ++i)
   {
     AddressList l;
     myEntryAddresses.push_back(l);
@@ -46,6 +46,7 @@ CartDebug::CartDebug(Debugger& dbg, Console& console, const RamAreaList& areas)
 
   // We know the address for the startup bank right now
   myEntryAddresses[myConsole.cartridge().startBank()].push_back(myDebugger.dpeek(0xfffc));
+  addLabel("START", myDebugger.dpeek(0xfffc));
 
   // Add system equates
   for(uInt16 addr = 0x00; addr <= 0x0F; ++addr)
@@ -193,55 +194,59 @@ bool CartDebug::disassemble(const string& resolvedata, bool force)
 {
   // Test current disassembly; don't re-disassemble if it hasn't changed
   // Also check if the current PC is in the current list
-  // Note that for now, we don't re-disassemble if the PC isn't in cart
-  // address space, since Distella doesn't yet support disassembling from
-  // zero-page RAM and ROM at the same time
+  bool bankChanged = myConsole.cartridge().bankChanged();
   uInt16 PC = myDebugger.cpuDebug().pc();
   int pcline = addressToLine(PC);
-  bool changed = (force || myConsole.cartridge().bankChanged() ||
-                 (pcline == -1) || mySystem.isPageDirty(0x1000, 0x1FFF));
+  bool pcfound = (pcline != -1) && ((uInt32)pcline < myDisassembly.list.size()) &&
+                  (myDisassembly.list[pcline].disasm[0] != '.');
+  bool pagedirty = (PC & 0x1000) ? mySystem.isPageDirty(0x1000, 0x1FFF) :
+                                   mySystem.isPageDirty(0x80, 0xFF);
 
+  bool changed = (force || bankChanged || !pcfound || pagedirty);
   if(changed)
   {
-    AddressList& addresses = myEntryAddresses[getBank()];
+    // Are we disassembling from ROM or ZP RAM?
+    AddressList& addresses = (PC & 0x1000) ? myEntryAddresses[getBank()] :
+        myEntryAddresses[myEntryAddresses.size()-1];
 
-    // If the bank has changed, all old addresses must be 'converted'
+    // If the offset has changed, all old addresses must be 'converted'
     // For example, if the list contains any $fxxx and the address space is now
     // $bxxx, it must be changed
     uInt16 offset = (PC - (PC % 0x1000));
-    for(uInt32 i = 0; i < addresses.size(); ++i)
-      addresses[i] = (addresses[i] & 0xFFF) + offset;
+    for(AddressList::iterator i = addresses.begin(); i != addresses.end(); ++i)
+      *i = (*i & 0xFFF) + offset;
 
-    addresses.push_back_unique(PC);
-
-    uInt16 start = addresses[0];
-    if(pcline == -1 && (PC & 0x1000))
-      start = PC;
-
-    // For now, DiStella can't handle address space below 0x1000
-    // However, we want to disassemble at least once, otherwise carts
-    // that run entirely from ZP RAM will have an empty disassembly
-    // TODO - this will be removed once Distella properly supports
-    //        access below 0x1000
-    uInt16 search = PC;
-    if(!(PC & 0x1000))
+    // Only add addresses when absolutely necessary, to cut down on the
+    // work that Distella has to do
+    // Distella expects the addresses to be unique and in sorted order
+    if(bankChanged || !pcfound)
     {
-      if(myDisassembly.list.size() == 0)
-        search = start;
-      else
-        return false;
+      AddressList::iterator i;
+      for(i = addresses.begin(); i != addresses.end(); ++i)
+      {
+        if(PC < *i)
+        {
+          addresses.insert(i, PC);
+          break;
+        }
+        else if(PC == *i)  // already present
+          break;
+      }
+      // Otherwise, add the item at the end
+      if(i == addresses.end())
+        addresses.push_back(PC);
     }
 
     // Check whether to use the 'resolvedata' functionality from Distella
     if(resolvedata == "never")
-      fillDisassemblyList(addresses, false, search);
+      fillDisassemblyList(addresses, false, PC);
     else if(resolvedata == "always")
-      fillDisassemblyList(addresses, true, search);
+      fillDisassemblyList(addresses, true, PC);
     else  // 'auto'
     {
       // First try with resolvedata on, then turn off if PC isn't found
-      if(!fillDisassemblyList(addresses, true, search))
-        fillDisassemblyList(addresses, false, search);
+      if(!fillDisassemblyList(addresses, true, PC))
+        fillDisassemblyList(addresses, false, PC);
     }
   }
 
@@ -249,14 +254,13 @@ bool CartDebug::disassemble(const string& resolvedata, bool force)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartDebug::fillDisassemblyList(const AddressList& addresses,
+bool CartDebug::fillDisassemblyList(AddressList& addresses,
                                     bool resolvedata, uInt16 search)
 {
   bool found = false;
 
   myDisassembly.list.clear();
   myDisassembly.fieldwidth = 10 + myLabelLength;
-cerr << "start (" << getBank() << "): ";
   DiStella distella(*this, myDisassembly.list, addresses, resolvedata);
 
   // Parts of the disassembly will be accessed later in different ways
@@ -556,7 +560,7 @@ CartDebug::AddrType CartDebug::addressType(uInt16 addr) const
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-string CartDebug::extractLabel(char *c) const
+string CartDebug::extractLabel(const char *c) const
 {
   string l = "";
   while(*c != ' ')
@@ -566,7 +570,7 @@ string CartDebug::extractLabel(char *c) const
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-int CartDebug::extractValue(char *c) const
+int CartDebug::extractValue(const char *c) const
 {
   while(*c != ' ')
   {
diff --git a/src/debugger/CartDebug.hxx b/src/debugger/CartDebug.hxx
index c20793722..48309ac61 100644
--- a/src/debugger/CartDebug.hxx
+++ b/src/debugger/CartDebug.hxx
@@ -23,6 +23,8 @@
 class System;
 
 #include <map>
+#include <set>
+#include <list>
 
 #include "bspf.hxx"
 #include "Array.hxx"
@@ -31,7 +33,7 @@ class System;
 #include "DebuggerSystem.hxx"
 
 // Array of addresses
-typedef Common::Array<uInt16> AddressList;
+typedef list<uInt16> AddressList;
 
 // pointer types for CartDebug instance methods
 typedef int (CartDebug::*CARTDEBUG_INT_METHOD)();
@@ -212,12 +214,12 @@ class CartDebug : public DebuggerSystem
 
     // Actually call DiStella to fill the DisassemblyList structure
     // Return whether the search address was actually in the list
-    bool fillDisassemblyList(const AddressList& addresses,
+    bool fillDisassemblyList(AddressList& addresses,
                              bool resolvedata, uInt16 search);
 
     // Extract labels and values from the given character stream
-    string extractLabel(char *c) const;
-    int extractValue(char *c) const;
+    string extractLabel(const char* c) const;
+    int extractValue(const char* c) const;
 
   private:
     CartState myState;
diff --git a/src/debugger/DiStella.cxx b/src/debugger/DiStella.cxx
index 8e0c80501..a58c888be 100644
--- a/src/debugger/DiStella.cxx
+++ b/src/debugger/DiStella.cxx
@@ -23,19 +23,16 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
-                   const AddressList& addresses, bool resolvedata)
+                   AddressList& addresses, bool resolvedata)
   : myDbg(dbg),
     myList(list)
 {
+  if(addresses.size() == 0)
+    return;
+
   while(!myAddressQueue.empty())
     myAddressQueue.pop();
 
-  myAppData.start  = 0x0000;
-  myAppData.end    = 0x0FFF;
-  myAppData.length = 4096;
-
-  memset(labels, 0, 0x1000);
-
   /*============================================
     The offset is the address where the code segment
     starts.  For a 4K game, it is usually 0xf000,
@@ -53,17 +50,26 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
       Offset to code = $D000
       Code range = $D000-$DFFF
   =============================================*/
-  if(addresses.size() == 0)
-    return;
 
-  uInt16 start = addresses[0];
+  AddressList::iterator it = addresses.begin();
+  uInt16 start = *it++;
+
+  if(start & 0x1000)  // ROM space
+  {
+    myAppData.start  = 0x0000;
+    myAppData.end    = 0x0FFF;
+    myAppData.length = 4096;
+  }
+  else                // ZP RAM
+  {
+    myAppData.start  = 0x0080;
+    myAppData.end    = 0x00FF;
+    myAppData.length = 128;
+  }
+  memset(labels, 0, 0x1000);
+
   myOffset = (start - (start % 0x1000));
-
-  // Fill queue with start addresses (entry points into the ROM space)
-  for(uInt32 i = 0; i < addresses.size(); ++i)
-{ cerr << hex << addresses[i] << " ";
-    myAddressQueue.push(addresses[i]);
-} cerr << endl;
+  myAddressQueue.push(start);
 
   if(resolvedata)
   {
@@ -75,8 +81,36 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
       disasm(myPC, 1);
       for (uInt32 k = myPCBeg; k <= myPCEnd; k++)
         mark(k, REACHABLE);
+
+      // When we get to this point, all addresses have been processed
+      // starting from the initial one in the address list
+      // If so, process the next one in the list that hasn't already
+      // been marked as REACHABLE
+      // If it *has* been marked, it can be removed from consideration
+      // in all subsequent passes
+      //
+      // Note that we can't simply add all addresses right away, since
+      // the processing of a single address from the address list can
+      // cause others to be added in the ::disasm method
+      // All of these have to be exhausted before consulting the address
+      // list again
+      if(myAddressQueue.empty())
+      {
+        while(it != addresses.end())
+        {
+          uInt16 addr = *it;
+          if(!check_bit(labels[addr-myOffset], REACHABLE))
+          {
+            myAddressQueue.push(addr);
+            ++it;
+            break;
+          }
+          else   // remove this address, it is redundant
+            it = addresses.erase(it);
+        }
+      }
     }
-    
+
     for (int k = 0; k <= myAppData.end; k++)
     {
       if (!check_bit(labels[k], REACHABLE))
@@ -615,8 +649,6 @@ int DiStella::mark(uInt32 address, MarkType bit)
     ===========================================================
       $00-$3d =     system equates (WSYNC, etc...); mark the array's element
                     with the appropriate bit; return 2.
-      $0080-$00FF = zero-page RAM; mark the array's element
-                    with the appropriate bit; return 5.
       $0280-$0297 = system equates (INPT0, etc...); mark the array's element
                     with the appropriate bit; return 3.
       $1000-$1FFF = CODE/DATA, mark the code/data array for the mirrored address
@@ -648,12 +680,6 @@ int DiStella::mark(uInt32 address, MarkType bit)
   {
     return 2;
   }
-/* This isn't supported by the core code yet, so why waste time checking
-  else if (address >= 0x80 && address <= 0xff)
-  {
-    return 5;
-  }
-*/
   else if (address >= 0x280 && address <= 0x297)
   {
     return 3;
@@ -700,13 +726,29 @@ void DiStella::addEntry()
   else
     myDisasmBuf >> setw(4) >> hex >> tag.address;
 
+  // Only include addresses within the requested range
+  if(tag.address < myAppData.start)
+    goto DONE_WITH_ADD;
+
   // Label (a user-defined label always overrides any auto-generated one)
   myDisasmBuf.seekg(5, ios::beg);
   if(tag.address)
   {
     tag.label = myDbg.getLabel(tag.address, true);
-    if(tag.label == EmptyString && myDisasmBuf.peek() != ' ')
-      getline(myDisasmBuf, tag.label, '\'');
+    if(tag.label == EmptyString)
+    {
+      if(myDisasmBuf.peek() != ' ')
+        getline(myDisasmBuf, tag.label, '\'');
+      else
+      {
+#if 0
+        // FIXME - optimize this, and add as an option
+        stringstream str;
+        str << setw(4) << hex << tag.address;
+        str >> tag.label;
+#endif
+      }
+    }
   }
 
   // Disassembly
@@ -729,6 +771,7 @@ void DiStella::addEntry()
   }
   myList.push_back(tag);
 
+DONE_WITH_ADD:
   myDisasmBuf.clear();
   myDisasmBuf.str("");
 }
diff --git a/src/debugger/DiStella.hxx b/src/debugger/DiStella.hxx
index 2d1e7a4a8..59a4727dd 100644
--- a/src/debugger/DiStella.hxx
+++ b/src/debugger/DiStella.hxx
@@ -52,7 +52,7 @@ class DiStella
       @param resolvedata If enabled, try to determine code vs. data sections
     */
     DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
-             const AddressList& addresses, bool resolvedata = true);
+             AddressList& addresses, bool resolvedata = true);
 
     ~DiStella();
 
diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx
index 7ba88ee44..7e5236044 100644
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@@ -137,59 +137,59 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size, string& md5,
 
   // We should know the cart's type by now so let's create it
   if(type == "2K")
-    cartridge = new Cartridge2K(image, size);
+    cartridge = new Cartridge2K(image, size, settings);
   else if(type == "3E")
-    cartridge = new Cartridge3E(image, size);
+    cartridge = new Cartridge3E(image, size, settings);
   else if(type == "3F")
-    cartridge = new Cartridge3F(image, size);
+    cartridge = new Cartridge3F(image, size, settings);
   else if(type == "4A50")
-    cartridge = new Cartridge4A50(image, size);
+    cartridge = new Cartridge4A50(image, size, settings);
   else if(type == "4K")
-    cartridge = new Cartridge4K(image);
+    cartridge = new Cartridge4K(image, settings);
   else if(type == "AR")
     cartridge = new CartridgeAR(image, size, settings);
   else if(type == "DPC")
-    cartridge = new CartridgeDPC(image, size);
+    cartridge = new CartridgeDPC(image, size, settings);
   else if(type == "DPC+")
-    cartridge = new CartridgeDPCPlus(image, size);
+    cartridge = new CartridgeDPCPlus(image, size, settings);
   else if(type == "E0")
-    cartridge = new CartridgeE0(image);
+    cartridge = new CartridgeE0(image, settings);
   else if(type == "E7")
-    cartridge = new CartridgeE7(image);
+    cartridge = new CartridgeE7(image, settings);
   else if(type == "EF")
-    cartridge = new CartridgeEF(image);
+    cartridge = new CartridgeEF(image, settings);
   else if(type == "EFSC")
-    cartridge = new CartridgeEFSC(image);
+    cartridge = new CartridgeEFSC(image, settings);
   else if(type == "F4")
-    cartridge = new CartridgeF4(image);
+    cartridge = new CartridgeF4(image, settings);
   else if(type == "F4SC")
-    cartridge = new CartridgeF4SC(image);
+    cartridge = new CartridgeF4SC(image, settings);
   else if(type == "F6")
-    cartridge = new CartridgeF6(image);
+    cartridge = new CartridgeF6(image, settings);
   else if(type == "F6SC")
-    cartridge = new CartridgeF6SC(image);
+    cartridge = new CartridgeF6SC(image, settings);
   else if(type == "F8")
-    cartridge = new CartridgeF8(image, md5);
+    cartridge = new CartridgeF8(image, md5, settings);
   else if(type == "F8SC")
-    cartridge = new CartridgeF8SC(image);
+    cartridge = new CartridgeF8SC(image, settings);
   else if(type == "FA" || type == "FASC")
-    cartridge = new CartridgeFA(image);
+    cartridge = new CartridgeFA(image, settings);
   else if(type == "FE")
-    cartridge = new CartridgeFE(image);
+    cartridge = new CartridgeFE(image, settings);
   else if(type == "MC")
-    cartridge = new CartridgeMC(image, size);
+    cartridge = new CartridgeMC(image, size, settings);
   else if(type == "F0" || type == "MB")
-    cartridge = new CartridgeF0(image);
+    cartridge = new CartridgeF0(image, settings);
   else if(type == "CV")
-    cartridge = new CartridgeCV(image, size);
+    cartridge = new CartridgeCV(image, size, settings);
   else if(type == "UA")
-    cartridge = new CartridgeUA(image);
+    cartridge = new CartridgeUA(image, settings);
   else if(type == "0840")
-    cartridge = new Cartridge0840(image);
+    cartridge = new Cartridge0840(image, settings);
   else if(type == "SB")
-    cartridge = new CartridgeSB(image, size);
+    cartridge = new CartridgeSB(image, size, settings);
   else if(type == "X07")
-    cartridge = new CartridgeX07(image);
+    cartridge = new CartridgeX07(image, settings);
   else
     cerr << "ERROR: Invalid cartridge type " << type << " ..." << endl;
 
@@ -227,8 +227,9 @@ string Cartridge::createFromMultiCart(const uInt8*& image, uInt32& size,
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge::Cartridge()
-  : myStartBank(0),
+Cartridge::Cartridge(const Settings& settings)
+  : mySettings(settings),
+    myStartBank(0),
     myBankChanged(true),
     myBankLocked(false)
 {
@@ -694,7 +695,8 @@ bool Cartridge::isProbablyX07(const uInt8* image, uInt32 size)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge::Cartridge(const Cartridge&)
+Cartridge::Cartridge(const Cartridge& cart)
+  : mySettings(cart.mySettings)
 {
   assert(false);
 }
diff --git a/src/emucore/Cart.hxx b/src/emucore/Cart.hxx
index 5bd51f122..415fe91ea 100644
--- a/src/emucore/Cart.hxx
+++ b/src/emucore/Cart.hxx
@@ -25,11 +25,11 @@
 
 class Cartridge;
 class Properties;
-class Settings;
 
 #include "bspf.hxx"
 #include "Array.hxx"
 #include "Device.hxx"
+#include "Settings.hxx"
 
 #ifdef DEBUGGER_SUPPORT
 struct RamArea {
@@ -69,8 +69,10 @@ class Cartridge : public Device
 
     /**
       Create a new cartridge
+
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge();
+    Cartridge(const Settings& settings);
  
     /**
       Destructor
@@ -321,6 +323,9 @@ class Cartridge : public Device
     static bool isProbablyX07(const uInt8* image, uInt32 size);
 
   protected:
+    // Settings class for the application
+    const Settings& mySettings;
+
     // The startup bank to use (where to look for the reset vector address)
     uInt16 myStartBank;
 
diff --git a/src/emucore/Cart0840.cxx b/src/emucore/Cart0840.cxx
index 74582cd07..028abf402 100644
--- a/src/emucore/Cart0840.cxx
+++ b/src/emucore/Cart0840.cxx
@@ -24,7 +24,8 @@
 #include "Cart0840.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge0840::Cartridge0840(const uInt8* image)
+Cartridge0840::Cartridge0840(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 8192);
diff --git a/src/emucore/Cart0840.hxx b/src/emucore/Cart0840.hxx
index 76afceda9..7d36b87d9 100644
--- a/src/emucore/Cart0840.hxx
+++ b/src/emucore/Cart0840.hxx
@@ -36,9 +36,10 @@ class Cartridge0840 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge0840(const uInt8* image);
+    Cartridge0840(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Cart2K.cxx b/src/emucore/Cart2K.cxx
index ea9b4ac6e..a6ef13147 100644
--- a/src/emucore/Cart2K.cxx
+++ b/src/emucore/Cart2K.cxx
@@ -24,7 +24,8 @@
 #include "Cart2K.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge2K::Cartridge2K(const uInt8* image, uInt32 size)
+Cartridge2K::Cartridge2K(const uInt8* image, uInt32 size, const Settings& settings)
+  : Cartridge(settings)
 {
   // Size can be a maximum of 2K
   if(size > 2048) size = 2048;
diff --git a/src/emucore/Cart2K.hxx b/src/emucore/Cart2K.hxx
index 094ad5b07..70a4d0916 100644
--- a/src/emucore/Cart2K.hxx
+++ b/src/emucore/Cart2K.hxx
@@ -39,10 +39,11 @@ class Cartridge2K : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
-      @param size  The size of the ROM image (<= 2048 bytes)
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image (<= 2048 bytes)
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge2K(const uInt8* image, uInt32 size);
+    Cartridge2K(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Cart3E.cxx b/src/emucore/Cart3E.cxx
index 53be3d83c..ce8a9045d 100644
--- a/src/emucore/Cart3E.cxx
+++ b/src/emucore/Cart3E.cxx
@@ -25,8 +25,10 @@
 #include "Cart3E.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge3E::Cartridge3E(const uInt8* image, uInt32 size)
-  : mySize(size)
+Cartridge3E::Cartridge3E(const uInt8* image, uInt32 size,
+                         const Settings& settings)
+  : Cartridge(settings),
+    mySize(size)
 {
   // Allocate array for the ROM image
   myImage = new uInt8[mySize];
@@ -52,9 +54,12 @@ Cartridge3E::~Cartridge3E()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge3E::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 32768; ++i)
-    myRam[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 32768; ++i)
+      myRam[i] = mySystem->randGenerator().next();
+  else
+    memset(myRam, 0, 32768);
 
   // We'll map the startup bank into the first segment upon reset
   bank(myStartBank);
diff --git a/src/emucore/Cart3E.hxx b/src/emucore/Cart3E.hxx
index f88718ade..bdc92e962 100644
--- a/src/emucore/Cart3E.hxx
+++ b/src/emucore/Cart3E.hxx
@@ -67,10 +67,11 @@ class Cartridge3E : public Cartridge
     /**
       Create a new cartridge using the specified image and size
 
-      @param image Pointer to the ROM image
-      @param size The size of the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge3E(const uInt8* image, uInt32 size);
+    Cartridge3E(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Cart3F.cxx b/src/emucore/Cart3F.cxx
index 1a0138b4b..21d0bd484 100644
--- a/src/emucore/Cart3F.cxx
+++ b/src/emucore/Cart3F.cxx
@@ -25,8 +25,10 @@
 #include "Cart3F.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge3F::Cartridge3F(const uInt8* image, uInt32 size)
-  : mySize(size)
+Cartridge3F::Cartridge3F(const uInt8* image, uInt32 size,
+                         const Settings& settings)
+  : Cartridge(settings),
+    mySize(size)
 {
   // Allocate array for the ROM image
   myImage = new uInt8[mySize];
diff --git a/src/emucore/Cart3F.hxx b/src/emucore/Cart3F.hxx
index a653acd31..8ea2a67ab 100644
--- a/src/emucore/Cart3F.hxx
+++ b/src/emucore/Cart3F.hxx
@@ -44,10 +44,11 @@ class Cartridge3F : public Cartridge
     /**
       Create a new cartridge using the specified image and size
 
-      @param image Pointer to the ROM image
-      @param size  The size of the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge3F(const uInt8* image, uInt32 size);
+    Cartridge3F(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Cart4A50.cxx b/src/emucore/Cart4A50.cxx
index 9ae0fab01..924a4d577 100644
--- a/src/emucore/Cart4A50.cxx
+++ b/src/emucore/Cart4A50.cxx
@@ -26,7 +26,9 @@
 #include "Cart4A50.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge4A50::Cartridge4A50(const uInt8* image, uInt32 size)
+Cartridge4A50::Cartridge4A50(const uInt8* image, uInt32 size,
+                             const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   // Supported file sizes are 32/64/128K, which are duplicated if necessary
@@ -45,9 +47,12 @@ Cartridge4A50::~Cartridge4A50()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void Cartridge4A50::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 32768; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 32768; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 32768);
 
   mySliceLow = mySliceMiddle = mySliceHigh = 0;
   myIsRomLow = myIsRomMiddle = myIsRomHigh = true;
diff --git a/src/emucore/Cart4A50.hxx b/src/emucore/Cart4A50.hxx
index 02149e550..ea35860bf 100644
--- a/src/emucore/Cart4A50.hxx
+++ b/src/emucore/Cart4A50.hxx
@@ -52,10 +52,11 @@ class Cartridge4A50 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
-      @param size  The size of the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge4A50(const uInt8* image, uInt32 size);
+    Cartridge4A50(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Cart4K.cxx b/src/emucore/Cart4K.cxx
index da8a0629d..77ac8258b 100644
--- a/src/emucore/Cart4K.cxx
+++ b/src/emucore/Cart4K.cxx
@@ -24,7 +24,8 @@
 #include "Cart4K.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Cartridge4K::Cartridge4K(const uInt8* image)
+Cartridge4K::Cartridge4K(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 4096);
diff --git a/src/emucore/Cart4K.hxx b/src/emucore/Cart4K.hxx
index f368894a5..0025516b7 100644
--- a/src/emucore/Cart4K.hxx
+++ b/src/emucore/Cart4K.hxx
@@ -38,9 +38,10 @@ class Cartridge4K : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    Cartridge4K(const uInt8* image);
+    Cartridge4K(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartAR.cxx b/src/emucore/CartAR.cxx
index 202b5bc57..be9b4c676 100644
--- a/src/emucore/CartAR.cxx
+++ b/src/emucore/CartAR.cxx
@@ -27,8 +27,8 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 CartridgeAR::CartridgeAR(const uInt8* image, uInt32 size,
                          const Settings& settings)
-  : my6502(0),
-    mySettings(settings)
+  : Cartridge(settings),
+    my6502(0)
 {
   // Minimum size supported internally is 8448 bytes
   uInt32 minsize = BSPF_max(size, 8448u);
@@ -52,9 +52,12 @@ CartridgeAR::~CartridgeAR()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeAR::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 6 * 1024; ++i)
-    myImage[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 6 * 1024; ++i)
+      myImage[i] = mySystem->randGenerator().next();
+  else
+    memset(myImage, 0, 6 * 1024);
 
   // Initialize SC BIOS ROM
   initializeROM();
diff --git a/src/emucore/CartAR.hxx b/src/emucore/CartAR.hxx
index a26b07df6..8a8217c51 100644
--- a/src/emucore/CartAR.hxx
+++ b/src/emucore/CartAR.hxx
@@ -47,7 +47,7 @@ class CartridgeAR : public Cartridge
 
       @param image     Pointer to the ROM image
       @param size      The size of the ROM image
-      @param settings  Used to query 'fastscbios' option
+      @param settings  A reference to the various settings (read-only)
     */
     CartridgeAR(const uInt8* image, uInt32 size, const Settings& settings);
 
@@ -168,9 +168,6 @@ class CartridgeAR : public Cartridge
     // Pointer to the 6502 processor in the system
     M6502* my6502;
 
-    // Reference to the settings object (needed for 'fastscbios'
-    const Settings& mySettings;
-
     // Indicates the offest within the image for the corresponding bank
     uInt32 myImageOffset[2];
 
diff --git a/src/emucore/CartCV.cxx b/src/emucore/CartCV.cxx
index 7814b71a6..8240ac135 100644
--- a/src/emucore/CartCV.cxx
+++ b/src/emucore/CartCV.cxx
@@ -24,8 +24,10 @@
 #include "CartCV.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeCV::CartridgeCV(const uInt8* image, uInt32 size)
-  : myInitialRAM(0),
+CartridgeCV::CartridgeCV(const uInt8* image, uInt32 size,
+                         const Settings& settings)
+  : Cartridge(settings),
+    myInitialRAM(0),
     mySize(size)
 {
   if(mySize == 2048)
@@ -66,9 +68,12 @@ void CartridgeCV::reset()
   }
   else
   {
-    // Initialize RAM with random values
-    for(uInt32 i = 0; i < 1024; ++i)
-      myRAM[i] = mySystem->randGenerator().next();
+    // Initialize RAM
+    if(mySettings.getBool("ramrandom"))
+      for(uInt32 i = 0; i < 1024; ++i)
+        myRAM[i] = mySystem->randGenerator().next();
+    else
+      memset(myRAM, 0, 1024);
   }
 
   myBankChanged = true;
diff --git a/src/emucore/CartCV.hxx b/src/emucore/CartCV.hxx
index ac8b46ff4..8873c256c 100644
--- a/src/emucore/CartCV.hxx
+++ b/src/emucore/CartCV.hxx
@@ -41,9 +41,11 @@ class CartridgeCV : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeCV(const uInt8* image, uInt32 size);
+    CartridgeCV(const uInt8* image, uInt32 size, const Settings& settings);
 
     /**
       Destructor
diff --git a/src/emucore/CartDPC.cxx b/src/emucore/CartDPC.cxx
index 7356391e7..28dc48630 100644
--- a/src/emucore/CartDPC.cxx
+++ b/src/emucore/CartDPC.cxx
@@ -24,8 +24,10 @@
 #include "CartDPC.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeDPC::CartridgeDPC(const uInt8* image, uInt32 size)
-  : mySystemCycles(0),
+CartridgeDPC::CartridgeDPC(const uInt8* image, uInt32 size,
+                           const Settings& settings)
+  : Cartridge(settings),
+    mySystemCycles(0),
     myFractionalClocks(0.0)
 {
   // Make a copy of the entire image
diff --git a/src/emucore/CartDPC.hxx b/src/emucore/CartDPC.hxx
index 051f0d8c9..c6e74aff5 100644
--- a/src/emucore/CartDPC.hxx
+++ b/src/emucore/CartDPC.hxx
@@ -39,9 +39,11 @@ class CartridgeDPC : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeDPC(const uInt8* image, uInt32 size);
+    CartridgeDPC(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartDPCPlus.cxx b/src/emucore/CartDPCPlus.cxx
index 473d0e7f8..9bb82a67d 100644
--- a/src/emucore/CartDPCPlus.cxx
+++ b/src/emucore/CartDPCPlus.cxx
@@ -24,8 +24,10 @@
 #include "CartDPCPlus.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeDPCPlus::CartridgeDPCPlus(const uInt8* image, uInt32 size)
-  : myFastFetch(false),
+CartridgeDPCPlus::CartridgeDPCPlus(const uInt8* image, uInt32 size,
+                                   const Settings& settings)
+  : Cartridge(settings),
+    myFastFetch(false),
     myLDAimmediate(false),
     myParameter(0),
     mySystemCycles(0),
diff --git a/src/emucore/CartDPCPlus.hxx b/src/emucore/CartDPCPlus.hxx
index f6fb6f2b5..6bdec111e 100644
--- a/src/emucore/CartDPCPlus.hxx
+++ b/src/emucore/CartDPCPlus.hxx
@@ -39,9 +39,11 @@ class CartridgeDPCPlus : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeDPCPlus(const uInt8* image, uInt32 size);
+    CartridgeDPCPlus(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartE0.cxx b/src/emucore/CartE0.cxx
index 5e245d067..c5d77318c 100644
--- a/src/emucore/CartE0.cxx
+++ b/src/emucore/CartE0.cxx
@@ -24,7 +24,8 @@
 #include "CartE0.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeE0::CartridgeE0(const uInt8* image)
+CartridgeE0::CartridgeE0(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 8192);
diff --git a/src/emucore/CartE0.hxx b/src/emucore/CartE0.hxx
index 1dd2537de..76998aa9b 100644
--- a/src/emucore/CartE0.hxx
+++ b/src/emucore/CartE0.hxx
@@ -47,9 +47,10 @@ class CartridgeE0 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeE0(const uInt8* image);
+    CartridgeE0(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartE7.cxx b/src/emucore/CartE7.cxx
index 07d015db8..83398d056 100644
--- a/src/emucore/CartE7.cxx
+++ b/src/emucore/CartE7.cxx
@@ -24,7 +24,8 @@
 #include "CartE7.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeE7::CartridgeE7(const uInt8* image)
+CartridgeE7::CartridgeE7(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 16384);
@@ -48,9 +49,12 @@ CartridgeE7::~CartridgeE7()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeE7::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 2048; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 2048; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 2048);
 
   // Install some default banks for the RAM and first segment
   bankRAM(0);
diff --git a/src/emucore/CartE7.hxx b/src/emucore/CartE7.hxx
index 82227db11..5c97dded1 100644
--- a/src/emucore/CartE7.hxx
+++ b/src/emucore/CartE7.hxx
@@ -64,9 +64,10 @@ class CartridgeE7 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeE7(const uInt8* image);
+    CartridgeE7(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartEF.cxx b/src/emucore/CartEF.cxx
index 8c333f5ea..5283ad06a 100644
--- a/src/emucore/CartEF.cxx
+++ b/src/emucore/CartEF.cxx
@@ -24,7 +24,8 @@
 #include "CartEF.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeEF::CartridgeEF(const uInt8* image)
+CartridgeEF::CartridgeEF(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 65536);
diff --git a/src/emucore/CartEF.hxx b/src/emucore/CartEF.hxx
index 437b874a1..9f11c9a46 100644
--- a/src/emucore/CartEF.hxx
+++ b/src/emucore/CartEF.hxx
@@ -42,9 +42,10 @@ class CartridgeEF : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeEF(const uInt8* image);
+    CartridgeEF(const uInt8* image, const Settings& settings);
 
     /**
       Destructor
diff --git a/src/emucore/CartEFSC.cxx b/src/emucore/CartEFSC.cxx
index 2af4ae23f..334923b79 100644
--- a/src/emucore/CartEFSC.cxx
+++ b/src/emucore/CartEFSC.cxx
@@ -24,7 +24,8 @@
 #include "CartEFSC.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeEFSC::CartridgeEFSC(const uInt8* image)
+CartridgeEFSC::CartridgeEFSC(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 65536);
@@ -44,9 +45,12 @@ CartridgeEFSC::~CartridgeEFSC()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeEFSC::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 128; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 128; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 128);
 
   // Upon reset we switch to the startup bank
   bank(myStartBank);
diff --git a/src/emucore/CartEFSC.hxx b/src/emucore/CartEFSC.hxx
index a58345028..e2b10a0dc 100644
--- a/src/emucore/CartEFSC.hxx
+++ b/src/emucore/CartEFSC.hxx
@@ -42,9 +42,10 @@ class CartridgeEFSC : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeEFSC(const uInt8* image);
+    CartridgeEFSC(const uInt8* image, const Settings& settings);
 
     /**
       Destructor
diff --git a/src/emucore/CartF0.cxx b/src/emucore/CartF0.cxx
index 5b308e64e..760bb9bf5 100644
--- a/src/emucore/CartF0.cxx
+++ b/src/emucore/CartF0.cxx
@@ -24,7 +24,8 @@
 #include "CartF0.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF0::CartridgeF0(const uInt8* image)
+CartridgeF0::CartridgeF0(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 65536);
diff --git a/src/emucore/CartF0.hxx b/src/emucore/CartF0.hxx
index 9873df608..6e987adb7 100644
--- a/src/emucore/CartF0.hxx
+++ b/src/emucore/CartF0.hxx
@@ -39,9 +39,10 @@ class CartridgeF0 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF0(const uInt8* image);
+    CartridgeF0(const uInt8* image, const Settings& settings);
 
     /**
       Destructor
diff --git a/src/emucore/CartF4.cxx b/src/emucore/CartF4.cxx
index 3f3e67496..9b1231a2b 100644
--- a/src/emucore/CartF4.cxx
+++ b/src/emucore/CartF4.cxx
@@ -25,7 +25,8 @@
 #include "CartF4.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF4::CartridgeF4(const uInt8* image)
+CartridgeF4::CartridgeF4(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 32768);
diff --git a/src/emucore/CartF4.hxx b/src/emucore/CartF4.hxx
index 6615a04a1..0f04ec4b6 100644
--- a/src/emucore/CartF4.hxx
+++ b/src/emucore/CartF4.hxx
@@ -38,9 +38,10 @@ class CartridgeF4 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF4(const uInt8* image);
+    CartridgeF4(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartF4SC.cxx b/src/emucore/CartF4SC.cxx
index d15e0a44a..c81da46c9 100644
--- a/src/emucore/CartF4SC.cxx
+++ b/src/emucore/CartF4SC.cxx
@@ -24,7 +24,8 @@
 #include "CartF4SC.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF4SC::CartridgeF4SC(const uInt8* image)
+CartridgeF4SC::CartridgeF4SC(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 32768);
@@ -44,9 +45,12 @@ CartridgeF4SC::~CartridgeF4SC()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF4SC::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 128; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 128; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 128);
 
   // Upon reset we switch to the startup bank
   bank(myStartBank);
diff --git a/src/emucore/CartF4SC.hxx b/src/emucore/CartF4SC.hxx
index 8db5ed3d8..3d801cc77 100644
--- a/src/emucore/CartF4SC.hxx
+++ b/src/emucore/CartF4SC.hxx
@@ -38,9 +38,10 @@ class CartridgeF4SC : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF4SC(const uInt8* image);
+    CartridgeF4SC(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartF6.cxx b/src/emucore/CartF6.cxx
index 24214bb36..01b5f6c71 100644
--- a/src/emucore/CartF6.cxx
+++ b/src/emucore/CartF6.cxx
@@ -24,7 +24,8 @@
 #include "CartF6.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF6::CartridgeF6(const uInt8* image)
+CartridgeF6::CartridgeF6(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 16384);
diff --git a/src/emucore/CartF6.hxx b/src/emucore/CartF6.hxx
index 03ea30a66..f0c7ef4b1 100644
--- a/src/emucore/CartF6.hxx
+++ b/src/emucore/CartF6.hxx
@@ -38,9 +38,10 @@ class CartridgeF6 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF6(const uInt8* image);
+    CartridgeF6(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartF6SC.cxx b/src/emucore/CartF6SC.cxx
index dc763cf7a..d3656f5e6 100644
--- a/src/emucore/CartF6SC.cxx
+++ b/src/emucore/CartF6SC.cxx
@@ -24,7 +24,8 @@
 #include "CartF6SC.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF6SC::CartridgeF6SC(const uInt8* image)
+CartridgeF6SC::CartridgeF6SC(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 16384);
@@ -44,9 +45,12 @@ CartridgeF6SC::~CartridgeF6SC()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF6SC::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 128; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 128; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 128);
 
   // Upon reset we switch to the startup bank
   bank(myStartBank);
diff --git a/src/emucore/CartF6SC.hxx b/src/emucore/CartF6SC.hxx
index 0ca0e6f7a..ae9b9c595 100644
--- a/src/emucore/CartF6SC.hxx
+++ b/src/emucore/CartF6SC.hxx
@@ -38,9 +38,10 @@ class CartridgeF6SC : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF6SC(const uInt8* image);
+    CartridgeF6SC(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartF8.cxx b/src/emucore/CartF8.cxx
index 730fc8007..b01ea1def 100644
--- a/src/emucore/CartF8.cxx
+++ b/src/emucore/CartF8.cxx
@@ -24,7 +24,9 @@
 #include "CartF8.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF8::CartridgeF8(const uInt8* image, const string& md5)
+CartridgeF8::CartridgeF8(const uInt8* image, const string& md5,
+                         const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 8192);
diff --git a/src/emucore/CartF8.hxx b/src/emucore/CartF8.hxx
index 91aecfcbb..888ef4f06 100644
--- a/src/emucore/CartF8.hxx
+++ b/src/emucore/CartF8.hxx
@@ -38,10 +38,11 @@ class CartridgeF8 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image  Pointer to the ROM image
-      @param md5    MD5sum of the ROM image
+      @param image     Pointer to the ROM image
+      @param md5       MD5sum of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF8(const uInt8* image, const string& md5);
+    CartridgeF8(const uInt8* image, const string& md5, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartF8SC.cxx b/src/emucore/CartF8SC.cxx
index a045cdc07..4e58b2a61 100644
--- a/src/emucore/CartF8SC.cxx
+++ b/src/emucore/CartF8SC.cxx
@@ -24,7 +24,8 @@
 #include "CartF8SC.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeF8SC::CartridgeF8SC(const uInt8* image)
+CartridgeF8SC::CartridgeF8SC(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 8192);
@@ -44,9 +45,12 @@ CartridgeF8SC::~CartridgeF8SC()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeF8SC::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 128; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 128; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 128);
 
   // Upon reset we switch to the startup bank
   bank(myStartBank);
diff --git a/src/emucore/CartF8SC.hxx b/src/emucore/CartF8SC.hxx
index dcf5c38a5..a3c6c3c8a 100644
--- a/src/emucore/CartF8SC.hxx
+++ b/src/emucore/CartF8SC.hxx
@@ -38,9 +38,10 @@ class CartridgeF8SC : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeF8SC(const uInt8* image);
+    CartridgeF8SC(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartFA.cxx b/src/emucore/CartFA.cxx
index 2e4d39e97..ca8532788 100644
--- a/src/emucore/CartFA.cxx
+++ b/src/emucore/CartFA.cxx
@@ -24,7 +24,8 @@
 #include "CartFA.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeFA::CartridgeFA(const uInt8* image)
+CartridgeFA::CartridgeFA(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 12288);
@@ -44,9 +45,12 @@ CartridgeFA::~CartridgeFA()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeFA::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 256; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 256; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 256);
 
   // Upon reset we switch to the startup bank
   bank(myStartBank);
diff --git a/src/emucore/CartFA.hxx b/src/emucore/CartFA.hxx
index 045fb3a60..301a6498c 100644
--- a/src/emucore/CartFA.hxx
+++ b/src/emucore/CartFA.hxx
@@ -38,9 +38,10 @@ class CartridgeFA : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeFA(const uInt8* image);
+    CartridgeFA(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartFE.cxx b/src/emucore/CartFE.cxx
index cbc5a7ec2..dcac3a3d9 100644
--- a/src/emucore/CartFE.cxx
+++ b/src/emucore/CartFE.cxx
@@ -24,8 +24,9 @@
 #include "CartFE.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeFE::CartridgeFE(const uInt8* image)
-  : myLastAddress1(0),
+CartridgeFE::CartridgeFE(const uInt8* image, const Settings& settings)
+  : Cartridge(settings),
+    myLastAddress1(0),
     myLastAddress2(0),
     myLastAddressChanged(false)
 {
diff --git a/src/emucore/CartFE.hxx b/src/emucore/CartFE.hxx
index 695d88024..e73a15f16 100644
--- a/src/emucore/CartFE.hxx
+++ b/src/emucore/CartFE.hxx
@@ -53,9 +53,10 @@ class CartridgeFE : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeFE(const uInt8* image);
+    CartridgeFE(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartMC.cxx b/src/emucore/CartMC.cxx
index 316c372a8..5b72c0862 100644
--- a/src/emucore/CartMC.cxx
+++ b/src/emucore/CartMC.cxx
@@ -30,8 +30,10 @@
 //        adequate test ROMs are available
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeMC::CartridgeMC(const uInt8* image, uInt32 size)
-  : mySlot3Locked(false)
+CartridgeMC::CartridgeMC(const uInt8* image, uInt32 size,
+                         const Settings& settings)
+  : Cartridge(settings),
+    mySlot3Locked(false)
 {
   // Make sure size is reasonable
   assert(size <= 131072);
@@ -51,9 +53,12 @@ CartridgeMC::~CartridgeMC()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeMC::reset()
 {
-  // Initialize RAM with random values
-  for(uInt32 i = 0; i < 32768; ++i)
-    myRAM[i] = mySystem->randGenerator().next();
+  // Initialize RAM
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 i = 0; i < 32768; ++i)
+      myRAM[i] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 32768);
 
   myBankChanged = true;
 }
diff --git a/src/emucore/CartMC.hxx b/src/emucore/CartMC.hxx
index 23ce9fd9b..37ab38485 100644
--- a/src/emucore/CartMC.hxx
+++ b/src/emucore/CartMC.hxx
@@ -144,10 +144,11 @@ class CartridgeMC : public Cartridge
       size of the image is less than 128K then the cartridge will pad the
       beginning of the 128K ROM with zeros.
 
-      @param image Pointer to the ROM image
-      @param size The size of the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeMC(const uInt8* image, uInt32 size);
+    CartridgeMC(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartSB.cxx b/src/emucore/CartSB.cxx
index 6d7f9a8af..28ee6c807 100644
--- a/src/emucore/CartSB.cxx
+++ b/src/emucore/CartSB.cxx
@@ -24,8 +24,10 @@
 #include "CartSB.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeSB::CartridgeSB(const uInt8* image, uInt32 size)
-  : mySize(size)
+CartridgeSB::CartridgeSB(const uInt8* image, uInt32 size,
+                         const Settings& settings)
+  : Cartridge(settings),
+    mySize(size)
 {
   // Allocate array for the ROM image
   myImage = new uInt8[mySize];
diff --git a/src/emucore/CartSB.hxx b/src/emucore/CartSB.hxx
index 1e4912213..9ae8533ee 100644
--- a/src/emucore/CartSB.hxx
+++ b/src/emucore/CartSB.hxx
@@ -36,9 +36,11 @@ class CartridgeSB : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param size      The size of the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeSB(const uInt8* image, uInt32 size);
+    CartridgeSB(const uInt8* image, uInt32 size, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartUA.cxx b/src/emucore/CartUA.cxx
index 6655f088d..743b7d104 100644
--- a/src/emucore/CartUA.cxx
+++ b/src/emucore/CartUA.cxx
@@ -24,7 +24,8 @@
 #include "CartUA.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeUA::CartridgeUA(const uInt8* image)
+CartridgeUA::CartridgeUA(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 8192);
diff --git a/src/emucore/CartUA.hxx b/src/emucore/CartUA.hxx
index f1bc95f3f..c8a5170ec 100644
--- a/src/emucore/CartUA.hxx
+++ b/src/emucore/CartUA.hxx
@@ -39,9 +39,10 @@ class CartridgeUA : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeUA(const uInt8* image);
+    CartridgeUA(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/CartX07.cxx b/src/emucore/CartX07.cxx
index 7765e9237..c74814deb 100644
--- a/src/emucore/CartX07.cxx
+++ b/src/emucore/CartX07.cxx
@@ -26,7 +26,8 @@
 #include "CartX07.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-CartridgeX07::CartridgeX07(const uInt8* image)
+CartridgeX07::CartridgeX07(const uInt8* image, const Settings& settings)
+  : Cartridge(settings)
 {
   // Copy the ROM image into my buffer
   memcpy(myImage, image, 65536);
diff --git a/src/emucore/CartX07.hxx b/src/emucore/CartX07.hxx
index eb917d9bf..6250f5c6b 100644
--- a/src/emucore/CartX07.hxx
+++ b/src/emucore/CartX07.hxx
@@ -48,9 +48,10 @@ class CartridgeX07 : public Cartridge
     /**
       Create a new cartridge using the specified image
 
-      @param image Pointer to the ROM image
+      @param image     Pointer to the ROM image
+      @param settings  A reference to the various settings (read-only)
     */
-    CartridgeX07(const uInt8* image);
+    CartridgeX07(const uInt8* image, const Settings& settings);
  
     /**
       Destructor
diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx
index 8659f3f2a..6399cc68d 100644
--- a/src/emucore/Console.cxx
+++ b/src/emucore/Console.cxx
@@ -104,7 +104,7 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
 #endif
 
   myCart = cart;
-  myRiot = new M6532(*this);
+  myRiot = new M6532(*this, myOSystem->settings());
   myTIA  = new TIA(*this, myOSystem->sound(), myOSystem->settings());
 
   mySystem->attach(m6502);
diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx
index 456acbd9b..bc76de1eb 100644
--- a/src/emucore/M6532.cxx
+++ b/src/emucore/M6532.cxx
@@ -21,14 +21,16 @@
 #include <iostream>
 
 #include "Console.hxx"
+#include "Settings.hxx"
 #include "Switches.hxx"
 #include "System.hxx"
 
 #include "M6532.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-M6532::M6532(const Console& console)
-  : myConsole(console)
+M6532::M6532(const Console& console, const Settings& settings)
+  : myConsole(console),
+    mySettings(settings)
 {
 }
  
@@ -40,9 +42,12 @@ M6532::~M6532()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void M6532::reset()
 {
-  // Randomize the 128 bytes of memory
-  for(uInt32 t = 0; t < 128; ++t)
-    myRAM[t] = mySystem->randGenerator().next();
+  // Initialize the 128 bytes of memory
+  if(mySettings.getBool("ramrandom"))
+    for(uInt32 t = 0; t < 128; ++t)
+      myRAM[t] = mySystem->randGenerator().next();
+  else
+    memset(myRAM, 0, 128);
 
   // The timer absolutely cannot be initialized to zero; some games will
   // loop or hang (notably Solaris and H.E.R.O.)
@@ -372,7 +377,8 @@ bool M6532::load(Serializer& in)
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 M6532::M6532(const M6532& c)
-  : myConsole(c.myConsole)
+  : myConsole(c.myConsole),
+    mySettings(c.mySettings)
 {
   assert(false);
 }
diff --git a/src/emucore/M6532.hxx b/src/emucore/M6532.hxx
index 0de61a88b..0e54fb288 100644
--- a/src/emucore/M6532.hxx
+++ b/src/emucore/M6532.hxx
@@ -22,6 +22,7 @@
 
 class Console;
 class RiotDebug;
+class Settings;
 
 #include "bspf.hxx"
 #include "Device.hxx"
@@ -45,9 +46,10 @@ class M6532 : public Device
     /**
       Create a new 6532 for the specified console
 
-      @param console The console the 6532 is associated with
+      @param console  The console the 6532 is associated with
+      @param randRam  Randomize or zero RAM on reset
     */
-    M6532(const Console& console);
+    M6532(const Console& console, const Settings& settings);
  
     /**
       Destructor
@@ -138,6 +140,9 @@ class M6532 : public Device
     // Reference to the console
     const Console& myConsole;
 
+    // Reference to the settings
+    const Settings& mySettings;
+
     // An amazing 128 bytes of RAM
     uInt8 myRAM[128];
 
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 323726215..bee7532b1 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -121,6 +121,7 @@ Settings::Settings(OSystem* osystem)
   setInternal("autoslot", "false");
   setInternal("showinfo", "1");
   setInternal("tiadriven", "false");
+  setInternal("ramrandom", "false");
   setInternal("avoxport", "");
   setInternal("stats", "false");
   setInternal("audiofirst", "true");
@@ -418,6 +419,11 @@ void Settings::usage()
     << "  -eepromdir    <dir>          Directory in which to save EEPROM files\n"
     << "  -avoxport     <name>         The name of the serial port where an AtariVox is connected\n"
     << "  -maxres       <WxH>          Used by developers to force the maximum size of the application window\n"
+    << "  -holdreset                   Start the emulator with the Game Reset switch held down\n"
+    << "  -holdselect                  Start the emulator with the Game Select switch held down\n"
+    << "  -holdbutton0                 Start the emulator with the left joystick button held down\n"
+    << "  -tiadriven    <1|0>          Drive unused TIA pins randomly on a read/peek\n"
+    << "  -ramrandom    <1|0>          Randomize the contents of RAM on reset\n"
     << "  -help                        Show the text you're now reading\n"
   #ifdef DEBUGGER_SUPPORT
     << endl
@@ -429,10 +435,6 @@ void Settings::usage()
     << "   -debuggerres  <WxH>         The resolution to use in debugger mode\n"
     << "   -break        <address>     Set a breakpoint at 'address'\n"
     << "   -debug                      Start in debugger mode\n"
-    << "   -holdreset                  Start the emulator with the Game Reset switch held down\n"
-    << "   -holdselect                 Start the emulator with the Game Select switch held down\n"
-    << "   -holdbutton0                Start the emulator with the left joystick button held down\n"
-    << "   -tiadriven    <1|0>         Drive unused TIA pins randomly value on a read/peek\n"
     << endl
     << "   -bs          <arg>          Sets the 'Cartridge.Type' (bankswitch) property\n"
     << "   -type        <arg>          Same as using -bs\n"
diff --git a/src/gui/DialogContainer.hxx b/src/gui/DialogContainer.hxx
index 7890fe69f..59e02809c 100644
--- a/src/gui/DialogContainer.hxx
+++ b/src/gui/DialogContainer.hxx
@@ -150,7 +150,7 @@ class DialogContainer
   protected:
     OSystem* myOSystem;
     Dialog*  myBaseDialog;
-    FixedStack<Dialog *> myDialogStack;
+    Common::FixedStack<Dialog *> myDialogStack;
 
   private:
     enum {
diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx
index a20366abf..379c241a4 100644
--- a/src/gui/LauncherDialog.hxx
+++ b/src/gui/LauncherDialog.hxx
@@ -111,7 +111,7 @@ class LauncherDialog : public Dialog
     int mySelectedItem;
     int myRomInfoSize;
     FilesystemNode myCurrentNode;
-    FixedStack<string> myNodeNames;
+    Common::FixedStack<string> myNodeNames;
 
     bool myShowDirs;
     StringList myRomExts;
diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx
index 6cb307fe2..a6d072bd3 100644
--- a/src/gui/VideoDialog.cxx
+++ b/src/gui/VideoDialog.cxx
@@ -346,6 +346,9 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent,
   myGrabmouseCheckbox->clearFlags(WIDGET_ENABLED);
   myCenterCheckbox->clearFlags(WIDGET_ENABLED);
 #endif
+#if !(defined(BSPF_WIN32) || (defined(BSPF_UNIX) && defined(HAVE_X11)))
+  myCenterCheckbox->clearFlags(WIDGET_ENABLED);
+#endif
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index 2eba49dd9..dcd10f17c 100644
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
-* Mon Aug 16 2010 Stephen Anthony <stephena@users.sf.net> 3.2-1
+* Fri Aug 20 2010 Stephen Anthony <stephena@users.sf.net> 3.2-1
 - Version 3.2 release
 
 * Mon May 3 2010 Stephen Anthony <stephena@users.sf.net> 3.1.2-1