Fixing dates and formatting