added date/datetime formatting