Improvements to the client-server implementation.