Index: trunk/src/lib/lang/base_object.cc
===================================================================
--- trunk/src/lib/lang/base_object.cc	(revision 5110)
+++ trunk/src/lib/lang/base_object.cc	(revision 5111)
@@ -52,5 +52,5 @@
   //  delete []this->className;
   if (this->objectName)
-    delete[] this->objectName;}
+    delete []this->objectName;}
 
 /**
@@ -84,5 +84,5 @@
 {
   if (this->objectName)
-    delete[] this->objectName;
+    delete []this->objectName;
   if (objectName)
   {
Index: trunk/src/lib/lang/base_object.h
===================================================================
--- trunk/src/lib/lang/base_object.h	(revision 5110)
+++ trunk/src/lib/lang/base_object.h	(revision 5111)
@@ -27,5 +27,5 @@
 
   void setName (const char* newName);
-  /** returns the Name of this Object */
+  /** \brief returns the Name of this Object */
   inline const char* getName ()const { return this->objectName; };
 
Index: trunk/src/lib/lang/class_list.cc
===================================================================
--- trunk/src/lib/lang/class_list.cc	(revision 5110)
+++ trunk/src/lib/lang/class_list.cc	(revision 5111)
@@ -48,9 +48,4 @@
 {
   delete this->objectList;
-  if(ClassList::classList != NULL)
-  {
-    delete ClassList::classList;
-    ClassList::classList = NULL;
-  }
   --ClassList::classCount;
 }
@@ -61,7 +56,4 @@
 //! the Count of classes
 unsigned int ClassList::classCount = 0;
