Index: code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h	(revision 8536)
+++ code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h	(revision 8554)
@@ -51,4 +51,5 @@
         Reto Grieder
 
+    @see btBoxShape
     @ingroup Collisionshapes
     */
Index: code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h	(revision 8536)
+++ code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h	(revision 8554)
@@ -49,5 +49,6 @@
         Reto Grieder
 
-    @ingroup Collisionshapes.
+    @see btConeShape
+    @ingroup Collisionshapes
     */
     class _ObjectsExport ConeCollisionShape : public CollisionShape
Index: code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h	(revision 8536)
+++ code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h	(revision 8554)
@@ -51,4 +51,5 @@
         Martin Stypinski
 
+    @see btStaticPlaneShape
     @ingroup Collisionshapes
     */
Index: code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h	(revision 8536)
+++ code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h	(revision 8554)
@@ -49,4 +49,5 @@
         Reto Grieder
 
+    @see btSphereShape
     @ingroup Collisionshapes
     */
Index: code/branches/pickup/src/modules/pickup/PickupPrereqs.h
===================================================================
--- code/branches/pickup/src/modules/pickup/PickupPrereqs.h	(revision 8536)
+++ code/branches/pickup/src/modules/pickup/PickupPrereqs.h	(revision 8554)
@@ -82,5 +82,5 @@
     class SpeedPickup;
     class ShieldPickup;
-	class ShrinkPickup;
+    class ShrinkPickup;
 
 }
Index: code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc	(revision 8536)
+++ code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc	(revision 8554)
@@ -51,5 +51,5 @@
     CreateFactory(ShrinkPickup);
 
-		/**
+        /**
     @brief
         Constructor: Initializes the Pickup.
@@ -60,4 +60,7 @@
 
         this->initialize();
+        this->shrinkFactor_ = 5.0;
+        this->shrinkSpeed_ = 5.0;
+        this->duration_ = 5.0;
         isActive_ = false;
         isTerminating_ = false;
@@ -92,5 +95,5 @@
    /**
     @brief
-        Method for creating a HealthPickup object through XML.
+        Method for creating a ShrinkhPickup object through XML.
     */
     void ShrinkPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
@@ -143,5 +146,5 @@
     }
 
-		/**
+    /**
     @brief
         Prepares for shrinking (collecting several informations).
@@ -153,11 +156,11 @@
         if(this->isUsed())
         {
-            this->pawn = this->carrierToPawnHelper();
-            if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+            this->pawn_ = this->carrierToPawnHelper();
+            if(pawn_ == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                 this->Pickupable::destroy();
 
             //Collect scaling information.
-            defaultScale_ = this->pawn->getScale3D();
-            defaultMass_ = this->pawn->getMass();
+            defaultScale_ = this->pawn_->getScale3D();
+            defaultMass_ = this->pawn_->getMass();
 
             smallScale_ = defaultScale_ / shrinkFactor_;
@@ -167,12 +170,12 @@
             actualMass_ = defaultMass_;
 
-            cameraPositions_ = this->pawn->getCameraPositions();
+            cameraPositions_ = this->pawn_->getCameraPositions();
             size_ = cameraPositions_.size();
             isActive_ = true;    //start shrinking now.
-            durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
+            durationTimer_.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
         }
     }
 
-	/**
+    /**
     @brief
         Updates the scales of the ship.
@@ -189,10 +192,10 @@
             actualMass_ /= factor_;
 
-            this->pawn->setScale3D(actualScale_);
-            this->pawn->setMass(actualMass_);
+            this->pawn_->setScale3D(actualScale_);
+            this->pawn_->setMass(actualMass_);
 
             for(int index = 0; index < size_; index++)
             {
-                CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
+                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
                 if(cameraPos_ == NULL)
                 continue;
@@ -209,10 +212,10 @@
             actualMass_ *= factor_;
 
-            this->pawn->setScale3D(actualScale_);
-            this->pawn->setMass(actualMass_);
+            this->pawn_->setScale3D(actualScale_);
+            this->pawn_->setMass(actualMass_);
 
             for(int index = 0; index < size_; index++)
             {
-                CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
+                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
                 if(cameraPos_ == NULL)
                 continue;
@@ -225,5 +228,5 @@
     }
 
-	/**
+    /**
     @brief
         Initializes the termination.
@@ -244,5 +247,5 @@
     }
 
-	/**
+    /**
     @brief
         Creates a duplicate of the input OrxonoxClass.
Index: code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h
===================================================================
--- code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h	(revision 8536)
+++ code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h	(revision 8554)
@@ -48,5 +48,5 @@
 
     /**
-	@author
+    @author
         Sandro Sgier
 
@@ -101,5 +101,5 @@
         private:
             void initialize(void);
-            float duration_;			//!< determines how long the pickup will be active
+            float duration_;            //!< determines how long the pickup will be active
             float shrinkFactor_;        //shrink factor of the space ship
             float shrinkSpeed_;         //speed of shrinking
@@ -114,8 +114,8 @@
             float defaultMass_;
             float actualMass_;
-            float smallMass_;			
+            float smallMass_;            
             Pawn* carrierToPawnHelper(void);
-            Pawn* pawn;
-            Timer durationTimer;
+            Pawn* pawn_;
+            Timer durationTimer_;
             void terminate(void);
     };
