diff --git a/Doc/ide_debug_memory.html b/Doc/ide_debug_memory.html
index 6ac0f8c3..6095b689 100644
--- a/Doc/ide_debug_memory.html
+++ b/Doc/ide_debug_memory.html
@@ -16,6 +16,12 @@ <H3>Debug Memory</H3>
     <br>
     Values that changed during the last step are marked red.<br>
     <br>
+    Clicking on the display-as-text button (left most) will switch to character display. Clicking again switches to lower case mode.<br>
+    <br>
+    Clicking on the display-as-charset button (second left) will switch to characterset display. Clicking again switches between hires, multicolor and ECM mode. The used colors can be changed via right-click context menu.<br>
+    <br>
+    Clicking on the display-as-sprite button (third) will switch to sprite display. Clicking again switches between hires and multicolor mode. The used colors can be changed via right-click context menu.<br>
+    <br>
     <br>
   </div>
 </body>
diff --git a/Doc/ide_debug_registers.html b/Doc/ide_debug_registers.html
index 1834428f..14c70f5b 100644
--- a/Doc/ide_debug_registers.html
+++ b/Doc/ide_debug_registers.html
@@ -44,6 +44,8 @@ <H3>Debug Registers</H3>
     <b>Status</b><br>
     Status displays the various flags of the CPU. NV-BDIZC from left to right are Negative flag, Overflow flag, Expansion Bit (unused), Break flag, Decimal flag, Interrupt flag, Zero flag and Carry flag.<br>
     <br>
+    Overwriting values will update them for the current session where applicable (A, X, Y, PC, Flags). Updating values obviously only works in active Debug Mode.<br>
+    <br>
     <br>
   </div>
 </body>
diff --git a/HexBox/BuiltInContextMenu.cs b/HexBox/BuiltInContextMenu.cs
index 50f91e6a..c44a9427 100644
--- a/HexBox/BuiltInContextMenu.cs
+++ b/HexBox/BuiltInContextMenu.cs
@@ -219,7 +219,7 @@ internal string CopyAsHexMenuItemTextInternal
         /// <summary>
         /// Gets the text of the "Select All" ContextMenuStrip item.
         /// </summary>
-        internal string SelectAllMenuItemTextInternal { get { return !string.IsNullOrEmpty(SelectAllMenuItemText) ? SelectAllMenuItemText : "SelectAll"; } }
+        internal string SelectAllMenuItemTextInternal { get { return !string.IsNullOrEmpty(SelectAllMenuItemText) ? SelectAllMenuItemText : "Select All"; } }
 
         /// <summary>
         /// Gets or sets the image of the "Cut" ContextMenuStrip item.
diff --git a/Sample Projects/MacroTest/MacroTest.c64 b/Sample Projects/MacroTest/MacroTest.c64
index da7f9712..ca9c91e6 100644
Binary files a/Sample Projects/MacroTest/MacroTest.c64 and b/Sample Projects/MacroTest/MacroTest.c64 differ
diff --git a/Sample Projects/MacroTest/MacroTest.s64 b/Sample Projects/MacroTest/MacroTest.s64
index 794fd2f3..27fa2fd9 100644
Binary files a/Sample Projects/MacroTest/MacroTest.s64 and b/Sample Projects/MacroTest/MacroTest.s64 differ
diff --git a/Sample Projects/MacroTest/dountil_test.asm b/Sample Projects/MacroTest/dountil_test.asm
index 981bfe98..7a4de0b6 100644
--- a/Sample Projects/MacroTest/dountil_test.asm	
+++ b/Sample Projects/MacroTest/dountil_test.asm	
@@ -5,11 +5,11 @@ num_tiles    = 10
 
 START
 
-;!set i=0 
-;!do { 
-;!byte <tilesdata_HR+i*4 
-;!set i = i + 1 
-; } until i > num_tiles 
+!set i=0 
+!do { 
+!byte <tilesdata_HR+i*4 
+!set i = i + 1 
+ } until i > num_tiles 
  
  
  !for i=0 to num_tiles