Openmp branch updates