style fixes
failing tests, work needed in solvers at least