Fixed some fields. Added current_year.