fix/Improved score calculations #12