fix date and times to be correct