small changes to Solver.toString()