bug fix and improved time display