Updated the client to be more user friendly as well as more robust