Daemon: small changes in return values
CLI: update TODO