FIX OMP FOR; minor details refactor