fixed some omp raceconditions
merged