master: adding client, fixes to json property names