fixing year and formatting