Added some improvements to the client.