Updated analysis to deal with name permutation in figures, added bootstrap data so they don't need to be rerun