diff --git a/AppleWin/source/Debugger/Debug.cpp b/AppleWin/source/Debugger/Debug.cpp
index 6657cdc1..e0445f80 100644
--- a/AppleWin/source/Debugger/Debug.cpp
+++ b/AppleWin/source/Debugger/Debug.cpp
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define ALLOW_INPUT_LOWERCASE 1
 
 	// See Debugger_Changelong.txt for full details
-	const int DEBUGGER_VERSION = MAKE_VERSION(2,6,2,26);
+	const int DEBUGGER_VERSION = MAKE_VERSION(2,6,2,29);
 
 
 // Public _________________________________________________________________________________________
diff --git a/AppleWin/source/Debugger/Debugger_DisassemblerData.cpp b/AppleWin/source/Debugger/Debugger_DisassemblerData.cpp
index a6c7d701..b60cd38f 100644
--- a/AppleWin/source/Debugger/Debugger_DisassemblerData.cpp
+++ b/AppleWin/source/Debugger/Debugger_DisassemblerData.cpp
@@ -185,7 +185,7 @@ Update_t _CmdDisasmDataDefByteX (int nArgs)
 	// DB symbol
 	// DB symbol address
 	// DB symbol range:range
-	int iCmd = NOP_BYTE_1 - g_aArgs[0].nValue;
+	int iCmd = g_aArgs[0].nValue - NOP_BYTE_1;
 
 //	if ((!nArgs) || (nArgs > 2))
 	if (! ((nArgs <= 2) || (nArgs == 4)))
@@ -224,7 +224,7 @@ Update_t _CmdDisasmDataDefWordX (int nArgs)
 	// DW symbol
 	// DW symbol address
 	// DW symbol range:range
-	int iCmd = NOP_WORD_1 - g_aArgs[0].nValue;
+	int iCmd = g_aArgs[0].nValue - NOP_WORD_1;
 
 	if (! ((nArgs <= 2) || (nArgs == 4)))
 	{
diff --git a/AppleWin/source/Debugger/Debugger_Display.cpp b/AppleWin/source/Debugger/Debugger_Display.cpp
index 0b500f08..1b628e36 100644
--- a/AppleWin/source/Debugger/Debugger_Display.cpp
+++ b/AppleWin/source/Debugger/Debugger_Display.cpp
@@ -1528,25 +1528,30 @@ void FormatNopcodeBytes ( WORD nBaseAddress, DisasmLine_t & line_ )
 			case NOP_BYTE_1:
 			case NOP_BYTE_2:
 			case NOP_BYTE_4:
+			case NOP_BYTE_8:
 				sprintf( pDst, "%02X", nTarget8 ); // sBytes+strlen(sBytes)
-				pDst += 3;
+				pDst += 2;
 				iByte++;
-				if( iByte < line_.nOpbyte )
-				{
-					*pDst++ = ',';
-				}
+				if( line_.iNoptype == NOP_BYTE_1)
+					if( iByte < line_.nOpbyte )
+					{
+						*pDst++ = ',';
+					}
 				break;
 			case NOP_WORD_1:
 			case NOP_WORD_2:
 			case NOP_WORD_4:
 				sprintf( pDst, "%04X", nTarget16 ); // sBytes+strlen(sBytes)
-				pDst += 5;
+				pDst += 4;
 				iByte+= 2;
 				if( iByte < line_.nOpbyte )
 				{
 					*pDst++ = ',';
 				}
 				break;
+			case NOP_ADDRESS:
+				iByte += 2;
+				break;
 			case NOP_STRING_APPLESOFT:
 				iByte = line_.nOpbyte;
 				strncpy( pDst, (const char*)(mem + nBaseAddress), iByte );