some tweaks to dates and times