small changes to server and client sides