bootstrap for solver, little bugfixes