fixed parallelization issues, cleaned up the operator (a bit)