Adding some points
Some cleanup for the solver