Score calculation fix

To merge after show_scores branch merge.

Correct the point calculation function.
same here