Fixed some time and date display issuses