diff --git a/ChangeLog b/ChangeLog
index 86f6a27b1..1188a21d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-11 01:50-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibCompatibility.m: Assign copies of the parameters to
+	setClassName: and setExtension:.
+	* Source/NSActionCell.m: Encode contro view, since it may be needed
+	by IB in encodeWithCoder:
+	* Source/NSButtonCell.m: Unarchive controlview for debugging purposes
+	in initWithCoder:
+	* Source/NSCell.m: Addecomment.
+
 2006-08-10  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSControl.m (mouseDown:): Simplified code to no longer
diff --git a/Source/GSNibCompatibility.m b/Source/GSNibCompatibility.m
index 54ce0081d..079557be9 100644
--- a/Source/GSNibCompatibility.m
+++ b/Source/GSNibCompatibility.m
@@ -582,7 +582,7 @@ static BOOL _isInInterfaceBuilder = NO;
 @implementation NSCustomObject
 - (void) setClassName: (NSString *)name
 {
-  ASSIGN(_className, name);
+  ASSIGNCOPY(_className, name);
 }
 
 - (NSString *)className
@@ -592,7 +592,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) setExtension: (NSString *)name
 {
-  ASSIGN(_extension, name);
+  ASSIGNCOPY(_extension, name);
 }
 
 - (NSString *)extension
@@ -672,7 +672,7 @@ static BOOL _isInInterfaceBuilder = NO;
 @implementation NSCustomView
 - (void) setClassName: (NSString *)name
 {
-  ASSIGN(_className, name);
+  ASSIGNCOPY(_className, name);
 }
 
 - (NSString *)className
@@ -681,7 +681,7 @@ static BOOL _isInInterfaceBuilder = NO;
 }
 - (void) setExtension: (NSString *)ext;
 {
-  ASSIGN(_extension, ext);
+  ASSIGNCOPY(_extension, ext);
 }
 
 - (NSString *)extension
@@ -728,7 +728,8 @@ static BOOL _isInInterfaceBuilder = NO;
     {
       if([coder allowsKeyedCoding])
 	{
-	  _className = [coder decodeObjectForKey: @"NSClassName"];
+	  ASSIGN(_className, [coder decodeObjectForKey: @"NSClassName"]);
+	  ASSIGN(_extension, [coder decodeObjectForKey: @"NSExtension"]);
 	}
       else
 	{
@@ -742,9 +743,11 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) encodeWithCoder: (NSCoder *)coder
 {
+  [super encodeWithCoder: coder];
   if([coder allowsKeyedCoding])
     {
-      [coder encodeObject: (id)_className forKey: @"NSClassName"];
+      [coder encodeObject: _className forKey: @"NSClassName"];
+      [coder encodeObject: _extension forKey: @"NSExtension"];
     }
   else
     {
@@ -758,7 +761,7 @@ static BOOL _isInInterfaceBuilder = NO;
 @implementation NSCustomResource
 - (void) setClassName: (NSString *)className
 {
-  ASSIGN(_className, className);
+  ASSIGNCOPY(_className, className);
 }
 
 - (NSString *)className
@@ -768,7 +771,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) setResourceName: (NSString *)resourceName
 {
-  ASSIGN(_resourceName, resourceName);
+  ASSIGNCOPY(_resourceName, resourceName);
 }
 
 - (NSString *)resourceName
@@ -893,7 +896,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) setClassName: (NSString *)className
 {
-  ASSIGN(_className, className);
+  ASSIGNCOPY(_className, className);
 }
 
 - (NSString *)className
@@ -903,7 +906,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) setOriginalClassName: (NSString *)className
 {
-  ASSIGN(_originalClassName, className);
+  ASSIGNCOPY(_originalClassName, className);
 }
 
 - (NSString *)originalClassName
@@ -990,9 +993,8 @@ static BOOL _isInInterfaceBuilder = NO;
 {
   if([coder allowsKeyedCoding])
     {
-      NSString *originalClassName = NSStringFromClass(_template);
-      [coder encodeObject: (id)_className forKey: @"NSClassName"];
-      [coder encodeObject: (id)originalClassName forKey: @"NSOriginalClassName"];
+      [coder encodeObject: _originalClassName forKey: @"NSOriginalClassName"];
+      [coder encodeObject: _className forKey: @"NSClassName"];
       [_template encodeWithCoder: coder]; // encode the actual object;
     }
   else
@@ -1222,8 +1224,8 @@ static BOOL _isInInterfaceBuilder = NO;
       [coder encodeObject: (id) oidsKeys forKey: @"NSOidsKeys"];
       [coder encodeObject: (id) oidsValues forKey: @"NSOidsValues"];
       [coder encodeObject: (id) _connections forKey: @"NSConnections"];
-      [coder encodeConditionalObject: (id) _fontManager forKey: @"NSFontManager"];
-      [coder encodeConditionalObject: (id) _framework forKey: @"NSFramework"];
+      [coder encodeObject: (id) _fontManager forKey: @"NSFontManager"];
+      [coder encodeObject: (id) _framework forKey: @"NSFramework"];
       [coder encodeObject: (id) _visibleWindows forKey: @"NSVisibleWindows"];
       [coder encodeInt: _nextOid forKey: @"NSNextOid"];
       [coder encodeConditionalObject: (id) _root forKey: @"NSRoot"];
diff --git a/Source/NSActionCell.m b/Source/NSActionCell.m
index 7c8489470..f9ad4020b 100644
--- a/Source/NSActionCell.m
+++ b/Source/NSActionCell.m
@@ -290,6 +290,7 @@ static Class controlClass;
       [aCoder encodeInt: [self tag] forKey: @"NSTag"];
       [aCoder encodeObject: [self target] forKey: @"NSTarget"];
       [aCoder encodeObject: NSStringFromSelector([self action]) forKey: @"NSAction"];
+      [aCoder encodeObject: _control_view forKey: @"NSControlView"];
     }
   else
     {
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index b08223065..cf0d3e747 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -1520,7 +1520,7 @@ typedef struct _GSButtonCellFlags
     {
       int delay = 0;
       int interval = 0;      
-      // NSControl *control = [aDecoder decodeObjectForKey: @"NSControlView"];
+      NSControl *control = [aDecoder decodeObjectForKey: @"NSControlView"];
 
       if ([aDecoder containsValueForKey: @"NSKeyEquivalent"])
         {
diff --git a/Source/NSCell.m b/Source/NSCell.m
index 1c87920a2..516e503b1 100644
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@@ -2184,6 +2184,7 @@ static NSColor	*shadowCol;
       unsigned long cFlags = 0;
       unsigned int cFlags2 = 0;
 
+      // encode contents
       [aCoder encodeObject: _contents forKey: @"NSContents"];
 
       // flags