heartbeat srvice; some changes in CLI