Solver changes and Pi printing changes