Woring with new client class and minor bug corrections