Fixed order of convergence check, and removed some out-of-date comments