diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx
index ff9e49f27..3c17829ab 100644
--- a/stella/src/emucore/FrameBuffer.cxx
+++ b/stella/src/emucore/FrameBuffer.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBuffer.cxx,v 1.56 2005-07-20 17:33:03 stephena Exp $
+// $Id: FrameBuffer.cxx,v 1.57 2005-07-20 18:44:38 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -184,7 +184,8 @@ void FrameBuffer::update()
           {
             myMessageTime = -1;
             theRedrawTIAIndicator = true;
-          }
+            drawMediaSource();  // show the changes right now, not next frame
+	  }
         }
       }
       break;  // S_EMULATE
@@ -260,6 +261,13 @@ void FrameBuffer::refreshOverlay(bool now)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameBuffer::showMessage(const string& message)
 {
+  // Erase old messages on the screen
+  if(myMessageTime != -1)
+  {
+    theRedrawTIAIndicator = true;
+    drawMediaSource();
+  }
+
   myMessageText = message;
   myMessageTime = myFrameRate << 1;   // Show message for 2 seconds
 }
diff --git a/stella/src/win32/Stella/Stella.vcproj b/stella/src/win32/Stella/Stella.vcproj
index 59105688a..53e60d2c8 100644
--- a/stella/src/win32/Stella/Stella.vcproj
+++ b/stella/src/win32/Stella/Stella.vcproj
@@ -155,6 +155,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\ByteDerefExpression.cxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\ByteDerefOffsetExpression.cxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\Cart.cxx">
 			</File>
@@ -236,6 +239,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\CpuDebug.cxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\CpuMethodExpression.cxx">
+			</File>
 			<File
 				RelativePath="..\..\gui\CpuWidget.cxx">
 			</File>
@@ -335,9 +341,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\HiByteExpression.cxx">
 			</File>
-			<File
-				RelativePath="..\..\debugger\IntMethodExpression.cxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\Joystick.cxx">
 			</File>
@@ -494,6 +497,12 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\TIADebug.cxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\TiaMethodExpression.cxx">
+			</File>
+			<File
+				RelativePath="..\..\debugger\TiaOutputWidget.cxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\TIASound.c">
 			</File>
@@ -562,6 +571,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\ByteDerefExpression.hxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\ByteDerefOffsetExpression.hxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\Cart.hxx">
 			</File>
@@ -649,6 +661,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\CpuDebug.hxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\CpuMethodExpression.hxx">
+			</File>
 			<File
 				RelativePath="..\..\gui\CpuWidget.hxx">
 			</File>
@@ -757,9 +772,6 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\HiByteExpression.hxx">
 			</File>
-			<File
-				RelativePath="..\..\debugger\IntMethodExpression.hxx">
-			</File>
 			<File
 				RelativePath="..\..\emucore\Joystick.hxx">
 			</File>
@@ -928,6 +940,12 @@ opengl32.lib"
 			<File
 				RelativePath="..\..\debugger\TIADebug.hxx">
 			</File>
+			<File
+				RelativePath="..\..\debugger\TiaMethodExpression.hxx">
+			</File>
+			<File
+				RelativePath="..\..\debugger\TiaOutputWidget.hxx">
+			</File>
 			<File
 				RelativePath="..\..\emucore\TIASound.h">
 			</File>