Fixed Solver indices.

Still need to figure out the source terms.