added a few improvement to the client