fixed date and time stuff