Fix dates and add more data