more comments / cleanup (Solvers still left)