fixed locators and dates.