fix attribute handling and date handling.