diff --git a/Changes.txt b/Changes.txt
index d6f4d3f26..8eb9c4595 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -48,7 +48,7 @@
   * FPS setting replaced with speed setting for adjusting emulation speed.
 
   * Extra functionality for Time Machine dialog (start/stop recording;
-    minor fixes; TODO button and initial key repeats...)
+    minor fixes).
 
   * When logging messages to the System Logger, condense similar messages
     that arrive in batches into fewer messages (including timestamps).
diff --git a/src/common/StateManager.cxx b/src/common/StateManager.cxx
index ca03f0ca8..c9d085396 100644
--- a/src/common/StateManager.cxx
+++ b/src/common/StateManager.cxx
@@ -27,7 +27,7 @@
 
 #include "StateManager.hxx"
 
-#define STATE_HEADER "05090902state"
+#define STATE_HEADER "06000000state"
 // #define MOVIE_HEADER "03030000movie"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index af2571e73..5017939b6 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -18,7 +18,7 @@
 #ifndef VERSION_HXX
 #define VERSION_HXX
 
-#define STELLA_VERSION "6.0_rc1"
-#define STELLA_BUILD "4652"
+#define STELLA_VERSION "6.0"
+#define STELLA_BUILD "4667"
 
 #endif
diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index e56e80209..04fff4b59 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -24,19 +24,19 @@
 
   // Flags for disassembly types
   #define DISASM_CODE  CartDebug::CODE
-//   #define DISASM_GFX   CartDebug::GFX  // TODO - uncomment when needed
-//   #define DISASM_PGFX  CartDebug::PGFX // TODO - uncomment when needed
+//   #define DISASM_GFX   CartDebug::GFX
+//   #define DISASM_PGFX  CartDebug::PGFX
   #define DISASM_DATA  CartDebug::DATA
-//   #define DISASM_ROW   CartDebug::ROW  // TODO - uncomment when needed
+//   #define DISASM_ROW   CartDebug::ROW
   #define DISASM_WRITE CartDebug::WRITE
   #define DISASM_NONE  0
 #else
   // Flags for disassembly types
   #define DISASM_CODE  0
-//   #define DISASM_GFX   0   // TODO - uncomment when needed
-//   #define DISASM_PGFX  0   // TODO - uncomment when needed
+//   #define DISASM_GFX   0
+//   #define DISASM_PGFX  0
   #define DISASM_DATA  0
-//   #define DISASM_ROW   0   // TODO - uncomment when needed
+//   #define DISASM_ROW   0
   #define DISASM_NONE  0
   #define DISASM_WRITE 0
 #endif