Improved implementation of iteration formulas.
Updated definition of c to allow for sigma_s = sigma_t