changed CbCli to client
added more dev calls and removed some logging