add fixes to server and client. now they work together