Index: code/trunk/src/libraries/core/CoreIncludes.h
===================================================================
--- code/trunk/src/libraries/core/CoreIncludes.h	(revision 11098)
+++ code/trunk/src/libraries/core/CoreIncludes.h	(revision 11099)
@@ -125,4 +125,6 @@
     @brief Registers the class in the framework with a given Factory.
     @param ClassName The name of the class
+    @param FactoryInstance An instance of a factory that can create the class
+    @param bLoadable Whether the class is allowed to be loaded through XML
 */
 #define RegisterClassWithFactory(ClassName, FactoryInstance, bLoadable) \
@@ -201,8 +203,8 @@
         @note This of course only works with Identifiables.
               The only use is in conjunction with macros that don't know the class type.
-        @param object Pointer to an Identifiable
+        @param p Pointer to an Identifiable
     */
     template <class T>
-    inline Identifier* ClassByObjectType(const T*)
+    inline Identifier* ClassByObjectType(const T* p)
     {
         return ClassIdentifier<T>::getIdentifier();
Index: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	(revision 11098)
+++ code/trunk/src/libraries/core/GUIManager.cc	(revision 11099)
@@ -793,5 +793,30 @@
     }
 
-    /** Executes a CEGUI function normally, but catches CEGUI::ScriptException.
+    /**
+    @copydoc protectedCeguiSystemCall
+    @param function
+        Any callable object/function that takes one parameter.
+    @param object
+        Object to be used as an argument for the @p function
+    @return
+        True if input was handled, false otherwise. A caught exception yields true.
+    */
+    template <typename FunctionType, typename ObjectType>
+    bool GUIManager::protectedCall(FunctionType function, ObjectType object)
+    {
+        try
+        {
+            return function(object);
+        }
+        catch (CEGUI::ScriptException& ex)
+        {
+            // Display the error and proceed. See @remarks why this can be dangerous.
+            orxout(internal_error) << ex.getMessage() << endl;
+            return true;
+        }
+    }
+
+    /**
+        Executes a CEGUI function normally, but catches CEGUI::ScriptException.
         When a ScriptException occurs, the error message will be displayed and
         the program carries on.
@@ -808,19 +833,4 @@
         True if input was handled, false otherwise. A caught exception yields true.
     */
-    template <typename FunctionType, typename ObjectType>
-    bool GUIManager::protectedCall(FunctionType function, ObjectType object)
-    {
-        try
-        {
-            return function(object);
-        }
-        catch (CEGUI::ScriptException& ex)
-        {
-            // Display the error and proceed. See @remarks why this can be dangerous.
-            orxout(internal_error) << ex.getMessage() << endl;
-            return true;
-        }
-    }
-
     template <typename FunctionType>
     bool GUIManager::protectedCeguiSystemCall(FunctionType function)
Index: code/trunk/src/libraries/core/class/IdentifierManager.cc
===================================================================
--- code/trunk/src/libraries/core/class/IdentifierManager.cc	(revision 11098)
+++ code/trunk/src/libraries/core/class/IdentifierManager.cc	(revision 11099)
@@ -255,5 +255,5 @@
     /**
         @brief Returns the Identifier with a given typeid-name.
-        @param name The typeid-name of the wanted Identifier
+        @param typeInfo The type_info of the wanted Identifier
         @return The Identifier
     */
Index: code/trunk/src/libraries/core/command/CommandExecutor.cc
===================================================================
--- code/trunk/src/libraries/core/command/CommandExecutor.cc	(revision 11098)
+++ code/trunk/src/libraries/core/command/CommandExecutor.cc	(revision 11099)
@@ -67,4 +67,5 @@
         @param command A string containing the command
         @param useTcl If true, the command is passed to tcl (see TclBind)
+        @param printErrors If true, print an error when command failed
         @return Returns the error-code (see @ref CommandExecutorErrorCodes "error codes")
     */
Index: code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc
===================================================================
--- code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc	(revision 11098)
+++ code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc	(revision 11099)
@@ -100,4 +100,5 @@
         @brief Prints text to the console.
         @param level_name The name of the output level
