improved date format and type