Corrected subset assignment

corrected subset assignment, tweaked convergence tolerances.