fixed the dates and some other issues