Minor tweaks in server implementation and full client implementation