date and number fix