clean up the omp code a bit more.

the logic is cleaner. shared variables saved in 'o'.