More improvements to client
Updating client.py