updated solver, now better solutions, abet a bit slower...