+        @param text The text to print
     */
     void orxout_level(const std::string& level_name, const std::string& text)
@@ -119,4 +120,5 @@
         @param level_name The name of the output level
         @param context_name The name of the output context
+        @param text The text to print
     */
     void orxout_level_context(const std::string& level_name, const std::string& context_name, const std::string& text)
Index: code/trunk/src/libraries/core/commandline/CommandLineIncludes.h
===================================================================
--- code/trunk/src/libraries/core/commandline/CommandLineIncludes.h	(revision 11098)
+++ code/trunk/src/libraries/core/commandline/CommandLineIncludes.h	(revision 11099)
@@ -30,5 +30,4 @@
     @defgroup CmdArgs Commandline arguments
     @ingroup Config
-    @brief For a reference of all commandline arguments see @ref cmdargspage
 */
 
Index: code/trunk/src/libraries/core/commandline/CommandLineParser.cc
===================================================================
--- code/trunk/src/libraries/core/commandline/CommandLineParser.cc	(revision 11098)
+++ code/trunk/src/libraries/core/commandline/CommandLineParser.cc	(revision 11099)
@@ -218,6 +218,4 @@
     @param value
         String containing the value
-    @param bParsingFile
-        Parsing a file or the command line itself
     */
     void CommandLineParser::checkFullArgument(const std::string& name, const std::string& value)
@@ -237,6 +235,4 @@
     @param value
         String containing the value
-    @param bParsingFile
-        Parsing a file or the command line itself
     */
     void CommandLineParser::checkShortcut(const std::string& shortcut, const std::string& value)
Index: code/trunk/src/libraries/core/commandline/CommandLineParser.h
===================================================================
--- code/trunk/src/libraries/core/commandline/CommandLineParser.h	(revision 11098)
+++ code/trunk/src/libraries/core/commandline/CommandLineParser.h	(revision 11099)
@@ -26,10 +26,4 @@
  *
  */
-
-/**
-    @defgroup CmdArgs Commandline arguments
-    @ingroup Config
-    @brief For a reference of all commandline arguments see @ref cmdargspage
-*/
 
 /**
Index: code/trunk/src/libraries/core/config/ConfigValueContainer.h
===================================================================
--- code/trunk/src/libraries/core/config/ConfigValueContainer.h	(revision 11098)
+++ code/trunk/src/libraries/core/config/ConfigValueContainer.h	(revision 11099)
@@ -109,5 +109,5 @@
             */
             template <class D, class V>
