Fixed increasing number of threads
3 more configurations + minor changes