Updates to the notebooks, modified the solver code