Index: code/branches/network3/src/orxonox/Orxonox.cc
===================================================================
--- code/branches/network3/src/orxonox/Orxonox.cc	(revision 1180)
+++ code/branches/network3/src/orxonox/Orxonox.cc	(revision 1184)
@@ -184,6 +184,6 @@
     GraphicsEngine::getSingleton().destroy();
 
-    if (client_g)
-      delete client_g;
+    if (network::Client::getSingleton())
+      network::Client::destroySingleton();
     if (server_g)
       delete server_g;
@@ -281,7 +281,7 @@
     ogre_->setup();
     if(serverIp_.compare("")==0)
-      client_g = new network::Client();
+      client_g = network::Client::createSingleton();
     else
-      client_g = new network::Client(serverIp_, NETWORK_PORT);
+      client_g = network::Client::createSingleton(serverIp_, NETWORK_PORT);
     if(!ogre_->load(this->dataPath_)) abortImmediateForce(/* unable to load */);
   }
@@ -422,5 +422,5 @@
     ib->registerListener(console, &Testconsole::execute, '\n', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
+    ib->registerListener(console, &Testconsole::clear, '�', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
Index: code/branches/network3/src/orxonox/objects/SpaceShip.cc
===================================================================
--- code/branches/network3/src/orxonox/objects/SpaceShip.cc	(revision 1180)
+++ code/branches/network3/src/orxonox/objects/SpaceShip.cc	(revision 1184)
@@ -50,4 +50,5 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
+#include "network/Client.h"
 
 namespace orxonox
@@ -165,4 +166,5 @@
     void SpaceShip::init()
     {
+        createCamera();
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -281,20 +283,25 @@
     void SpaceShip::setCamera(const std::string& camera)
     {
-        Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
-        this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
+      // change camera attributes here, if you want to ;)
+    }
+    
+    void SpaceShip::createCamera(){
+      Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
+      this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
 /*
 //        node->setInheritOrientation(false);
-        cam->setPosition(Vector3(0,50,-150));
-        cam->lookAt(Vector3(0,20,0));
-        cam->roll(Degree(0));
-*/
-
-        cam->setPosition(Vector3(-200,0,35));
+      cam->setPosition(Vector3(0,50,-150));
+      cam->lookAt(Vector3(0,20,0));
+      cam->roll(Degree(0));
+*/
+
+      cam->setPosition(Vector3(-200,0,35));
 //        cam->setPosition(Vector3(0,-350,0));
-        cam->lookAt(Vector3(0,0,35));
-        cam->roll(Degree(-90));
-
-        this->camNode_->attachObject(cam);
-        GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+      cam->lookAt(Vector3(0,0,35));
+      cam->roll(Degree(-90));
+
+      this->camNode_->attachObject(cam);
+      GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+      
     }
 
@@ -427,5 +434,6 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
+        // only do this if not client TODO: remove this hack
+      if (!network::Client::getSingleton() && InputManager::getSingleton().getMouse()->getEventCallback() != this)
         {
             if (InputManager::getSingleton().getMouse())
@@ -526,24 +534,26 @@
         }
 
-        if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
-            this->acceleration_.x = this->translationAcceleration_;
-        else if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
-            this->acceleration_.x = -this->translationAcceleration_;
-        else
-            this->acceleration_.x = 0;
-
-        if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
-            this->acceleration_.y = -this->translationAcceleration_;
-        else if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
-            this->acceleration_.y = this->translationAcceleration_;
-        else
-            this->acceleration_.y = 0;
-
-        if (mKeyboard->isKeyDown(OIS::KC_DELETE) || mKeyboard->isKeyDown(OIS::KC_Q))
-            this->momentum_ = Radian(-this->rotationAccelerationRadian_);
-        else if (mKeyboard->isKeyDown(OIS::KC_PGDOWN) || mKeyboard->isKeyDown(OIS::KC_E))
-            this->momentum_ = Radian(this->rotationAccelerationRadian_);
-        else
-            this->momentum_ = 0;
+        if(!network::Client::getSingleton()){
+          if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
+              this->acceleration_.x = this->translationAcceleration_;
+          else if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
+              this->acceleration_.x = -this->translationAcceleration_;
+          else
+              this->acceleration_.x = 0;
+  
+          if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
+              this->acceleration_.y = -this->translationAcceleration_;
+          else if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
+              this->acceleration_.y = this->translationAcceleration_;
+          else
+              this->acceleration_.y = 0;
+  
+          if (mKeyboard->isKeyDown(OIS::KC_DELETE) || mKeyboard->isKeyDown(OIS::KC_Q))
+              this->momentum_ = Radian(-this->rotationAccelerationRadian_);
+          else if (mKeyboard->isKeyDown(OIS::KC_PGDOWN) || mKeyboard->isKeyDown(OIS::KC_E))
+              this->momentum_ = Radian(this->rotationAccelerationRadian_);
+          else
+              this->momentum_ = 0;
+        }
 
         WorldEntity::tick(dt);
Index: code/branches/network3/src/orxonox/objects/SpaceShip.h
===================================================================
--- code/branches/network3/src/orxonox/objects/SpaceShip.h	(revision 1180)
+++ code/branches/network3/src/orxonox/objects/SpaceShip.h	(revision 1184)
@@ -71,4 +71,5 @@
 
         private:
+            void createCamera();
             static SpaceShip* instance_s;
 
Index: code/branches/network3/src/orxonox/objects/WorldEntity.cc
===================================================================
--- code/branches/network3/src/orxonox/objects/WorldEntity.cc	(revision 1180)
+++ code/branches/network3/src/orxonox/objects/WorldEntity.cc	(revision 1184)
@@ -216,4 +216,8 @@
       registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA);
       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA);
+      
+      registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA);
+      registerVar( (void*) &(this->getScale().y), sizeof(this->getScale().y), network::DATA);
+      registerVar( (void*) &(this->getScale().z), sizeof(this->getScale().z), network::DATA);
     }
 
