time formatting is now correct
Merge branch 'time_formatting'