added more comments, changed heartbeat default to 25s