fixed Solver in Ex-4.2; cleanup