Merge new parallelism scheme and some other fixes.