simplified direct_indiv rankings and standardized some naming