updated server and client, there's errors yet