Client tweeks

Client tweeks implemented as outlined in https://discoverygarden.atlassian.net/browse/CWRC-42