a few files that missed the first add, plus a little reorganization in solvers.py