improve graph and score tracking