back to scala ForkJoin, plus some fixes