-
-//! a List of all strings of all classes, that have registered so far.
-tList<const char>* ClassList::classList = NULL;
 
 /**
@@ -117,69 +109,14 @@
 }
 
-/**
- * grabs the names of all Classes, and injects it into a List of const chars
- * @return the generated List
- *
- * This function first looks, if the List has been changed (by the ListSize)
- * befor it changes anything.
- */
-const tList<const char>* ClassList::getClassList()
-{
-  if (unlikely(ClassList::classList != NULL && ClassList::classList->getSize() != ClassList::classCount))
-  {
-    delete ClassList::classList;
-    ClassList::classList = NULL;
-  }
-  if (unlikely(ClassList::classList == NULL))
-    ClassList::classList = new tList<const char>;
-
-  if(likely(ClassList::first != NULL))
+tList<BaseObject>* ClassList::getList(long classID)
+{
+  if(unlikely(ClassList::first == NULL))
+    return NULL;
+  else
   {
     ClassList* tmpCL = ClassList::first;
     while (likely(tmpCL != NULL))
     {
-      ClassList::classList->add(tmpCL->className);
-      tmpCL = tmpCL->next;
-    }
-  }
-  return ClassList::classList;
-}
-
-/**
- * searches for classID and returns the list of Entities
- * @param classID the ID of the class to get the list from
- * @return the List accessed by classID, or NULL if not found
- */
-tList<BaseObject>* ClassList::getList(long classID)
-{
-  if(unlikely(ClassList::first == NULL))
-    return NULL;
-  else
-  {
-    ClassList* tmpCL = ClassList::first;
-    while (likely(tmpCL != NULL))
-    {
       if (unlikely(tmpCL->classID == classID))
-        return tmpCL->objectList;
-      tmpCL = tmpCL->next;
-    }
-  }
-  return NULL;
-}
-
-/**
- * searches for className and returns the list of Entities
- * @param className the name of the class to get the list from
- * @return the List accessed by classID, or NULL if not found
- */tList<BaseObject>* ClassList::getList(const char* className)
-{
-  if(unlikely(ClassList::first == NULL))
-    return NULL;
-  else
-  {
-    ClassList* tmpCL = ClassList::first;
-    while (likely(tmpCL != NULL))
-    {
-      if (unlikely(!strcmp(tmpCL->className, className)))
         return tmpCL->objectList;
       tmpCL = tmpCL->next;
@@ -208,5 +145,5 @@
       {
         tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
-        BaseObject* enumBO = iterator->firstElement();
+        BaseObject* enumBO = iterator->nextElement();
         const char* tmpName;
         while (enumBO != NULL)
@@ -249,5 +186,5 @@
       {
         tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
-        BaseObject* enumBO = iterator->firstElement();
+        BaseObject* enumBO = iterator->nextElement();
         while (enumBO != NULL)
         {
@@ -268,4 +205,5 @@
 }
 
+
 /**
  * prints out a string of all the types this Object matches
@@ -284,46 +222,4 @@
   }
 }
-
-/**
- * converts a ClassID into a string
- * @param classID the ClassID to search for
- * @return a String containing the name of the Class, NULL if the Class was not found
- */
-const char* ClassList::IDToString(ClassID classID)
-{
-  if(likely(ClassList::first != NULL))
-  {
-    ClassList* tmpCL = ClassList::first;
-    while (likely(tmpCL != NULL))
-    {
-      if (tmpCL->classID == classID)
-        return tmpCL->className;
-      tmpCL = tmpCL->next;
-    }
-  }
-  return NULL;
-}
-
-/**
- * converts a String into a ClassID
- * @param className the name of the class to search for
- * @return the ClassID. CL_NULL, if the class was not found.
- */
-long ClassList::StringToID(const char* className)
-{
-  if(likely(ClassList::first != NULL))
-  {
-    ClassList* tmpCL = ClassList::first;
-    while (likely(tmpCL != NULL))
-    {
-      if (!strcasecmp(tmpCL->className, className))
-        return tmpCL->classID;
-      tmpCL = tmpCL->next;
-    }
-  }
-  return CL_NULL;
-}
-
-
 
 /**
@@ -362,5 +258,5 @@
         PRINT(0)("|  Listing Instances:\n");
         tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
-        BaseObject* enumBO = iterator->firstElement();
+        BaseObject* enumBO = iterator->nextElement();
         while (enumBO)
         {
Index: trunk/src/lib/lang/class_list.h
===================================================================
--- trunk/src/lib/lang/class_list.h	(revision 5110)
+++ trunk/src/lib/lang/class_list.h	(revision 5111)
@@ -35,32 +35,25 @@
 
     // STATIC FUNCTIONS
-    static void                     addToClassList(BaseObject* objectPointer, const long& classID, const char* className);
-    static void                     removeFromClassList(BaseObject* objectPointer);
+    static void               addToClassList(BaseObject* objectPointer, const long& classID, const char* className);
+    static void               removeFromClassList(BaseObject* objectPointer);
 
-    static tList<BaseObject>*       getList(long classID = CL_NULL);
-    static tList<BaseObject>*       getList(const char* className);
-    static const tList<const char>* getClassList();
-    static BaseObject*              getObject(const char* name, long classID = CL_NULL);
-    static bool                     exists(const BaseObject* object, long classID = CL_NULL);
+    static tList<BaseObject>* getList(long classID = CL_NULL);
+    static BaseObject*        getObject(const char* name, long classID = CL_NULL);
+    static bool               exists(const BaseObject* object, long classID = CL_NULL);
 
-    static void                     whatIs(const BaseObject* object);
-
-    static const char*              IDToString(ClassID classID = CL_NULL);
-    static long                     StringToID(const char* className);
-    static void                     debug(unsigned int debugLevel = 0, long classID = CL_NULL);
-
+    static void               whatIs(const BaseObject* object);
+    static void debug(unsigned int debugLevel = 0, long classID = CL_NULL);
 
   private:
-    tList<BaseObject>*              objectList;             //!< A list of Objects belonging to this Class
+    tList<BaseObject>*       objectList;             //!< A list of Objects belonging to this Class
 
-    long                            classID;                //!< ClassID stored in this ClassList \see ClassID
-    const char*                     className;              //!< Name of the Class Stored here
+    long                     classID;                //!< ClassID stored in this ClassList \see ClassID
+    const char*              className;              //!< Name of the Class Stored here
 
-    ClassList*                      next;                   //!< Pointer to the next class in the List
+    ClassList*               next;                   //!< Pointer to the next class in the List
 
     // STATIC MEMBERS
-    static ClassList*               first;                  //!< The first Class in the List
-    static tList<const char>*       classList;              //!< a List of all Names of all classes, that have registered so far.
-    static unsigned int             classCount;             //!< The Count of classes that have been registered (should match the lower description)
+    static ClassList*        first;                  //!< The first Class in the List
+    static unsigned int      classCount;             //!< The Count of classes that have been registered (should match the lower description)
 };
 
