corrections to Solver.java