diff --git a/Changes.txt b/Changes.txt
index 7a651b7b8..5e005ad1d 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -25,7 +25,7 @@
     be addressed in a future release.
 
   * Completely reworked the debugger cartridge interface, so that
-    the disassembly is dynamic (ie, the debugger tracks when address
+    the disassembly is dynamic (ie, the debugger tracks when cart address
     space has changed, and automatically performs a re-disassembly).
 
   * All carts with extended RAM that differentiate between read and write
@@ -38,7 +38,7 @@
     the (incorrect) patched results.
 
   * Added debugger pseudo-register '_rwport', which traps on a read from
-    the write port.  This differentiates between reads that are normally
+    the write port.  This differentiates from reads that are normally
     part of a write cycle (ie, it traps only on inadvertent reads).
 
   * Added ability to disable TIA object collisions, independent of
@@ -59,23 +59,37 @@
     to set the "automatic code determination" config option in Distella.
 
   * Removed the 'loadlst' command and the ability to use a DASM .lst file.
-    With the recent disassembler improvements, this is no longer needed.
+    With the recent disassembler improvements, this no longer makes sense.
 
-  * Modified debugger 'disasm' command to accept a second argument
+  * Modified 'disasm' debugger command to accept a second argument
     indicating the number of lines to disassemble.
 
   * Added emulation of the "Sega Genesis" controller, with two buttons
     that are directly supported on a real system.
 
-  * The ZLib library is now included in the core code, so Windows users
-    no longer have to track down the ZLIBWAPI archive.
+  * The ZLib library is now included in the core code, so Windows
+    developers no longer have to track down the ZLIBWAPI archive.
 
-  * Many changes to the MacOS X port.  The application is now known as
-    'Stella' (instead of StellaOSX), and the keyboard handling is changed
-    to match other systems in terms of where the keys actually are on the
-    keyboard (ie, the OSX Command key corresponds to Alt, and the OSX
-    Control key corresponds to Control).  As a result, all your settings
-    will have to be entered again.
+  * Many changes to the MacOS X port, bringing it more in line with
+    other systems:
+
+      The application is now known as 'Stella' (instead of StellaOSX).
+
+      The keyboard handling is changed to match other systems in terms of
+      where the keys actually are on the keyboard (ie, the OSX Command key
+      corresponds to Alt, and the OSX Control key corresponds to Control).
+
+      The application menu has been cleaned up and simplified, and it
+      now shows the correct shortcuts for menu items.
+
+      The settings file is now (according to Apple standards)
+      '~/Library/Preferences/net.sourceforge.Stella.plist'.
+
+      The base directory (where all other Stella stuff is located) is now
+      '~/Library/Application Support/Stella'.
+
+      Because of these changes, all your settings will have to be entered
+      again.
 
   * Added 'ctrlcombo' commandline argument, which toggles the use of the
     control key as a modifier key.  This is useful if you want to press
@@ -87,6 +101,7 @@
 
   * Added 'uimessages' commandline argument and associated UI item.
     This toggles showing of UI messages overlaid on the screen.
+    Critical messages are still shown, though.
 
   * Many changes to the FrameBuffer and UI code for 'smaller' systems.
     Stella will now scale correctly to small screens, down to 320x240
diff --git a/src/emucore/Control.cxx b/src/emucore/Control.cxx
index a4a41dc1a..46e11d5d8 100644
--- a/src/emucore/Control.cxx
+++ b/src/emucore/Control.cxx
@@ -137,7 +137,7 @@ bool Controller::save(Serializer& out) const
     out.putInt(myAnalogPinValue[Five]);
     out.putInt(myAnalogPinValue[Nine]);
   }
-  catch(...)  // FIXME
+  catch(...)
   {
     cerr << "ERROR: Controller::save() exception\n";
     return false;
@@ -161,7 +161,7 @@ bool Controller::load(Serializer& in)
     myAnalogPinValue[Five] = (Int32) in.getInt();
     myAnalogPinValue[Nine] = (Int32) in.getInt();
   }
-  catch(...)  // FIXME
+  catch(...)
   {
     cerr << "ERROR: Controller::load() exception\n";
     return false;
diff --git a/src/emucore/Switches.cxx b/src/emucore/Switches.cxx
index ad263dc56..511f4b0bb 100644
--- a/src/emucore/Switches.cxx
+++ b/src/emucore/Switches.cxx
@@ -114,7 +114,7 @@ bool Switches::save(Serializer& out) const
   {
     out.putByte((char)mySwitches);
   }
-  catch(...)  // FIXME
+  catch(...)
   {
     cerr << "ERROR: Switches::save() exception\n";
     return false;
@@ -129,7 +129,7 @@ bool Switches::load(Serializer& in)
   {
     mySwitches = (uInt8) in.getByte();
   }
-  catch(...)  // FIXME
+  catch(...)
   {
     cerr << "ERROR: Switches::load() exception\n";
     return false;
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index 81a4e9761..7f796599c 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -232,7 +232,7 @@ GameInfoDialog::GameInfoDialog(
   ctrls.push_back("AtariVox",       "ATARIVOX"    );
   ctrls.push_back("SaveKey",        "SAVEKEY"     );
   ctrls.push_back("Sega Genesis",   "GENESIS"     );
-//FIXME  ctrls.push_back("KidVid",         "KIDVID"      );
+// TODO  ctrls.push_back("KidVid",         "KIDVID"      );
   myP0Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos,
                                    pwidth, lineHeight, ctrls, "", 0, 0);
   wid.push_back(myP0Controller);
diff --git a/src/gui/ScrollBarWidget.hxx b/src/gui/ScrollBarWidget.hxx
index 8f2f25012..04d54e895 100644
--- a/src/gui/ScrollBarWidget.hxx
+++ b/src/gui/ScrollBarWidget.hxx
@@ -46,9 +46,6 @@ class ScrollBarWidget : public Widget, public CommandSender
     virtual void handleMouseEntered(int button);
     virtual void handleMouseLeft(int button);
 
-    // FIXME - this should be private, but then we also have to add accessors
-    // for _numEntries, _entriesPerPage and _currentPos. This again leads to the question:
-    // should these accessors force a redraw?
     void recalc();
 
     static void setWheelLines(int lines) { _WHEEL_LINES = lines; }
diff --git a/src/macosx/OSystemMACOSX.cxx b/src/macosx/OSystemMACOSX.cxx
index d471a2051..4e448e235 100644
--- a/src/macosx/OSystemMACOSX.cxx
+++ b/src/macosx/OSystemMACOSX.cxx
@@ -85,10 +85,10 @@ void macOSXSendMenuEvent(int event)
 OSystemMACOSX::OSystemMACOSX()
   : OSystem()
 {
-  setBaseDir("~/.stella");
+  setBaseDir("~/Library/Application Support/Stella");
 
   // This will be overridden, as OSX uses plist files for settings
-  setConfigFile("~/.stella/stellarc");
+  setConfigFile("~/Library/Application Support/Stella/stellarc");
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -