Index: orxonox/trunk/src/lib/lang/class_list.cc
===================================================================
--- orxonox/trunk/src/lib/lang/class_list.cc	(revision 4747)
+++ orxonox/trunk/src/lib/lang/class_list.cc	(revision 4748)
@@ -21,4 +21,6 @@
 #include "compiler.h"
 #include "debug.h"
+#include <string.h>
+#include <math.h>
 
 using namespace std;
@@ -26,6 +28,5 @@
 
 /**
-   \brief standard constructor
-   \todo this constructor is not jet implemented - do it
+   \brief Creates a new ClassList
 */
 ClassList::ClassList(const long& classID, const char* className)
@@ -35,4 +36,6 @@
   this->className = className;
   this->classID = classID;
+
+  ++ClassList::classCount;
 }
 
@@ -44,12 +47,19 @@
 ClassList::~ClassList ()
 {
-  // delete what has to be deleted here
+  --ClassList::classCount;
 }
 
+//! the first class that is registered
 ClassList*  ClassList::first = NULL;
+
+//! the Count of classes
 unsigned int ClassList::classCount = 0;
 
-
-
+/**
+ * Adds a new Object to the ClassList (and if necessary a new Class)
+ * @param objectPointer Pointer to the Object at hand
+ * @param classID ID of the Given ObjectType \see ClassID
+ * @param className name of the Class to add
+ */
 void ClassList::addToClassList(BaseObject* objectPointer, const long& classID, const char* className)
 {
@@ -78,4 +88,8 @@
 }
 
+/**
+ * removes an Object from a the ClassList
+ * @param objectPointer the Object to delete from the List
+ */
 void ClassList::removeFromClassList(BaseObject* objectPointer)
 {
@@ -92,5 +106,7 @@
 }
 
-
+/**
+ * Print out some very nice debug information
+ */
 void ClassList::debug()
 {
@@ -98,12 +114,22 @@
   PRINT(0)("=  CLASS_LIST   =\n");
   PRINT(0)("=================\n");
+  PRINT(0)("has %d Elements\n\n", ClassList::classCount);
   ClassList* tmp = ClassList::first;
+  char niceString[100];
+  unsigned int lenCount = 0;
+
   while (likely(tmp != NULL))
   {
-    PRINT(0)("CLASS %s has %d instances\n", tmp->className, tmp->objectCount);
+    lenCount = 1;
+    while (pow(10,lenCount) <= tmp->objectCount)
+      ++lenCount;
+    for (int i=0; i < 30-strlen(tmp->className) - lenCount; i++)
+      (niceString[i]) = ' ';
+    niceString[30-strlen(tmp->className) - lenCount] = '\0';
+
+    PRINT(0)("CLASS %s:%s %d instances\n", tmp->className, niceString, tmp->objectCount);
 
     tmp = tmp->next;
   }
   PRINT(0)("==============CL=\n");
-
 }
Index: orxonox/trunk/src/lib/lang/class_list.h
===================================================================
--- orxonox/trunk/src/lib/lang/class_list.h	(revision 4747)
+++ orxonox/trunk/src/lib/lang/class_list.h	(revision 4748)
@@ -36,18 +36,18 @@
     struct ObjectList
     {
-      BaseObject*            pointerToObject;
-      ObjectList*            next;
+      BaseObject*            pointerToObject;        //! Pointer to the Object
+      ObjectList*            next;                   //!< pointer to the next Object in the List
     };
 
-    long                     classID;
-    const char*              className;
+    long                     classID;                //!< ClassID stored in this ClassList \see ClassID
+    const char*              className;              //!< Name of the Class Stored here
 
-    ClassList*               next;
+    ClassList*               next;                   //!< Pointer to the next class in the List
 
-    unsigned int             objectCount;
+    unsigned int             objectCount;            //!< how many Objects of this particular Object have been loaded??
 
 
-    static ClassList*        first;
-    static unsigned int      classCount;
+    static ClassList*        first;                  //!< The first Class in the List (should be BaseObject)
+    static unsigned int      classCount;             //!< The Count of classes that have been registered (should match the lower description)
 
 };
Index: orxonox/trunk/src/orxonox.cc
===================================================================
--- orxonox/trunk/src/orxonox.cc	(revision 4747)
+++ orxonox/trunk/src/orxonox.cc	(revision 4748)
@@ -43,4 +43,6 @@
 #include "cd_engine.h"
 
+#include "class_list.h"
+
 #include <string.h>
 
@@ -81,4 +83,6 @@
   delete TextEngine::getInstance();
   delete EventHandler::getInstance();
+
+  ClassList::debug();
 }
 
