added time formating and time/date calculations