diff --git a/ChangeLog b/ChangeLog
index 5c7e6bd2a..b2947f698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-02-04 01:53-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibLoader.m: Correct the message to indicate an issue 
+	loading a nib, not a gorm, file.
+	* Source/GSNibLoading.m: Uncomment the release in the dealloc
+	method.
+	* Source/NSApplication.m: Restrict the icon size to the size of the
+	miniwindow if it's larger, but don't expand it, if it's smaller.
+	* Source/NSLayoutManager.m: -initWithCoder: Initialize when 
+	loading a nib in the same way that we initialize when loading 
+	a gorm file.
+
 2009-02-03 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSCell.m (-_sendActionFrom:): New helper method for
diff --git a/Source/GSNibLoader.m b/Source/GSNibLoader.m
index 97d2f041a..ef95e47f8 100644
--- a/Source/GSNibLoader.m
+++ b/Source/GSNibLoader.m
@@ -137,7 +137,7 @@
       // report a problem if there is one.
       if (loaded == NO)
 	{
-	  NSLog(@"Could not load Gorm file: %@",fileName);
+	  NSLog(@"Could not load Nib file: %@",fileName);
 	}
     }
       
diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m
index c3c1b3213..c739e8a1b 100644
--- a/Source/GSNibLoading.m
+++ b/Source/GSNibLoading.m
@@ -1786,7 +1786,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
   // free other objects.
   RELEASE(_accessibilityConnectors);
-  // RELEASE(_connections);
+  RELEASE(_connections);
   RELEASE(_fontManager);
   RELEASE(_framework);
   RELEASE(_visibleWindows);
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 6305f1e98..7bb017283 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -2133,12 +2133,21 @@ image.</p><p>See Also: -applicationIconImage</p>
   NSEnumerator	*iterator = [[self windows] objectEnumerator];
   NSWindow	*current;
   NSImage	*old_app_icon = _app_icon;
+  NSSize        miniWindowSize = [_app_icon_window frame].size;
+  NSSize        imageSize = [anImage size];
 
   RETAIN(old_app_icon);
   [_app_icon setName: nil];
   [anImage setName: @"NSApplicationIcon"];
   [anImage setScalesWhenResized: YES];
-  [anImage setSize: NSMakeSize(48,48)];
+
+  // restrict size when the icon is larger than the mini window.
+  if(imageSize.width > miniWindowSize.width ||
+     imageSize.height > miniWindowSize.height)
+    {
+      [anImage setSize: miniWindowSize];
+    }
+
   ASSIGN(_app_icon, anImage);
 
   [_main_menu _organizeMenu];	// Let horizontal menu change icon
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index 064334198..69abad623 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -2292,11 +2292,12 @@ no_soft_invalidation:
 
   if ([aDecoder allowsKeyedCoding])
     {
+      /*
       int i;
-      id delegate = [aDecoder decodeObjectForKey: @"NSDelegate"];
       int flags;
       NSArray *array = [aDecoder decodeObjectForKey: @"NSTextContainers"];
       NSTextStorage *storage = [aDecoder decodeObjectForKey: @"NSTextStorage"];
+      id delegate = [aDecoder decodeObjectForKey: @"NSDelegate"];
       
       if ([aDecoder containsValueForKey: @"NSLMFlags"])
         {
@@ -2311,7 +2312,7 @@ no_soft_invalidation:
         { 
 	  [self addTextContainer: [array objectAtIndex: i]];
 	}
-
+      */
       return self;
     }
   else