diff --git a/Changes.txt b/Changes.txt
index 0b8337fda..338a0d41d 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -88,6 +88,9 @@
   * Modified 'disasm' debugger command to accept a second argument
     indicating the number of lines to disassemble.
 
+  * Improved tab-completion in the debugger prompt; it now completes
+    on functions and pseudo-registers.
+
   * Added emulation of the "Sega Genesis" controller, with two buttons
     that are directly supported on a real system.
 
diff --git a/docs/debugger.html b/docs/debugger.html
index 8b1ab726c..857005f13 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -998,7 +998,7 @@ them. When you're done, press Enter to accept the changes (in which case
 the cart will be re-disasembled) or Escape to cancel them.
 Note that only instructions that have been fully disassembled
 can be edited.  In particular, blank lines or lines with '.byte' directives
-cannot be edited.  If you wish to edit the latter, then the 'Determine code'
+cannot be edited.  If you wish to edit the latter, then the 'Resolve data'
 item should be set to 'Never' first.  Also note that certain ROMs can have
 sections of address space swapped in and out dynamically.  As such, changing
 the contents of a certain address will change the area pointed to <b>at
diff --git a/docs/graphics/launcher_options_files.png b/docs/graphics/launcher_options_files.png
index 4f18a28dc..d226b50c8 100644
Binary files a/docs/graphics/launcher_options_files.png and b/docs/graphics/launcher_options_files.png differ
diff --git a/docs/index.html b/docs/index.html
index 7811b9f00..ca3c65315 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -594,6 +594,7 @@
 					<tr><td>EEPROM path</td><td>specifies location of EEPROM files</td><td>-eepromdir</td></tr>
 					<tr><td>Multiple snapshots</td><td>whether to overwrite old snapshots</td><td>-sssingle</td></tr>
 					<tr><td>Snapshot in 1x mode</td><td>save snapshot in 1x mode, without filtering</td><td>-ss1x</td></tr>
+					<tr><td>Snapshot interval</td><td>interval (in seconds) between snapshot</td><td>-ssinterval</td></tr>
 				</table>
 			</td>
 		</tr>
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 4f48e70d2..be4914ba8 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,13 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_BASE_VERSION "3.1_test5"
-
-#ifdef NIGHTLY_BUILD
-  #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD
-#else
-  #define STELLA_VERSION STELLA_BASE_VERSION
-#endif
+#define STELLA_VERSION "3.1"
 
 #define STELLA_BUILD atoi("$Rev$"+6)
 
diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx
index f0fcc7289..1d1f2520b 100644
--- a/src/emucore/System.hxx
+++ b/src/emucore/System.hxx
@@ -287,11 +287,14 @@ class System : public Serializable
     void unlockDataBus();
 
   public:
+    /**
+      Describes how a page can be accessed
+    */
     enum PageAccessType {
       PA_READ      = 1 << 0,
       PA_WRITE     = 1 << 1,
       PA_READWRITE = PA_READ | PA_WRITE
-	};
+    };
 
     /**
       Structure used to specify access methods for a page