Updated tools and made openMP switch