Fix indicator bug and score bug