Fix dates & tidy up