diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib
index d558216..ae9cf90 100644
--- a/Cocoa/Document.xib
+++ b/Cocoa/Document.xib
@@ -397,8 +397,8 @@
                                                 <outlet property="delegate" destination="-2" id="EAG-Zh-oRi"/>
                                             </connections>
                                         </imageView>
-                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" id="loB-0k-Qff">
-                                            <rect key="frame" x="4" y="387" width="128" height="18"/>
+                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" misplaced="YES" id="loB-0k-Qff">
+                                            <rect key="frame" x="4" y="388" width="128" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="roundRect" title="Effective Palettes" bezelStyle="roundedRect" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" selectedItem="oUH-Sa-Ec1" id="Eij-Cp-URa">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -430,8 +430,8 @@
                                                 <action selector="reloadVRAMData:" target="-2" id="BmB-JE-W8g"/>
                                             </connections>
                                         </popUpButton>
-                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" id="YIJ-Qc-SIZ">
-                                            <rect key="frame" x="135" y="387" width="96" height="18"/>
+                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" misplaced="YES" id="YIJ-Qc-SIZ">
+                                            <rect key="frame" x="135" y="388" width="96" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="roundRect" title="Effective Tilemap" bezelStyle="roundedRect" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" selectedItem="XRF-Vj-3gs" id="3W1-Db-wDn">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -448,8 +448,8 @@
                                                 <action selector="reloadVRAMData:" target="-2" id="xwp-Ju-p00"/>
                                             </connections>
                                         </popUpButton>
-                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" id="k4c-Vg-MBu">
-                                            <rect key="frame" x="235" y="387" width="96" height="18"/>
+                                        <popUpButton focusRingType="none" verticalHuggingPriority="750" misplaced="YES" id="k4c-Vg-MBu">
+                                            <rect key="frame" x="235" y="388" width="96" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="roundRect" title="Effective Tileset" bezelStyle="roundedRect" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" selectedItem="CRe-dX-rzY" id="h53-sb-Odg">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/Core/debugger.c b/Core/debugger.c
index 6874433..d7fbdf8 100644
--- a/Core/debugger.c
+++ b/Core/debugger.c
@@ -819,7 +819,7 @@ static bool registers(GB_gameboy_t *gb, char *arguments, char *modifiers, const
     GB_log(gb, "AF = $%04x (%c%c%c%c)\n", gb->registers[GB_REGISTER_AF], /* AF can't really be an address */
            (gb->f & GB_CARRY_FLAG)?      'C' : '-',
            (gb->f & GB_HALF_CARRY_FLAG)? 'H' : '-',
-           (gb->f & GB_SUBSTRACT_FLAG)?  'S' : '-',
+           (gb->f & GB_SUBSTRACT_FLAG)?  'N' : '-',
            (gb->f & GB_ZERO_FLAG)?       'Z' : '-');
     GB_log(gb, "BC = %s\n", value_to_string(gb, gb->registers[GB_REGISTER_BC], false));
     GB_log(gb, "DE = %s\n", value_to_string(gb, gb->registers[GB_REGISTER_DE], false));
@@ -1766,9 +1766,9 @@ static const debugger_command_t commands[] = {
     {"cartridge", 2, mbc, "Displays information about the MBC and cartridge"},
     {"mbc", 3, }, /* Alias */
     {"apu", 3, apu, "Displays information about the current state of the audio chip"},
-    {"wave", 3, wave, "Prints a visual representation of the wave RAM" HELP_NEWLINE
+    {"wave", 3, wave, "Prints a visual representation of the wave RAM." HELP_NEWLINE
                       "Modifiers can be used for a (f)ull print (the default)," HELP_NEWLINE
-                      "a more (c)ompact one, or a one-(l)iner"},
+                      "a more (c)ompact one, or a one-(l)iner", "", "(f|c|l)"},
     {"lcd", 3, lcd, "Displays information about the current state of the LCD controller"},
     {"palettes", 3, palettes, "Displays the current CGB palettes"},
     {"breakpoint", 1, breakpoint, "Add a new breakpoint at the specified address/expression" HELP_NEWLINE