OpenMP Fix and Some Updates