diff --git a/ChangeLog b/ChangeLog
index 2c9171d78..17a2353b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-19 21:18-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSController.m
+	* Source/NSObjectController.m: Remove calls to debug method.
+
 2007-08-19 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSButton.m ([performKeyEquivalent:]): Only test for modal
diff --git a/Source/NSController.m b/Source/NSController.m
index e60e921cc..653fa1ec1 100644
--- a/Source/NSController.m
+++ b/Source/NSController.m
@@ -61,7 +61,6 @@
     {
       if([aDecoder allowsKeyedCoding])
 	{
-	  NSLog(@"%@-%@",self,[aDecoder keyMap]);
 	  ASSIGN(_declared_keys,[aDecoder decodeObjectForKey: @"NSDeclaredKeys"]);
 	}
       else
diff --git a/Source/NSObjectController.m b/Source/NSObjectController.m
index 6e16bc1e7..5cd2dbf62 100644
--- a/Source/NSObjectController.m
+++ b/Source/NSObjectController.m
@@ -45,15 +45,18 @@
 @implementation _NSManagedProxy
 - (id) initWithCoder: (NSCoder *)coder
 {
-  if([coder allowsKeyedCoding])
+  if((self = [super init]) != nil)
     {
-      NSLog(@"%@ - %@",self,[coder keyMap]);
-      ASSIGN(_entity_name_key,[coder decodeObjectForKey: @"NSEntityName"]);
-    }
-  else
-    {
-      ASSIGN(_entity_name_key,[coder decodeObject]);
+      if([coder allowsKeyedCoding])
+	{
+	  ASSIGN(_entity_name_key,[coder decodeObjectForKey: @"NSEntityName"]);
+	}
+      else
+	{
+	  ASSIGN(_entity_name_key,[coder decodeObject]);
+	}
     }
+  return self;
 }
 
 - (void) encodeWithCoder: (NSCoder *)coder
@@ -94,6 +97,7 @@
       [self setContent: content];
       [self setObjectClass: [NSMutableDictionary class]];
       [self setEditable: YES];
+      _managed_proxy = nil;
     }
 
   return self;
@@ -112,35 +116,51 @@
   [super dealloc];
 }
 
-- (void) encodeWithCoder: (NSCoder *)aCoder
+- (void) encodeWithCoder: (NSCoder *)coder
 { 
-  [super encodeWithCoder: aCoder];
-  // TODO
-}
-
-- (id) initWithCoder: (NSCoder *)aDecoder
-{ 
-  self = [super initWithCoder: aDecoder];
-  if ([self automaticallyPreparesContent])
-  {
-    if ([self managedObjectContext] != nil)
-      {
-	[self fetch: aDecoder];  
-      }
-    else 
-      {
-	[self prepareContent];
-      }
-  }
-
-  if([aDecoder allowsKeyedCoding])
+  [super encodeWithCoder: coder];
+  if([coder allowsKeyedCoding])
     {
-      _is_editable = [aDecoder decodeBoolForKey: @"NSEditable"];
-      _automatically_prepares_content = [aDecoder decodeBoolForKey: @"NSAutomaticallyPreparesContent"];
-      ASSIGN(_managed_proxy, [aDecoder decodeObjectForKey: @"_NSManagedProxy"]);
+      [coder encodeBool: _is_editable forKey: @"NSEditable"];
+      [coder encodeBool: _automatically_prepares_content forKey: @"NSAutomaticallyPreparesContent"];
+      [coder encodeObject: _managed_proxy forKey: @"_NSManagedProxy"];
     }
   else
     {
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
+      [coder encodeValueOfObjCType: @encode(BOOL) at: &_automatically_prepares_content];
+      [coder encodeConditionalObject: _managed_proxy];
+    }
+}
+
+- (id) initWithCoder: (NSCoder *)coder
+{ 
+  if((self = [super initWithCoder: coder]) != nil)
+    {
+      if ([self automaticallyPreparesContent])
+	{
+	  if ([self managedObjectContext] != nil)
+	    {
+	      [self fetch: coder];  
+	    }
+	  else 
+	    {
+	      [self prepareContent];
+	    }
+	}
+      
+      if([coder allowsKeyedCoding])
+	{
+	  _is_editable = [coder decodeBoolForKey: @"NSEditable"];
+	  _automatically_prepares_content = [coder decodeBoolForKey: @"NSAutomaticallyPreparesContent"];
+	  ASSIGN(_managed_proxy, [coder decodeObjectForKey: @"_NSManagedProxy"]);
+	}
+      else
+	{
+	  [coder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
+	  [coder decodeValueOfObjCType: @encode(BOOL) at: &_automatically_prepares_content];
+	  ASSIGN(_managed_proxy, [coder decodeObject]);
+	}
     }
 
   return self;