fixed some more issues with the solver.