some updates and additional options for convergence criteria