-            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V&)
+            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const D& defvalue, const V& value)
             {
                 this->init(type, identifier, sectionname, varname);
@@ -125,5 +125,5 @@
             */
             template <class D, class V>
-            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>&)
+            ConfigValueContainer(ConfigFileType::Value type, Identifier* identifier, const std::string& sectionname, const std::string& varname, const std::vector<D>& defvalue, const std::vector<V>& value)
             {
                 this->init(type, identifier, sectionname, varname);
Index: code/trunk/src/libraries/core/object/IteratorBase.h
===================================================================
--- code/trunk/src/libraries/core/object/IteratorBase.h	(revision 11098)
+++ code/trunk/src/libraries/core/object/IteratorBase.h	(revision 11099)
@@ -173,5 +173,5 @@
             /**
                 @brief Increments the Iterator if it points at the given element.
-                @param object The object to compare with
+                @param element The element to compare with
             */
             virtual void removedElement(ObjectListBaseElement* element) override
Index: code/trunk/src/libraries/core/object/ObjectListBase.h
===================================================================
--- code/trunk/src/libraries/core/object/ObjectListBase.h	(revision 11098)
+++ code/trunk/src/libraries/core/object/ObjectListBase.h	(revision 11099)
@@ -55,5 +55,5 @@
             /**
                 @brief Constructor: Creates the list-element with an object.
-                @param objectBase The object to store
+                @param object The object to store
             */
             ObjectListBaseElement(Listable* object) : next_(nullptr), prev_(nullptr), objectBase_(object), list_(nullptr) {}
Index: code/trunk/src/libraries/network/MasterServerComm.h
===================================================================
--- code/trunk/src/libraries/network/MasterServerComm.h	(revision 11098)
+++ code/trunk/src/libraries/network/MasterServerComm.h	(revision 11099)
@@ -88,5 +88,5 @@
       int sendRequest( std::string data );
 
-      /** \param callback The callback function to call with data received.
+      /** \param listener The listener to call with data received.
        *  \param delayms Delay in milliseconds.
        * \return 0 for success, other for error
Index: code/trunk/src/libraries/network/ServerList.h
===================================================================
--- code/trunk/src/libraries/network/ServerList.h	(revision 11098)
+++ code/trunk/src/libraries/network/ServerList.h	(revision 11099)
@@ -74,4 +74,5 @@
       /* BASIC MANIPULATION */
       /** \param toadd the server to add.
+       *  \param peer the peer
        *
        * Add server to the game server list
Index: code/trunk/src/libraries/tools/BulletDebugDrawer.cc
===================================================================
--- code/trunk/src/libraries/tools/BulletDebugDrawer.cc	(revision 11098)
+++ code/trunk/src/libraries/tools/BulletDebugDrawer.cc	(revision 11099)
@@ -1,3 +1,4 @@
 /**
+ * @file BulletDebugDrawer.cc
  * Originally from http://www.ogre3d.org/tikiwiki/BulletDebugDrawer&structure=Cookbook
  * This source code is released into the Public Domain.
Index: code/trunk/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/trunk/src/libraries/tools/BulletDebugDrawer.h	(revision 11098)
+++ code/trunk/src/libraries/tools/BulletDebugDrawer.h	(revision 11099)
@@ -1,9 +1,2 @@
-/**
- * Originally from http://www.ogre3d.org/tikiwiki/BulletDebugDrawer&structure=Cookbook
- * This source code is released into the Public Domain.
- *
- * Modified by Fabian 'x3n' Landau by using DebugDrawer and Orxonox specific utilities (e.g. output).
- */
-
 #ifndef _BulletDebugDrawer_H__
 #define _BulletDebugDrawer_H__
@@ -18,4 +11,10 @@
 namespace orxonox
 {
+    /**
+    * Originally from http://www.ogre3d.org/tikiwiki/BulletDebugDrawer&structure=Cookbook
+    * This source code is released into the Public Domain.
+    *
+    * Modified by Fabian 'x3n' Landau by using DebugDrawer and Orxonox specific utilities (e.g. output).
+    */
     class _ToolsExport BulletDebugDrawer : public btIDebugDraw, public Ogre::FrameListener
     {
Index: code/trunk/src/libraries/tools/DebugDrawer.cc
===================================================================
--- code/trunk/src/libraries/tools/DebugDrawer.cc	(revision 11098)
+++ code/trunk/src/libraries/tools/DebugDrawer.cc	(revision 11099)
@@ -1,3 +1,4 @@
 /**
+ * @file DebugDrawer.cc
  * Copy-pasted from
  *  - https://bitbucket.org/hasyimi/ogre-debug-drawing-utility/src
Index: code/trunk/src/libraries/tools/DebugDrawer.h
===================================================================
--- code/trunk/src/libraries/tools/DebugDrawer.h	(revision 11098)
+++ code/trunk/src/libraries/tools/DebugDrawer.h	(revision 11099)
@@ -1,3 +1,4 @@
 /**
+ * @file DebugDrawer.h
  * Copy-pasted from
  *  - https://bitbucket.org/hasyimi/ogre-debug-drawing-utility/src
@@ -9,9 +10,5 @@
  */
 
-/**
- * @file
- * @brief DebugDrawer is a utility to draw debug shapes (lines, triangles, spheres) with Ogre.
- * This utility is e.g. used by @ref BulletDebugDrawer to visualize collision shapes and other physical entities.
- */
+
 
 #ifndef _DebugDrawer_H__
@@ -26,4 +23,8 @@
 namespace orxonox
 {
+    /**
+     * @brief DebugDrawer is a utility to draw debug shapes (lines, triangles, spheres) with Ogre.
+     * This utility is e.g. used by @ref orxonox::BulletDebugDrawer to visualize collision shapes and other physical entities.
+     */
     class _ToolsExport DebugDrawer
     {
Index: code/trunk/src/libraries/tools/IcoSphere.cc
===================================================================
--- code/trunk/src/libraries/tools/IcoSphere.cc	(revision 11098)
+++ code/trunk/src/libraries/tools/IcoSphere.cc	(revision 11099)
@@ -1,3 +1,4 @@
 /**
+ * @file IcoSphere.cc
  * Copy-pasted from
  *  - https://bitbucket.org/hasyimi/ogre-debug-drawing-utility/src
Index: code/trunk/src/libraries/tools/IcoSphere.h
===================================================================
--- code/trunk/src/libraries/tools/IcoSphere.h	(revision 11098)
+++ code/trunk/src/libraries/tools/IcoSphere.h	(revision 11099)
@@ -1,17 +1,3 @@
-/**
- * Copy-pasted from
- *  - https://bitbucket.org/hasyimi/ogre-debug-drawing-utility/src
- *  - http://www.ogre3d.org/tikiwiki/tiki-index.php?page=Debug+Drawing+Utility+Class
- *
- * This source code is released into the Public Domain.
- *
- * Modified by Fabian 'x3n' Landau
- */
 
-/**
- * @file
- * @brief DebugDrawer is a utility to draw debug shapes (lines, triangles, spheres) with Ogre.
- * This utility is e.g. used by @ref BulletDebugDrawer to visualize collision shapes and other physical entities.
- */
 
 #ifndef _IcoSphere_H__
@@ -27,4 +13,13 @@
     typedef std::pair<Ogre::Vector3, Ogre::ColourValue> VertexPair;
 
+    /**
+    * Copy-pasted from
+    *  - https://bitbucket.org/hasyimi/ogre-debug-drawing-utility/src
+    *  - http://www.ogre3d.org/tikiwiki/tiki-index.php?page=Debug+Drawing+Utility+Class
+    *
+    * This source code is released into the Public Domain.
+    *
+    * Modified by Fabian 'x3n' Landau
+    */
     class _ToolsExport IcoSphere
     {
Index: code/trunk/src/libraries/tools/OgreBulletUtils.h
===================================================================
--- code/trunk/src/libraries/tools/OgreBulletUtils.h	(revision 11098)
+++ code/trunk/src/libraries/tools/OgreBulletUtils.h	(revision 11099)
@@ -1,3 +1,4 @@
 /**
+ * @file OgreBulletUtils.h
  * Copy-pasted from http://www.ogre3d.org/tikiwiki/BulletDebugDrawer&structure=Cookbook
  * This source code is released into the Public Domain.
Index: code/trunk/src/libraries/util/Clock.h
===================================================================
--- code/trunk/src/libraries/util/Clock.h	(revision 11098)
+++ code/trunk/src/libraries/util/Clock.h	(revision 11099)
@@ -54,5 +54,4 @@
         caveat because it will only capture the time on the same CPU core.
         Confining the main thread to one process could speed up the game.
-        See \ref cmdargspage "Ccommandline Argument" 'limitToCPU' (only on Windows)
     */
     class _UtilExport Clock
Index: code/trunk/src/libraries/util/Math.cc
===================================================================
--- code/trunk/src/libraries/util/Math.cc	(revision 11098)
+++ code/trunk/src/libraries/util/Math.cc	(revision 11099)
@@ -291,9 +291,9 @@
     /**
                 @brief Gets the new vector after a coordinate transformation
-                @param distance Vector which will be transformed
-                @param mydirection New x basevector
-                @param myorthonormal New y basevector
-                @param otherposition New z basevector
-                @return direction in the new coordinates
+                @param totransform Vector which will be transformed
+                @param newx New x basevector
+                @param newy New y basevector
+                @param newz New z basevector
+                @return Vector in the new coordinates
 
                 x is vector in old coordinates
@@ -307,10 +307,10 @@
                 y = T^(-1)*x
             */
-    orxonox::Vector3 getTransformedVector(const orxonox::Vector3& distance, const orxonox::Vector3& mydirection, const orxonox::Vector3& myorthonormal, const orxonox::Vector3& myside)
+    orxonox::Vector3 getTransformedVector(const orxonox::Vector3& totransform, const orxonox::Vector3& newx, const orxonox::Vector3& newy, const orxonox::Vector3& newz)
     {
         // inverse of the transform matrix
-        float determinant = +mydirection.x * (myorthonormal.y*myside.z - myside.y*myorthonormal.z)
-                            -mydirection.y * (myorthonormal.x*myside.z - myorthonormal.z*myside.x)
-                            +mydirection.z * (myorthonormal.x*myside.y - myorthonormal.y*myside.x);
+        float determinant = +newx.x * (newy.y*newz.z - newz.y*newy.z)
+                            -newx.y * (newy.x*newz.z - newy.z*newz.x)
+                            +newx.z * (newy.x*newz.y - newy.y*newz.x);
         float invdet = 1/determinant;
 
@@ -320,19 +320,19 @@
         orxonox::Vector3 zinvtransform;
 
-        xinvtransform.x = (myorthonormal.y * myside.z        - myside.y        * myorthonormal.z)*invdet;
-        xinvtransform.y = (mydirection.z   * myside.y        - mydirection.y   * myside.z       )*invdet;
-        xinvtransform.z = (mydirection.y   * myorthonormal.z - mydirection.z   * myorthonormal.y)*invdet;
-        yinvtransform.x = (myorthonormal.z * myside.x        - myorthonormal.x * myside.z       )*invdet;
-        yinvtransform.y = (mydirection.x   * myside.z        - mydirection.z   * myside.x       )*invdet;
-        yinvtransform.z = (myorthonormal.x * mydirection.z   - mydirection.x   * myorthonormal.z)*invdet;
-        zinvtransform.x = (myorthonormal.x * myside.y        - myside.x        * myorthonormal.y)*invdet;
-        zinvtransform.y = (myside.x        * mydirection.y   - mydirection.x   * myside.y       )*invdet;
-        zinvtransform.z = (mydirection.x   * myorthonormal.y - myorthonormal.x * mydirection.y  )*invdet;
+        xinvtransform.x = (newy.y * newz.z        - newz.y        * newy.z)*invdet;
+        xinvtransform.y = (newx.z   * newz.y        - newx.y   * newz.z       )*invdet;
+        xinvtransform.z = (newx.y   * newy.z - newx.z   * newy.y)*invdet;
+        yinvtransform.x = (newy.z * newz.x        - newy.x * newz.z       )*invdet;
+        yinvtransform.y = (newx.x   * newz.z        - newx.z   * newz.x       )*invdet;
+        yinvtransform.z = (newy.x * newx.z   - newx.x   * newy.z)*invdet;
+        zinvtransform.x = (newy.x * newz.y        - newz.x        * newy.y)*invdet;
+        zinvtransform.y = (newz.x        * newx.y   - newx.x   * newz.y       )*invdet;
+        zinvtransform.z = (newx.x   * newy.y - newy.x * newx.y  )*invdet;
 
         // coordinate transformation
         orxonox::Vector3 distanceShip;
-        distanceShip.x = xinvtransform.x * distance.x + yinvtransform.x * distance.y + zinvtransform.x * distance.z;
-        distanceShip.y = xinvtransform.y * distance.x + yinvtransform.y * distance.y + zinvtransform.y * distance.z;
-        distanceShip.z = xinvtransform.z * distance.x + yinvtransform.z * distance.y + zinvtransform.z * distance.z;
+        distanceShip.x = xinvtransform.x * totransform.x + yinvtransform.x * totransform.y + zinvtransform.x * totransform.z;
+        distanceShip.y = xinvtransform.y * totransform.x + yinvtransform.y * totransform.y + zinvtransform.y * totransform.z;
+        distanceShip.z = xinvtransform.z * totransform.x + yinvtransform.z * totransform.y + zinvtransform.z * totransform.z;
 
         return distanceShip;
