Bug fixes and updated to the sample client.