Fixed score state.
Merged stuff