fix Scheduler number of threds, refactor VectorSolution