Tidied up client code, fixed cid propagation issues
oops remove pprint