handle dates and time better