Fixed scoreing

Scoring and reset has been fixed. Score now reflects equally everywhere
and everything resets properly.