Changed around in a minor way some of the solver creation stuff