Bugfix in Client
Bugfixes in Server
Light refactoring