Change scoring to fix Norway bug, fixes #14