Fixed problems in server, found problems in client.