diff --git a/ChangeLog b/ChangeLog
index 1c1d4744..ee580c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-01 05:45 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormCore/GormClassInspector.m: Remove dopy code from _currentClass.
+	* GormCore/GormPrivate.m: Use ASSIGNCOPY in initWithClassName:
+	* Palettes/1Windows/main.m: Removed FIXME, since Gorm shouldn't
+	show the window decoration changes directly.
+
 2005-07-31 19:14 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Palettes/1Windows/main.m: Addition of allocSubstitute method for
diff --git a/GormCore/GormClassInspector.m b/GormCore/GormClassInspector.m
index 5d5b14f0..64f2b3ae 100644
--- a/GormCore/GormClassInspector.m
+++ b/GormCore/GormClassInspector.m
@@ -657,17 +657,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
 
 - (NSString *) _currentClass
 {
-  if(object == nil)
-    {
-      return nil;
-    }
-
-  if([object className] == nil)
-    {
-      return nil;
-    }
-
-  return [NSString stringWithString: [object className]];
+  return [object className];
 }
 
 - (void) handleNotification: (NSNotification *)notification
diff --git a/GormCore/GormPrivate.m b/GormCore/GormPrivate.m
index d5a723d0..143a055a 100644
--- a/GormCore/GormPrivate.m
+++ b/GormCore/GormPrivate.m
@@ -159,8 +159,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (void) setClassName: (NSString *)className
 {
-  RELEASE(theClass);
-  theClass = [className copy];
+  ASSIGNCOPY(theClass, className); 
 }
 
 - (NSImage *) imageForViewer
@@ -187,7 +186,7 @@ static BOOL _isInInterfaceBuilder = NO;
       if([n isKindOfClass: [NSString class]])
 	{
 	  // create a copy.
-	  ASSIGN(name, n);
+	  ASSIGNCOPY(name, n);
 	}
       else
 	{
diff --git a/Palettes/1Windows/main.m b/Palettes/1Windows/main.m
index a5c41271..9f136499 100644
--- a/Palettes/1Windows/main.m
+++ b/Palettes/1Windows/main.m
@@ -282,8 +282,6 @@
       }
  
       [object _setStyleMask: newStyleMask];
-      // FIXME: This doesn't refresh the window decoration. How to do that?
-      // (currently needs manual hide/unhide to update decorations)
       [object display];
    }
   else if (control == colorWell)