Removed the counters from the solver and fixed some comments