diff --git a/ChangeLog b/ChangeLog
index b8d5f8604..65da62fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-29 00:58 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSApplication.m: Correction for bug#16688.
+	* Source/NSDocumentController.m: Changed comment for currentDirectory.
+	* Source/NSDocument.m: Removed "FIXME" since it is inaccurate.
+	The signature of the method is the same as in the documentation.
+
 2006-05-27  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSView.m (-discardCursorRects, -removeCursorRect:cursor:) 
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 80c9afe5c..cde51561e 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -1837,7 +1837,10 @@ See -runModalForWindow:
 	  for (i = 0; i < count; i++)
 	    {
 	      NSWindow	*window = [window_list objectAtIndex: i];
-
+	      
+	      if ([window isVisible] == NO)
+		continue;
+	      
 	      if ([window performKeyEquivalent: theEvent] == YES)
 		break;
 	    }
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 2e6357d70..2a6cd0514 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -207,7 +207,11 @@
   _window = aWindow;
 }
 
-//FIXME: In the later specification this method has a different return type!! 
+/**
+ * Creates the window controllers for the current document.  Calls
+ * addWindowController: on the receiver to add them to the controller 
+ * array.
+ */
 - (void) makeWindowControllers
 {
   NSString *name = [self windowNibName];
diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m
index 1ad6b1bda..060b826b7 100644
--- a/Source/NSDocumentController.m
+++ b/Source/NSDocumentController.m
@@ -601,13 +601,14 @@ static NSDictionary *TypeInfoForName (NSArray *types, NSString *typeName)
 		 [[NSApplication sharedApplication] mainWindow]];
 }
 
-/** Returns the current directory. This method first checks if there
-    is a current document using the -currentDocument method. If this
-    returns a document and the document has a filename, this method
-    returns the directory this file is located in. Otherwise it
-    returns the directory of the most recently opened document or
-    the user's home directory if no document has been opened before.
-*/
+/** 
+ * Returns the current directory. This method first checks if there
+ * is a current document using the -currentDocument method. If this
+ * returns a document and the document has a filename, this method
+ * returns the directory this file is located in. Otherwise it
+ * returns the directory of the most recently opened document or
+ * the user's home directory if no document has been opened before.
+ */
 - (NSString *) currentDirectory
 {
   NSFileManager *manager = [NSFileManager defaultManager];