Fix dates and #3