scoring updating
score updates
fixed merge