diff --git a/ChangeLog b/ChangeLog
index 4eec0b5d0..4d2ddd956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-22  Lyndon Tremblay  <humasect@home.com>
+
+	* Source/NSBundleAdditions.m ([NSBundle +loadNibFile:externalNameTable:withZone:]):
+	access NSOwner from infoDict only when necessary, notify of loading nib.
+	* Model/GMAppKit.m: Removed silly emacs C++ mode tag.
+	* Model/IMLoading.m: Likewise.
+
 2000-09-19 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSTextStorage.m: ([-string]) fix to return autoreleased
diff --git a/Model/GMAppKit.m b/Model/GMAppKit.m
index 600b750fb..c6af95c78 100644
--- a/Model/GMAppKit.m
+++ b/Model/GMAppKit.m
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
    GMAppKit.m
 
    Copyright (C) 1996 Free Software Foundation, Inc.
diff --git a/Model/IMLoading.m b/Model/IMLoading.m
index 307a75088..875c2eb8a 100644
--- a/Model/IMLoading.m
+++ b/Model/IMLoading.m
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
    IMLoading.m
 
    Copyright (C) 1996 Free Software Foundation, Inc.
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 6ea15472f..298bff7db 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -203,7 +203,6 @@
 {
   BOOL		loaded = NO;
   NSUnarchiver	*unarchiver = nil;
-  id            owner = [context objectForKey: @"NSOwner"];
   NSString      *ext = [fileName pathExtension];
   
 
@@ -212,9 +211,10 @@
   if([ext isEqualToString: @"gmodel"])
     {
       return [GMModel loadIMFile: fileName
-		      owner: owner];
+		      owner: [context objectForKey: @"NSOwner"]];
     } 
 
+  NSLog(@"Loading Nib `%@'...\n", fileName);
   NS_DURING
     {
       NSData	*data = [NSData dataWithContentsOfFile: fileName];
@@ -255,6 +255,10 @@
       TEST_RELEASE(unarchiver);
     }
   NS_ENDHANDLER
+
+  if (!loaded)
+	NSLog(@"Failed to load Nib\n");
+  
   return loaded;
 }