fixed up scoring system