Index: orxonox/trunk/src/proto/proto_class.cc
===================================================================
--- orxonox/trunk/src/proto/proto_class.cc	(revision 4744)
+++ orxonox/trunk/src/proto/proto_class.cc	(revision 4838)
@@ -22,6 +22,6 @@
 
 /**
-   \brief standard constructor
-   \todo this constructor is not jet implemented - do it
+ * standard constructor
+ * @todo this constructor is not jet implemented - do it
 */
 ProtoClass::ProtoClass ()
@@ -43,6 +43,5 @@
 
 /**
-   \brief standard deconstructor
-
+ * standard deconstructor
 */
 ProtoClass::~ProtoClass ()
Index: orxonox/trunk/src/proto/proto_class.h
===================================================================
--- orxonox/trunk/src/proto/proto_class.h	(revision 4744)
+++ orxonox/trunk/src/proto/proto_class.h	(revision 4838)
@@ -1,6 +1,5 @@
-/*! 
-    \file proto_class.h
-    \brief Definition of ...
-
+/*!
+ * @file proto_class.h
+ * @brief Definition of ...
 */
 
@@ -10,5 +9,5 @@
 #include "base_object.h"
 
-// FORWARD DEFINITION
+// FORWARD DECLARATION
 
 
Index: orxonox/trunk/src/proto/proto_singleton.cc
===================================================================
--- orxonox/trunk/src/proto/proto_singleton.cc	(revision 4744)
+++ orxonox/trunk/src/proto/proto_singleton.cc	(revision 4838)
@@ -22,6 +22,6 @@
 
 /**
-   \brief standard constructor
-*/
+ * standard constructor
+ */
 ProtoSingleton::ProtoSingleton ()
 {
@@ -42,15 +42,13 @@
 
 /**
-   \brief the singleton reference to this class
-*/
+ *  the singleton reference to this class
+ */
 ProtoSingleton* ProtoSingleton::singletonRef = NULL;
 
 /**
-   \brief standard deconstructor
-
-*/
+   @brief standard deconstructor
+ */
 ProtoSingleton::~ProtoSingleton ()
 {
   ProtoSingleton::singletonRef = NULL;
-
 }
Index: orxonox/trunk/src/proto/proto_singleton.h
===================================================================
--- orxonox/trunk/src/proto/proto_singleton.h	(revision 4744)
+++ orxonox/trunk/src/proto/proto_singleton.h	(revision 4838)
@@ -1,6 +1,5 @@
-/*! 
-    \file proto_singleton.h
-    \brief Definition of the ... singleton Class
-    
+/*!
+ * @file proto_singleton.h
+ * @brief Definition of the ... singleton Class
 */
 
@@ -17,5 +16,5 @@
  public:
   virtual ~ProtoSingleton(void);
-  /** \returns a Pointer to the only object of this Class */
+  /** @returns a Pointer to the only object of this Class */
   inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };
 
Index: orxonox/trunk/src/proto/proto_world_entity.cc
===================================================================
--- orxonox/trunk/src/proto/proto_world_entity.cc	(revision 4744)
+++ orxonox/trunk/src/proto/proto_world_entity.cc	(revision 4838)
@@ -1,3 +1,3 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -22,28 +22,21 @@
 using namespace std;
 
-/**
-   \brief standard constructor
-
-*/
-ProtoWorldEntity::ProtoWorldEntity () 
-{
-  this->init();
-}
 
 /**
-   \brief constructs and loads a ProtoWorldEntity from a XML-element
-   \param root the XML-element to load from
-*/
+ * constructs and loads a ProtoWorldEntity from a XML-element
+ * @param root the XML-element to load from
+ */
 ProtoWorldEntity::ProtoWorldEntity(const TiXmlElement* root)
 {
   this->init();
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }
 
 
 /**
-   \brief standard deconstructor
-*/
-ProtoWorldEntity::~ProtoWorldEntity () 
+ * standard deconstructor
+ */
+ProtoWorldEntity::~ProtoWorldEntity ()
 {
 
@@ -51,17 +44,21 @@
 
 /**
-   \brief initializes the ProtoWorldEntity
-*/
+ * initializes the ProtoWorldEntity
+ * @todo change this to what you wish
+ */
 void ProtoWorldEntity::init(void)
 {
+  this->setClassID(CL_PROTO_WORLD_ENTITY, )
   ...
 }
 
 /**
-   \brief loads a ProtoWorldEntity from a XML-element
-   \param root the XML-element to load from
-*/
+ * loads a ProtoWorldEntity from a XML-element
+ * @param root the XML-element to load from
+ * @todo make the class Loadable
+ */
 void ProtoWorldEntity::loadParams(const TiXmlElement* root)
 {
+  // all the clases this Entity is directly derived from must be called in this way, to load all settings.
   static_cast<WorldEntity*>(this)->loadParam(root);
 
@@ -71,7 +68,7 @@
 
 /**
-   \brief advances the ProtoWorldEntity about time seconds
-   \param time the Time to step
-*/
+ * advances the ProtoWorldEntity about time seconds
+ * @param time the Time to step
+ */
 ProtoWorldEntity::tick(float time)
 {
@@ -80,16 +77,16 @@
 
 /**
-   \brief draws this worldEntity
-*/
+ * draws this worldEntity
+ */
 void ProtoWorldEntity::draw ()
-{ 
+{
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
   float matrix[4][4];
-  
+
   /* translate */
-  glTranslatef (this->getAbsCoor ().x, 
-		this->getAbsCoor ().y, 
-		this->getAbsCoor ().z);
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
   /* rotate */
   this->getAbsDir().matrix(matrix);
Index: orxonox/trunk/src/proto/proto_world_entity.h
===================================================================
--- orxonox/trunk/src/proto/proto_world_entity.h	(revision 4744)
+++ orxonox/trunk/src/proto/proto_world_entity.h	(revision 4838)
@@ -1,6 +1,5 @@
-/*! 
-    \file proto_world_entity.h
-
-    description
+/*!
+ * @file proto_world_entity.h
+ * @brief description
 */
 
@@ -11,15 +10,14 @@
 
 //! A Class to ...
-class ProtoWorldEntity : public WorldEntity 
+class ProtoWorldEntity : public WorldEntity
 {
 
  public:
-  ProtoWorldEntity();
-  ProtoWorldEntity(const TiXmlElement* root);
+  ProtoWorldEntity(const TiXmlElement* root = NULL);
   virtual ~ProtoWorldEntity();
-  
+
   void loadParams(const TiXmlElement* root);
   void init();
-  
+
   virtual void draw();
   virtual void tick(float time);
