Added some fix bugs (like to digit years, etc.)