Issue #2: Bugfixes: Client-Server communication