improved date handling, defaults to timestamp