added combine_ranking, corrected scoring system