Various improvements
Working on client/server heartbeat