Refactor `evolve`

It's possible the scoping in `evolve` is causing us the possibility of nans. (#31). That being said, the test alterations I've currently looked into seem to massively regress convergence and make the solution stiff. This may actually be required, but even so, nan's are still occurring in this refactor when `norm2` is found to be zero...