small changes to Solver.main()