persister added
minor changes
server/cli_client adapt