Switched to solver with corrections.

Old k2 is commented out.
Updated notebooks