Updated convergence criteria and added in Hammad's io changes