diff --git a/wxPython/wxPython/lib/evtmgr.py b/wxPython/wxPython/lib/evtmgr.py
index ef6fab004d..4ea2795342 100644
--- a/wxPython/wxPython/lib/evtmgr.py
+++ b/wxPython/wxPython/lib/evtmgr.py
@@ -8,7 +8,7 @@
 #
 # Created:     12-December-2002
 # RCS-ID:      $Id$
-# Copyright:   (c) 2002 by Robb Shecter <robb@acm.org>
+# Copyright:   (c) 2003 by db-X Corporation
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------
 
@@ -32,7 +32,6 @@ programmer to declare or track control ids or parent containers:
 
 This module is Python 2.1+ compatible.
 
-Author: Robb Shecter
 """
 from wxPython import wx
 import pubsub
@@ -176,7 +175,7 @@ class EventManager:
         Return a dictionary with data about my state.
         """
         stats = {}
-        stats['Adapters: Message'] = reduce(lambda x,y: x+y, map(len, self.messageAdapterDict.values()))
+        stats['Adapters: Message'] = reduce(lambda x,y: x+y, [0] + map(len, self.messageAdapterDict.values()))
         stats['Adapters: Event']   = len(self.eventAdapterDict)
         stats['Topics: Total']     = len(self.__getTopics())
         stats['Topics: Dead']      = len(self.GetDeadTopics())
@@ -193,7 +192,7 @@ class EventManager:
         is a problem.
         """
         for topic in self.GetDeadTopics():
-            self.DeregisterTopic(topic)
+            self.__deregisterTopic(topic)
 
 
     def GetDeadTopics(self):
diff --git a/wxPython/wxPython/lib/mixins/rubberband.py b/wxPython/wxPython/lib/mixins/rubberband.py
index 19f7a82a1f..678282d810 100644
--- a/wxPython/wxPython/lib/mixins/rubberband.py
+++ b/wxPython/wxPython/lib/mixins/rubberband.py
@@ -1,10 +1,17 @@
+#---------------------------------------------------------------------------
+# Name:        wxPython.lib.mixins.rubberband
+# Purpose:     A mixin class for doing "RubberBand"-ing on a window.
+#
+# Author:      Robb Shecter and members of wxPython-users
+#
+# Created:     11-September-2002
+# RCS-ID:      $Id$
+# Copyright:   (c) 2002 by db-X Corporation
+# Licence:     wxWindows license
+#---------------------------------------------------------------------------
+
 """
 A mixin class for doing "RubberBand"-ing on a window.
-
-by "Robb Shecter" <rs@onsitetech.com>
-
-$Id$
-
 """
 
 from wxPython.wx import *
diff --git a/wxPython/wxPython/lib/pubsub.py b/wxPython/wxPython/lib/pubsub.py
index c2b6968094..6efa12c378 100644
--- a/wxPython/wxPython/lib/pubsub.py
+++ b/wxPython/wxPython/lib/pubsub.py
@@ -6,7 +6,7 @@
 #
 # Created:     12-December-2002
 # RCS-ID:      $Id$
-# Copyright:   (c) 2002 by Robb Shecter <robb@acm.org>
+# Copyright:   (c) 2002 by db-X Corporation
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------
 """