Fix heartbeat, and add playerStates