Minor fixes
Remove unnecessary stuff
Show correct time - Fix identation issues
Improve omp