diff --git a/data/us/legislature/A-Drew-Ferguson-IV-cf441c62-91b4-52f5-b9c7-04a45290e5e4.yml b/data/us/legislature/A-Drew-Ferguson-IV-cf441c62-91b4-52f5-b9c7-04a45290e5e4.yml
index 669ed43e09..f5104cc521 100644
--- a/data/us/legislature/A-Drew-Ferguson-IV-cf441c62-91b4-52f5-b9c7-04a45290e5e4.yml
+++ b/data/us/legislature/A-Drew-Ferguson-IV-cf441c62-91b4-52f5-b9c7-04a45290e5e4.yml
@@ -1,53 +1,55 @@
 id: ocd-person/cf441c62-91b4-52f5-b9c7-04a45290e5e4
-name: A. Drew Ferguson IV
-given_name: A.
+name: Drew Ferguson
+given_name: Drew
 family_name: Ferguson
-middle_name: Drew
-gender: M
 birth_date: 1966-11-15
+gender: Male
+email: https://ferguson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000465.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-3
 offices:
 - classification: capitol
-  address: 2239 Rayburn House Office Building Washington DC 20515-1003
+  address: 2239 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5901
 - classification: district
-  address: 1601 E Hwy 34 Suite B; Newnan, GA 30265
+  address: 1601 E. Highway 34 Suite B, Newnan, GA 30265
   voice: 770-683-2033
-  name: 'District Office #1'
 links:
 - url: https://ferguson.house.gov
   note: website
+- url: https://ferguson.house.gov/
+other_names:
+- name: A. Drew Ferguson
+- name: A. Drew Ferguson IV
+- name: A.D. Ferguson
+- name: D. Ferguson
+- name: Ferguson, D.
 ids:
   twitter: RepDrewFerguson
   youtube: UCuK7_j2sREWi_7wBAN477bg
   facebook: RepDrewFerguson
-other_names:
-- name: A. Drew Ferguson
 other_identifiers:
 - scheme: bioguide
   identifier: F000465
@@ -75,3 +77,10 @@ other_identifiers:
   identifier: Drew Ferguson
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Drew_Ferguson
+- url: https://en.wikipedia.org/wiki/Drew_Ferguson_(politician)
+- url: https://ferguson.house.gov
+- url: https://ferguson.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/biography/168132/drew-ferguson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/drew_ferguson/412700
diff --git a/data/us/legislature/Aaron-Bean-a5212de0-6253-5b67-8473-2b00d1f22da6.yml b/data/us/legislature/Aaron-Bean-a5212de0-6253-5b67-8473-2b00d1f22da6.yml
index a6f450beb6..a31ecf6121 100644
--- a/data/us/legislature/Aaron-Bean-a5212de0-6253-5b67-8473-2b00d1f22da6.yml
+++ b/data/us/legislature/Aaron-Bean-a5212de0-6253-5b67-8473-2b00d1f22da6.yml
@@ -2,31 +2,42 @@ id: ocd-person/a5212de0-6253-5b67-8473-2b00d1f22da6
 name: Aaron Bean
 given_name: Aaron
 family_name: Bean
-middle_name: Paul
-gender: M
 birth_date: 1967-01-25
+gender: Male
+email: https://bean.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B001314.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-4
 offices:
 - classification: capitol
-  address: 1239 Longworth House Office Building Washington DC 20515-0904
+  address: 1239 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-0123
+- classification: district
+  address: '117 W. Duval St., #230, Jacksonville, FL 32202'
+  voice: 904-319-9433
+- classification: district
+  address: 4465-6 U.S. Highway 17, Fleming Island, FL 32003
+  voice: 904-830-3933
+- classification: district
+  address: 501 Centre St. Suite 107, Fernandina Beach, FL 32034
+  voice: 904-557-9550
 links:
 - url: https://bean.house.gov
   note: website
-ids:
-  twitter: RepAaronBean
+- url: https://bean.house.gov/
 other_names:
+- name: A. Bean
+- name: A.P. Bean
 - name: Bean (FL)
+- name: Bean, A.
+ids:
+  twitter: RepAaronBean
 other_identifiers:
 - scheme: bioguide
   identifier: B001314
@@ -44,3 +55,8 @@ other_identifiers:
   identifier: '53932'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Aaron_Bean
+- url: https://bean.house.gov
+- url: https://en.wikipedia.org/wiki/Aaron_Bean
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/bean-aaron-693b179
diff --git a/data/us/legislature/Abigail-Davis-Spanberger-d1b6eea9-e526-593d-b87a-0e926c3f2303.yml b/data/us/legislature/Abigail-Davis-Spanberger-d1b6eea9-e526-593d-b87a-0e926c3f2303.yml
index 8504ff97fd..74f580e974 100644
--- a/data/us/legislature/Abigail-Davis-Spanberger-d1b6eea9-e526-593d-b87a-0e926c3f2303.yml
+++ b/data/us/legislature/Abigail-Davis-Spanberger-d1b6eea9-e526-593d-b87a-0e926c3f2303.yml
@@ -1,46 +1,48 @@
 id: ocd-person/d1b6eea9-e526-593d-b87a-0e926c3f2303
-name: Abigail Davis Spanberger
+name: Abigail Spanberger
 given_name: Abigail
 family_name: Spanberger
-middle_name: Davis
-gender: F
 birth_date: 1979-08-07
+gender: Female
+email: https://spanberger.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S001209.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-7
 offices:
 - classification: capitol
-  address: 562 Cannon House Office Building Washington DC 20515-4607
+  address: 562 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2815
 - classification: district
-  address: 4201 Dominion Blvd Suite 110; Glen Allen, VA 23060-6743
-  voice: 804-401-4110
-  name: 'District Office #1'
+  address: 1380 Central Park Blvd. Suite 201, Fredericksburg, VA 22401
+  voice: 540-321-6130
 - classification: district
-  address: 9104 Courthouse Rd Suite 249; Spotsylvania, VA 22553-1902
-  voice: 202-225-2815
-  name: 'District Office #2'
+  address: 2241D Tacketts Mill Drive, Woodbridge, VA 22192
+  voice: 703-987-2180
 links:
 - url: https://spanberger.house.gov
   note: website
+- url: https://spanberger.house.gov/
+other_names:
+- name: A. Spanberger
+- name: A.A.D. Spanberger
+- name: Abigail Davis Spanberger
+- name: Spanberger, A.
 ids:
   twitter: RepSpanberger
 other_identifiers:
@@ -66,3 +68,9 @@ other_identifiers:
   identifier: kg:/g/11fgm1ffs7
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Abigail_Spanberger
+- url: https://en.wikipedia.org/wiki/Abigail_Spanberger
+- url: https://justfacts.votesmart.org/candidate/179682/abigail-spanberger
+- url: https://spanberger.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/abigail_spanberger/412833
diff --git a/data/us/legislature/Adam-B-Schiff-c5a3238c-f36a-5b17-af62-ca6dcce0b91d.yml b/data/us/legislature/Adam-B-Schiff-c5a3238c-f36a-5b17-af62-ca6dcce0b91d.yml
index c4ee57a236..7f2ad2459c 100644
--- a/data/us/legislature/Adam-B-Schiff-c5a3238c-f36a-5b17-af62-ca6dcce0b91d.yml
+++ b/data/us/legislature/Adam-B-Schiff-c5a3238c-f36a-5b17-af62-ca6dcce0b91d.yml
@@ -1,92 +1,92 @@
 id: ocd-person/c5a3238c-f36a-5b17-af62-ca6dcce0b91d
-name: Adam B. Schiff
+name: Adam Schiff
 given_name: Adam
 family_name: Schiff
-middle_name: B.
-gender: M
 birth_date: 1960-06-22
+gender: Male
+email: https://schiff.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/S001150.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-30
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-28
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-28
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-28
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-28
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-28
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-29
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-29
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-29
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-29
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-29
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
+  district: CA-27
 offices:
 - classification: capitol
-  address: 2309 Rayburn House Office Building Washington DC 20515-0530
+  address: 2309 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4176
+  fax: 202-225-5828
 - classification: district
-  address: '245 E. Olive Ave. #200; Burbank, CA 91502'
+  address: 245 E. Olive Ave. Suite 200, Burbank, CA 91502
   voice: 818-450-2900
   fax: 818-450-2928
-  name: 'District Office #1'
-- classification: district
-  address: '5500 Hollywood Blvd. Suite #416; Los Angeles, CA 90028'
-  voice: 323-315-5555
-  name: 'District Office #2'
 links:
 - url: https://schiff.house.gov
   note: website
+- url: https://schiff.house.gov/
+other_names:
+- name: A. Schiff
+- name: A.B. Schiff
+- name: Adam B. Schiff
+- name: Schiff, A.
 ids:
   twitter: RepAdamSchiff
   youtube: UCadiUi-KZoFk1K5ZDsluLcA
@@ -122,3 +122,10 @@ other_identifiers:
   identifier: kg:/m/024tls
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Adam_Schiff
+- url: https://en.wikipedia.org/wiki/Adam_Schiff
+- url: https://justfacts.votesmart.org/candidate/9489/adam-schiff
+- url: https://schiff.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/adam_schiff/400361
+- url: https://www.linkedin.com/in/adam-schiff-619a7b23
diff --git a/data/us/legislature/Adam-Smith-55a28978-7661-5a33-a2be-a505a07e2a8e.yml b/data/us/legislature/Adam-Smith-55a28978-7661-5a33-a2be-a505a07e2a8e.yml
index 0b39d1f002..50d00b7389 100644
--- a/data/us/legislature/Adam-Smith-55a28978-7661-5a33-a2be-a505a07e2a8e.yml
+++ b/data/us/legislature/Adam-Smith-55a28978-7661-5a33-a2be-a505a07e2a8e.yml
@@ -2,101 +2,103 @@ id: ocd-person/55a28978-7661-5a33-a2be-a505a07e2a8e
 name: Adam Smith
 given_name: Adam
 family_name: Smith
-gender: M
 birth_date: 1965-06-15
+gender: Male
+email: https://adamsmith.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S000510.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-9
 offices:
 - classification: capitol
-  address: 2264 Rayburn House Office Building Washington DC 20515-4709
+  address: 2264 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8901
 - classification: district
-  address: 15 S. Grady Way Suite 101; Renton, WA 98057
+  address: 101 Evergreen Building 15 S. Grady Way, Renton, WA 98057
   voice: 425-793-5180
-  name: 'District Office #1'
 links:
 - url: https://adamsmith.house.gov
   note: website
+- url: https://adamsmith.house.gov/
+other_names:
+- name: A. Smith
+- name: D.A. Smith
+- name: Smith (WA)
+- name: Smith, A.
 ids:
   twitter: RepAdamSmith
   youtube: UCcrHso483LOfC6WwDnzAh-g
   facebook: RepAdamSmith
-other_names:
-- name: Smith (WA)
 other_identifiers:
 - scheme: bioguide
   identifier: S000510
@@ -128,3 +130,9 @@ other_identifiers:
   identifier: kg:/m/024zj_
 sources:
 - url: https://theunitedstates.io/
+- url: https://adamsmith.house.gov
+- url: https://ballotpedia.org/Adam_Smith_(Washington)
+- url: https://en.wikipedia.org/wiki/Adam_Smith_%28politician%29
+- url: https://justfacts.votesmart.org/candidate/845/adam-smith
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/adam_smith/400379
diff --git a/data/us/legislature/Adrian-Smith-39f36070-b860-5345-a3cc-ea7fdbf7dfb3.yml b/data/us/legislature/Adrian-Smith-39f36070-b860-5345-a3cc-ea7fdbf7dfb3.yml
index f744bd4244..fb217edecd 100644
--- a/data/us/legislature/Adrian-Smith-39f36070-b860-5345-a3cc-ea7fdbf7dfb3.yml
+++ b/data/us/legislature/Adrian-Smith-39f36070-b860-5345-a3cc-ea7fdbf7dfb3.yml
@@ -2,81 +2,87 @@ id: ocd-person/39f36070-b860-5345-a3cc-ea7fdbf7dfb3
 name: Adrian Smith
 given_name: Adrian
 family_name: Smith
-gender: M
 birth_date: 1970-12-19
+gender: Male
+email: https://adriansmith.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001172.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-3
 offices:
 - classification: capitol
-  address: 502 Cannon House Office Building Washington DC 20515-2703
+  address: 502 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6435
+  fax: 202-225-0207
 - classification: district
-  address: 1811 W. Second St. Suite 275; Grand Island, NE 68803
+  address: 1811 W. 2nd St. Suite 275, Grand Island, NE 68803
   voice: 308-384-3900
   fax: 308-384-3902
-  name: 'District Office #1'
 - classification: district
-  address: 416 Valley View Dr. Suite 600; Scottsbluff, NE 69361
+  address: 202 S. 8th St. Suite A, Nebraska City, NE 68410
+  voice: 402-874-6050
+  fax: 402-874-6049
+- classification: district
+  address: 416 Valley View Drive Suite 600, Scottsbluff, NE 69361
   voice: 308-633-6333
   fax: 308-633-6335
-  name: 'District Office #2'
 links:
 - url: https://adriansmith.house.gov
   note: website
+- url: https://adriansmith.house.gov/
+other_names:
+- name: A. Smith
+- name: A.M. Smith
+- name: Smith (NE)
+- name: Smith, A.
 ids:
   twitter: RepAdrianSmith
   youtube: UCIgn2z-hwxx_aeggnyhv54Q
-other_names:
-- name: Smith (NE)
 other_identifiers:
 - scheme: bioguide
   identifier: S001172
@@ -108,3 +114,11 @@ other_identifiers:
   identifier: kg:/m/0c505n
 sources:
 - url: https://theunitedstates.io/
+- url: https://adriansmith.house.gov
+- url: https://adriansmith.house.gov/about
+- url: https://ballotpedia.org/Adrian_Smith_(Nebraska)
+- url: https://en.wikipedia.org/wiki/Adrian_M._Smith
+- url: https://joinadrian.com/get-to-know-adrian
+- url: https://justfacts.votesmart.org/candidate/biography/21284/adrian-smith
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/adrian_smith/412217
diff --git a/data/us/legislature/Adriano-Espaillat-0d73f18d-36c1-526d-9d5c-5a0a63ff60af.yml b/data/us/legislature/Adriano-Espaillat-0d73f18d-36c1-526d-9d5c-5a0a63ff60af.yml
index 8a90e8d280..80ed4a8452 100644
--- a/data/us/legislature/Adriano-Espaillat-0d73f18d-36c1-526d-9d5c-5a0a63ff60af.yml
+++ b/data/us/legislature/Adriano-Espaillat-0d73f18d-36c1-526d-9d5c-5a0a63ff60af.yml
@@ -2,49 +2,56 @@ id: ocd-person/0d73f18d-36c1-526d-9d5c-5a0a63ff60af
 name: Adriano Espaillat
 given_name: Adriano
 family_name: Espaillat
-gender: M
 birth_date: 1954-09-27
+gender: Male
+email: https://espaillat.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/E000297.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-13
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-13
 offices:
 - classification: capitol
-  address: 2332 Rayburn House Office Building Washington DC 20515-3213
+  address: 2332 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4365
+  fax: 202-226-9731
 - classification: district
-  address: 2530 Grand Concourse Avenue Ground Floor; Bronx, NY 10458
-  voice: 718-450-8241
-  name: 'District Office #1'
+  address: 3107 Kingsbridge Ave., Bronx, NY 10463
+  voice: 646-740-3632
 - classification: district
-  address: '163 West 125th Street #507; New York, NY 10027'
+  address: 720 W. 181st St. Suite 2, New York, NY 10033
+  voice: 212-497-5959
+- classification: district
+  address: Harlem State Office Building 163 W. 125th St., Suite 508, New York, NY
+    10027
   voice: 212-663-3900
-  name: 'District Office #2'
 links:
 - url: https://espaillat.house.gov
   note: website
+- url: https://espaillat.house.gov/
+other_names:
+- name: A. Espaillat
+- name: A.d.J. Espaillat
+- name: Espaillat, A.
 ids:
   twitter: RepEspaillat
   youtube: UCi0niBYFhEY70Dz8InbX5OQ
@@ -76,3 +83,10 @@ other_identifiers:
   identifier: Adriano Espaillat
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Adriano_Espaillat
+- url: https://en.wikipedia.org/wiki/Adriano_Espaillat
+- url: https://espaillat.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/adriano_espaillat/412718
+- url: https://www.linkedin.com/in/adriano-espaillat-9b551184
+- url: https://www.linkedin.com/in/adrianoespaillat
diff --git a/data/us/legislature/Al-Green-2ad84a53-f957-5a9c-861b-413aac608201.yml b/data/us/legislature/Al-Green-2ad84a53-f957-5a9c-861b-413aac608201.yml
index 288f84f16e..29b3ad8959 100644
--- a/data/us/legislature/Al-Green-2ad84a53-f957-5a9c-861b-413aac608201.yml
+++ b/data/us/legislature/Al-Green-2ad84a53-f957-5a9c-861b-413aac608201.yml
@@ -2,82 +2,89 @@ id: ocd-person/2ad84a53-f957-5a9c-861b-413aac608201
 name: Al Green
 given_name: Al
 family_name: Green
-gender: M
 birth_date: 1947-09-01
+gender: Male
+email: https://algreen.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000553.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-9
 offices:
 - classification: capitol
-  address: 2347 Rayburn House Office Building Washington DC 20515-4309
+  address: 2347 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-7508
+  fax: 202-225-2947
 - classification: district
-  address: 3003 South Loop West Suite 460; Houston, TX 77054
+  address: 2440 Texas Parkway Suite 115, Missouri City, TX 77489
+  voice: 713-383-9234
+  fax: 713-383-9202
+- classification: district
+  address: 3003 S. Loop West Suite 460, Houston, TX 77054
   voice: 713-383-9234
   fax: 713-383-9202
-  name: 'District Office #1'
 links:
 - url: https://algreen.house.gov
   note: website
+- url: https://algreen.house.gov/
+other_names:
+- name: A. Green
+- name: A.N. Green
+- name: Green, A.
+- name: Green, Al (TX)
 ids:
   twitter: RepAlGreen
   youtube: UCFtgMZm1YUXaZ8OtOj-GDjA
   facebook: repalgreen
-other_names:
-- name: Green, Al (TX)
 other_identifiers:
 - scheme: bioguide
   identifier: G000553
@@ -109,3 +116,10 @@ other_identifiers:
   identifier: kg:/m/02kn0_
 sources:
 - url: https://theunitedstates.io/
+- url: https://algreen.house.gov
+- url: https://algreen.house.gov/about#bio
+- url: https://ballotpedia.org/Al_Green_(Texas)
+- url: https://en.wikipedia.org/wiki/Al_Green_%28Texas%29
+- url: https://justfacts.votesmart.org/candidate/49680/al-green
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/al_green/400653
diff --git a/data/us/legislature/Alex-Padilla-fadd82ac-5031-5efd-ae39-1afc3f3cd6fb.yml b/data/us/legislature/Alex-Padilla-fadd82ac-5031-5efd-ae39-1afc3f3cd6fb.yml
index 1a872b8a22..44aff52c5f 100644
--- a/data/us/legislature/Alex-Padilla-fadd82ac-5031-5efd-ae39-1afc3f3cd6fb.yml
+++ b/data/us/legislature/Alex-Padilla-fadd82ac-5031-5efd-ae39-1afc3f3cd6fb.yml
@@ -1,68 +1,66 @@
 id: ocd-person/fadd82ac-5031-5efd-ae39-1afc3f3cd6fb
 name: Alex Padilla
-given_name: Alejandro
+given_name: Alex
 family_name: Padilla
-gender: M
 birth_date: 1973-03-22
+gender: Male
+email: https://www.padilla.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/P000145.jpg
 party:
-- start_date: '2021-01-20'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-20'
-  end_date: '2022-12-21'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: California
-- start_date: '2022-12-22'
-  end_date: '2023-01-03'
+- start_date: 2022-12-22
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: California
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2021-01-20
+  end_date: 2022-12-21
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: California
 offices:
 - classification: capitol
-  address: 331 Hart Senate Office Building Washington DC 20510
+  address: 331 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3553
+  fax: 202-224-2200
 - classification: district
-  address: 2500 Tulare Street Suite 5290; Fresno, CA 93721
+  address: 2500 Tulare St. Suite 5290, Fresno, CA 93721
   voice: 559-497-5109
   fax: 202-228-3864
-  name: 'District Office #1'
 - classification: district
-  address: 333 Bush Street Suite 3225; San Francisco, CA 94104
+  address: 255 E. Temple St. Suite 1860, Los Angeles, CA 90012
+  voice: 310-231-4494
+  fax: 202-224-0357
+- classification: district
+  address: 333 Bush St. Suite 3225, San Francisco, CA 94104
   voice: 415-981-9369
   fax: 202-224-0454
-  name: 'District Office #2'
 - classification: district
-  address: 501 I Street Suite 7-800; Sacramento, CA 95814
+  address: 501 I St. Suite 7-800, Sacramento, CA 95814
   voice: 916-448-2787
   fax: 202-228-3865
-  name: 'District Office #3'
-- classification: district
-  address: 11845 West Olympic Blvd Suite 1250W; Los Angeles, CA 90064
-  voice: 310-231-4494
-  fax: 202-224-0357
-  name: 'District Office #4'
 - classification: district
-  address: 600 B Street Suite 2240; San Diego, CA 92101
+  address: 600 B St. Suite 2240, San Diego, CA 92101
   voice: 619-239-3884
   fax: 202-228-3863
-  name: 'District Office #5'
 links:
 - url: https://www.padilla.senate.gov
   note: website
 - url: https://www.padilla.senate.gov/contact/
   note: contact form
-ids:
-  twitter: SenAlexPadilla
+- url: https://www.padilla.senate.gov/
 other_names:
+- name: A. Padilla
 - name: Padilla (D-CA)
+- name: Padilla, A.
+ids:
+  twitter: SenAlexPadilla
 other_identifiers:
 - scheme: bioguide
   identifier: P000145
@@ -84,3 +82,9 @@ other_identifiers:
   identifier: '59742'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Alex_Padilla
+- url: https://en.wikipedia.org/wiki/Alex_Padilla
+- url: https://justfacts.votesmart.org/candidate/biography/59742/alex-padilla
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/alejandro_padilla/456856
+- url: https://www.padilla.senate.gov
diff --git a/data/us/legislature/Alexander-X-Mooney-1b959af6-5bbc-5e3b-855f-9a140244c31c.yml b/data/us/legislature/Alexander-X-Mooney-1b959af6-5bbc-5e3b-855f-9a140244c31c.yml
index 5e26b977d6..cff19ab2d1 100644
--- a/data/us/legislature/Alexander-X-Mooney-1b959af6-5bbc-5e3b-855f-9a140244c31c.yml
+++ b/data/us/legislature/Alexander-X-Mooney-1b959af6-5bbc-5e3b-855f-9a140244c31c.yml
@@ -1,56 +1,59 @@
 id: ocd-person/1b959af6-5bbc-5e3b-855f-9a140244c31c
-name: Alexander X. Mooney
-given_name: Alexander
+name: Alex Mooney
+given_name: Alex
 family_name: Mooney
-middle_name: X.
-gender: M
-birth_date: 1971-06-05
+birth_date: 1971-06-07
+gender: Male
+email: https://mooney.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001195.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
 offices:
 - classification: capitol
-  address: 2228 Rayburn House Office Building Washington DC 20515-4802
+  address: 2228 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2711
+  fax: 202-225-7856
 - classification: district
-  address: 405 Capitol St. Suite 514; Charleston, WV 25301
-  voice: 304-925-5964
-  name: 'District Office #1'
-- classification: district
-  address: 300 Foxcroft Ave. Suite 101; Martinsburg, WV 25401
+  address: 120 N. George St. 2nd Floor, Charles Town, WV 25414
   voice: 304-264-8810
-  name: 'District Office #2'
+- classification: district
+  address: 503 Burroughs St. Suite 101, Morgantown, WV 26505
+  voice: 304-413-1995
 links:
 - url: https://mooney.house.gov
   note: website
+- url: https://mooney.house.gov/
+other_names:
+- name: A. Mooney
+- name: A.X. Mooney
+- name: Alexander X. Mooney
+- name: Mooney, A.
 ids:
   twitter: RepAlexMooney
   youtube: UCw9CGkF4Re3areluI43TGyA
@@ -84,3 +87,11 @@ other_identifiers:
   identifier: Alexander Mooney
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Alexander_Mooney
+- url: https://en.wikipedia.org/wiki/Alex_Mooney
+- url: https://justfacts.votesmart.org/candidate/145943/alex-mooney
+- url: https://justfacts.votesmart.org/candidate/biography/19114/alexander-mooney
+- url: https://mooney.house.gov
+- url: https://mooney.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/alexander_mooney/412662
diff --git a/data/us/legislature/Alexandria-Ocasio-Cortez-d2a8d710-a781-5a40-b6f2-e46bffcf40d2.yml b/data/us/legislature/Alexandria-Ocasio-Cortez-d2a8d710-a781-5a40-b6f2-e46bffcf40d2.yml
index beb1483b12..56661e02b2 100644
--- a/data/us/legislature/Alexandria-Ocasio-Cortez-d2a8d710-a781-5a40-b6f2-e46bffcf40d2.yml
+++ b/data/us/legislature/Alexandria-Ocasio-Cortez-d2a8d710-a781-5a40-b6f2-e46bffcf40d2.yml
@@ -2,39 +2,43 @@ id: ocd-person/d2a8d710-a781-5a40-b6f2-e46bffcf40d2
 name: Alexandria Ocasio-Cortez
 given_name: Alexandria
 family_name: Ocasio-Cortez
-gender: F
 birth_date: 1989-10-13
+gender: Female
+email: https://ocasio-cortez.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/O000172.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-14
 offices:
 - classification: capitol
-  address: 250 Cannon House Office Building Washington DC 20515-3214
+  address: 250 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3965
 - classification: district
-  address: 7409 37th Ave Suite 305; Jackson Heights, NY 11372-6300
-  name: 'District Office #1'
+  address: 1231 Lafayette Ave. Suite L-610, The Bronx, NY 10474
+- classification: district
+  address: 177 Dreiser Loop Room 3, The Bronx, NY 10475
 links:
 - url: https://ocasio-cortez.house.gov
   note: website
+- url: https://ocasio-cortez.house.gov/
+other_names:
+- name: A. Ocasio-Cortez
+- name: Ocasio-Cortez, A.
 ids:
   twitter: RepAOC
 other_identifiers:
@@ -60,3 +64,12 @@ other_identifiers:
   identifier: kg:/g/11f6y3nqg6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Alexandria_Ocasio-Cortez
+- url: https://chci.org/staff-and-leadership/rep-alexandria-ocasio-cortez
+- url: https://en.wikipedia.org/wiki/Alexandria_Ocasio-Cortez
+- url: https://justfacts.votesmart.org/candidate/180416/alexandria-ocasio-cortez
+- url: https://ocasio-cortez.house.gov
+- url: https://ocasio-cortez.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/alexandria_ocasio_cortez/412804
+- url: https://www.ocasiocortez.com/about
diff --git a/data/us/legislature/Alma-S-Adams-76bfaf2b-8259-5f56-bce9-d1c8cd6c780d.yml b/data/us/legislature/Alma-S-Adams-76bfaf2b-8259-5f56-bce9-d1c8cd6c780d.yml
index 78793c1ae0..ba41177f62 100644
--- a/data/us/legislature/Alma-S-Adams-76bfaf2b-8259-5f56-bce9-d1c8cd6c780d.yml
+++ b/data/us/legislature/Alma-S-Adams-76bfaf2b-8259-5f56-bce9-d1c8cd6c780d.yml
@@ -1,58 +1,62 @@
 id: ocd-person/76bfaf2b-8259-5f56-bce9-d1c8cd6c780d
-name: Alma S. Adams
+name: Alma Adams
 given_name: Alma
 family_name: Adams
-middle_name: S.
-gender: F
 birth_date: 1946-05-27
+gender: Female
+email: https://adamsforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/A000370.jpg
 party:
-- start_date: '2014-11-12'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2014-11-12'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2014-11-12
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-12
 offices:
 - classification: capitol
-  address: 2436 Rayburn House Office Building Washington DC 20515-3312
+  address: 2436 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1510
+  fax: 202-225-1512
 - classification: district
-  address: 801 E. Morehead St. Suite 150; Charlotte, NC 28202
+  address: 10815 David Taylor Drive Suite 100, Charlotte, NC 28262
   voice: 704-344-9950
   fax: 704-344-9971
-  name: 'District Office #1'
 links:
 - url: https://adams.house.gov
   note: website
+- url: https://adams.house.gov/
+other_names:
+- name: A. Adams
+- name: A.S. Adams
+- name: Adams, A.
+- name: Alma S. Adams
 ids:
   twitter: RepAdams
   youtube: UCPI9ao1Cr1nxEUD2r-usRjQ
@@ -88,3 +92,9 @@ other_identifiers:
   identifier: '21545'
 sources:
 - url: https://theunitedstates.io/
+- url: https://adams.house.gov
+- url: https://ballotpedia.org/Alma_Adams
+- url: https://en.wikipedia.org/wiki/Alma_Adams
+- url: https://justfacts.votesmart.org/candidate/biography/5935/alma-adams
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/alma_adams/412607
diff --git a/data/us/legislature/Ami-Bera-79c4f42e-4775-5ed0-a7e1-d0c942ce6c34.yml b/data/us/legislature/Ami-Bera-79c4f42e-4775-5ed0-a7e1-d0c942ce6c34.yml
index bdb303134f..3a0d169ddd 100644
--- a/data/us/legislature/Ami-Bera-79c4f42e-4775-5ed0-a7e1-d0c942ce6c34.yml
+++ b/data/us/legislature/Ami-Bera-79c4f42e-4775-5ed0-a7e1-d0c942ce6c34.yml
@@ -2,56 +2,60 @@ id: ocd-person/79c4f42e-4775-5ed0-a7e1-d0c942ce6c34
 name: Ami Bera
 given_name: Ami
 family_name: Bera
-gender: M
 birth_date: 1965-03-02
+gender: Male
+email: https://bera.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/B001287.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-6
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-6
+  district: CA-7
 offices:
 - classification: capitol
-  address: 172 Cannon House Office Building Washington DC 20515-0506
+  address: 172 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5716
+  fax: 202-226-1298
 - classification: district
-  address: 8950 Cal Center Dr. Suite 100; Sacramento, CA 95826
+  address: 8950 Cal Center Drive Building 3, Suite 100, Sacramento, CA 95826
   voice: 916-635-0505
   fax: 916-635-0514
-  name: 'District Office #1'
 links:
 - url: https://bera.house.gov
   note: website
+- url: https://bera.house.gov/
+other_names:
+- name: A. Bera
+- name: A.B. Bera
+- name: Bera, A.
 ids:
   twitter: RepBera
   youtube: UClJCTCo53Zk6b4kUL-bbdzg
@@ -85,3 +89,10 @@ other_identifiers:
   identifier: kg:/m/0dgqnts
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ami_Bera
+- url: https://bera.house.gov
+- url: https://bera.house.gov/about
+- url: https://beraforcongress.com/about-dr-bera
+- url: https://en.wikipedia.org/wiki/Ami_Bera
+- url: https://justfacts.votesmart.org/candidate/biography/120030/ami-bera
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Amy-Klobuchar-2722e0b1-650d-5f77-a348-f7f0d66aa3e2.yml b/data/us/legislature/Amy-Klobuchar-2722e0b1-650d-5f77-a348-f7f0d66aa3e2.yml
index 6c1b4d317a..dab2da6664 100644
--- a/data/us/legislature/Amy-Klobuchar-2722e0b1-650d-5f77-a348-f7f0d66aa3e2.yml
+++ b/data/us/legislature/Amy-Klobuchar-2722e0b1-650d-5f77-a348-f7f0d66aa3e2.yml
@@ -2,64 +2,63 @@ id: ocd-person/2722e0b1-650d-5f77-a348-f7f0d66aa3e2
 name: Amy Klobuchar
 given_name: Amy
 family_name: Klobuchar
-middle_name: Jean
-gender: F
 birth_date: 1960-05-25
+gender: Female
+email: https://www.klobuchar.senate.gov/public/index.cfm/email-amy
 image: https://theunitedstates.io/images/congress/450x550/K000367.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
 offices:
 - classification: capitol
-  address: 425 Dirksen Senate Office Building Washington DC 20510
+  address: 425 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-3244
+  fax: 202-228-2186
 - classification: district
-  address: 1200 Washington Avenue South Room 250; Minneapolis, MN 55415
+  address: 1130 1/2 7th St. NW Room 212, Rochester, MN 55901
+  voice: 507-288-5321
+  fax: 202-224-1792
+- classification: district
+  address: 1200 Washington Ave. South Suite 250, Minneapolis, MN 55415
   voice: 612-727-5220
-  fax: 612-727-5223
-  name: 'District Office #1'
+  fax: 202-224-1792
 - classification: district
-  address: 121 4th Street South; Moorhead, MN 56560
+  address: 121 4th St. South, Moorhead, MN 56560
   voice: 218-287-2219
-  fax: 218-287-2930
-  name: 'District Office #2'
+  fax: 202-224-1792
 - classification: district
-  address: 1130 1/2 7th Street NW Room 212; Rochester, MN 55901
-  voice: 507-288-5321
-  fax: 507-288-2922
-  name: 'District Office #3'
-- classification: district
-  address: 820 9th Street North Room 105; Virginia, MN 55792
+  address: Olcott Plaza 820 9th St. North, Suite 105, Virginia, MN 55792
   voice: 218-741-9690
-  fax: 218-741-3692
-  name: 'District Office #4'
+  fax: 202-224-1792
 links:
 - url: https://www.klobuchar.senate.gov
   note: website
 - url: https://www.klobuchar.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.klobuchar.senate.gov/
+other_names:
+- name: A. Klobuchar
+- name: A.J. Klobuchar
+- name: Klobuchar (D-MN)
+- name: Klobuchar, A.
 ids:
   twitter: SenAmyKlobuchar
   youtube: UCvdeJsDsV51tFb_hVqvtYGA
-other_names:
-- name: Klobuchar (D-MN)
 other_identifiers:
 - scheme: bioguide
   identifier: K000367
@@ -93,3 +92,10 @@ other_identifiers:
   identifier: kg:/m/05fbpt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Amy_Klobuchar
+- url: https://en.wikipedia.org/wiki/Amy_Klobuchar
+- url: https://justfacts.votesmart.org/candidate/65092/amy-klobuchar
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/amy_klobuchar/412242
+- url: https://www.klobuchar.senate.gov
+- url: https://www.klobuchar.senate.gov/public/index.cfm/about-amy
diff --git a/data/us/legislature/Andr-Carson-ef4b4ed3-1808-548d-8625-2cea913c2e4a.yml b/data/us/legislature/Andr-Carson-ef4b4ed3-1808-548d-8625-2cea913c2e4a.yml
index c477fbf45c..6faf065be3 100644
--- a/data/us/legislature/Andr-Carson-ef4b4ed3-1808-548d-8625-2cea913c2e4a.yml
+++ b/data/us/legislature/Andr-Carson-ef4b4ed3-1808-548d-8625-2cea913c2e4a.yml
@@ -2,71 +2,76 @@ id: ocd-person/ef4b4ed3-1808-548d-8625-2cea913c2e4a
 name: "Andr\xE9 Carson"
 given_name: "Andr\xE9"
 family_name: Carson
-gender: M
 birth_date: 1974-10-16
+gender: Male
+email: https://carson.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001072.jpg
 party:
-- start_date: '2008-03-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2008-03-13'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2008-03-13
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-7
 offices:
 - classification: capitol
-  address: 2135 Rayburn House Office Building Washington DC 20515-1407
+  address: 2135 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4011
+  fax: 202-225-5633
 - classification: district
-  address: 300 E. Fall Creek Pkwy N Dr. Suite 300; Indianapolis, IN 46205
+  address: Julia Carson Government Center 300 E. Fall Creek Parkway North Drive, Suite
+    300, Indianapolis, IN 46205
   voice: 317-283-6516
   fax: 317-283-6567
-  name: 'District Office #1'
 links:
 - url: https://carson.house.gov
   note: website
+- url: https://carson.house.gov/
+other_names:
+- name: A. Carson
+- name: A.D. Carson
+- name: Carson, A.
 ids:
   twitter: RepAndreCarson
   youtube: UCprUnnEgM2VUGmAKSaZXCSw
@@ -102,3 +107,10 @@ other_identifiers:
   identifier: kg:/m/03qcvz1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andr%C3%A9_Carson
+- url: https://carson.house.gov
+- url: https://en.wikipedia.org/wiki/Andr%C3%A9_Carson
+- url: https://justfacts.votesmart.org/candidate/84917/andre-carson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andre_carson/412258
+- url: https://www.linkedin.com/in/rep-andre-carson-16a100161
diff --git a/data/us/legislature/Andrea-Salinas-54f931b7-9a94-5c93-8585-0967370ffb86.yml b/data/us/legislature/Andrea-Salinas-54f931b7-9a94-5c93-8585-0967370ffb86.yml
index b11238981b..4f2565e5db 100644
--- a/data/us/legislature/Andrea-Salinas-54f931b7-9a94-5c93-8585-0967370ffb86.yml
+++ b/data/us/legislature/Andrea-Salinas-54f931b7-9a94-5c93-8585-0967370ffb86.yml
@@ -2,27 +2,36 @@ id: ocd-person/54f931b7-9a94-5c93-8585-0967370ffb86
 name: Andrea Salinas
 given_name: Andrea
 family_name: Salinas
-middle_name: Rose
-gender: F
 birth_date: 1969-12-06
+gender: Female
+email: https://salinas.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001226.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-6
 offices:
 - classification: capitol
-  address: 109 Cannon House Office Building Washington DC 20515-0001
+  address: 109 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5643
+- classification: district
+  address: 18861 SW Martinazzi Ave. Suite 200, Tualatin, OR 97062
+  voice: 503-385-0906
+- classification: district
+  address: 530 Center St. NE Suite 415, Salem, OR 97301
+  voice: 503-385-0906
 links:
 - url: https://salinas.house.gov
   note: website
+- url: https://salinas.house.gov/
+other_names:
+- name: A. Salinas
+- name: A.R. Salinas
+- name: Salinas, A.
 other_identifiers:
 - scheme: bioguide
   identifier: S001226
@@ -42,3 +51,10 @@ other_identifiers:
   identifier: '178196'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andrea_Salinas
+- url: https://en.wikipedia.org/wiki/Andrea_Salinas
+- url: https://justfacts.votesmart.org/candidate/biography/178196/andrea-salinas
+- url: https://salinas.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andrea_salinas/456934
+- url: https://www.linkedin.com/in/andrea-salinas-85493153
diff --git a/data/us/legislature/Andrew-Ogles-5916e23e-c486-5d60-88c8-56bb65c23763.yml b/data/us/legislature/Andrew-Ogles-5916e23e-c486-5d60-88c8-56bb65c23763.yml
index ed216e810b..27940e566c 100644
--- a/data/us/legislature/Andrew-Ogles-5916e23e-c486-5d60-88c8-56bb65c23763.yml
+++ b/data/us/legislature/Andrew-Ogles-5916e23e-c486-5d60-88c8-56bb65c23763.yml
@@ -1,27 +1,35 @@
 id: ocd-person/5916e23e-c486-5d60-88c8-56bb65c23763
-name: Andrew Ogles
-given_name: Andrew
+name: Andy Ogles
+given_name: Andy
 family_name: Ogles
-gender: M
 birth_date: 1971-06-18
+gender: Male
+email: https://ogles.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/O000175.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-5
 offices:
 - classification: capitol
-  address: 151 Cannon House Office Building Washington DC 20515-4205
+  address: 151 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4311
+- classification: district
+  address: 22 Public Square Suite 5, Columbia, TN 38401
+  voice: 931-777-2140
 links:
 - url: https://ogles.house.gov
   note: website
+- url: https://ogles.house.gov/
+other_names:
+- name: A. Ogles
+- name: Andrew Ogles
+- name: Ogles, A.
+- name: W.A. Ogles
 other_identifiers:
 - scheme: bioguide
   identifier: O000175
@@ -41,3 +49,7 @@ other_identifiers:
   identifier: Andy Ogles
 sources:
 - url: https://theunitedstates.io/
+- url: https://en.wikipedia.org/wiki/Andy_Ogles
+- url: https://ogles.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/andyogles
diff --git a/data/us/legislature/Andrew-R-Garbarino-4ec1dbc4-ea21-5f61-92b1-fa55b47a4c61.yml b/data/us/legislature/Andrew-R-Garbarino-4ec1dbc4-ea21-5f61-92b1-fa55b47a4c61.yml
index 6274c0fd66..a78aaf6a4a 100644
--- a/data/us/legislature/Andrew-R-Garbarino-4ec1dbc4-ea21-5f61-92b1-fa55b47a4c61.yml
+++ b/data/us/legislature/Andrew-R-Garbarino-4ec1dbc4-ea21-5f61-92b1-fa55b47a4c61.yml
@@ -1,33 +1,42 @@
 id: ocd-person/4ec1dbc4-ea21-5f61-92b1-fa55b47a4c61
-name: Andrew R. Garbarino
+name: Andrew Garbarino
 given_name: Andrew
 family_name: Garbarino
-middle_name: R.
-gender: M
 birth_date: 1984-09-27
+gender: Male
+email: https://garbarino.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000597.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-2
 offices:
 - classification: capitol
-  address: 2344 Rayburn House Office Building Washington DC 20515-3202
+  address: 2344 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-7896
+  fax: 202-226-2279
+- classification: district
+  address: 31 Oak St. Suite 20, Patchogue, NY 11772
+  voice: 631-541-4225
+  fax: 516-541-6602
 links:
 - url: https://garbarino.house.gov
   note: website
+- url: https://garbarino.house.gov/
+other_names:
+- name: A. Garbarino
+- name: A.R. Garbarino
+- name: Andrew R. Garbarino
+- name: Garbarino, A.
 ids:
   twitter: RepGarbarino
 other_identifiers:
@@ -47,3 +56,9 @@ other_identifiers:
   identifier: kg:/g/11bw8f4j8q
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andrew_Garbarino
+- url: https://en.wikipedia.org/wiki/Andrew_Garbarino
+- url: https://garbarino.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/143103/andrew-garbarino
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andrew_garbarino/456836
diff --git a/data/us/legislature/Andrew-S-Clyde-0dbe5471-29ea-5c84-8270-f55fee08d118.yml b/data/us/legislature/Andrew-S-Clyde-0dbe5471-29ea-5c84-8270-f55fee08d118.yml
index 43885733e8..2d0c7063e4 100644
--- a/data/us/legislature/Andrew-S-Clyde-0dbe5471-29ea-5c84-8270-f55fee08d118.yml
+++ b/data/us/legislature/Andrew-S-Clyde-0dbe5471-29ea-5c84-8270-f55fee08d118.yml
@@ -1,33 +1,41 @@
 id: ocd-person/0dbe5471-29ea-5c84-8270-f55fee08d118
-name: Andrew S. Clyde
+name: Andrew Clyde
 given_name: Andrew
 family_name: Clyde
-middle_name: S.
-gender: M
-birth_date: 1963-11-22
+birth_date: 1963-11-02
+gender: Male
+email: https://clyde.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001116.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-9
 offices:
 - classification: capitol
-  address: 445 Cannon House Office Building Washington DC 20515-1009
+  address: 445 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-9893
+  fax: 202-226-1224
+- classification: district
+  address: 210 Washington St. NW Suite 202, Gainesville, GA 30501
+  voice: 470-768-6520
 links:
 - url: https://clyde.house.gov
   note: website
+- url: https://clyde.house.gov/
+other_names:
+- name: A. Clyde
+- name: A.S. Clyde
+- name: Andrew S. Clyde
+- name: Clyde, A.
 ids:
   twitter: Rep_Clyde
 other_identifiers:
@@ -47,3 +55,10 @@ other_identifiers:
   identifier: kg:/g/11j32tm4v4
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andrew_Clyde
+- url: https://clyde.house.gov
+- url: https://en.wikipedia.org/wiki/Andrew_Clyde
+- url: https://justfacts.votesmart.org/candidate/biography/189770/andrew-clyde
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andrew_clyde/456813
+- url: https://www.linkedin.com/in/andrew-clyde-19590032
diff --git a/data/us/legislature/Andy-Barr-fe2fa2c7-83de-5bf2-b602-6ca9f7fc8a6f.yml b/data/us/legislature/Andy-Barr-fe2fa2c7-83de-5bf2-b602-6ca9f7fc8a6f.yml
index 112cc82e55..8765636a00 100644
--- a/data/us/legislature/Andy-Barr-fe2fa2c7-83de-5bf2-b602-6ca9f7fc8a6f.yml
+++ b/data/us/legislature/Andy-Barr-fe2fa2c7-83de-5bf2-b602-6ca9f7fc8a6f.yml
@@ -1,56 +1,59 @@
 id: ocd-person/fe2fa2c7-83de-5bf2-b602-6ca9f7fc8a6f
 name: Andy Barr
-given_name: Garland
+given_name: Andy
 family_name: Barr
-gender: M
 birth_date: 1973-07-24
+gender: Male
+email: https://barr.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/B001282.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-6
 offices:
 - classification: capitol
-  address: 2430 Rayburn House Office Building Washington DC 20515-1706
+  address: 2430 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4706
 - classification: district
-  address: 2709 Old Rosebud Rd.; Lexington, KY 40509
+  address: 2709 Old Rosebud Road Suite 100, Lexington, KY 40509
   voice: 859-219-1366
-  name: 'District Office #1'
 links:
 - url: https://barr.house.gov
   note: website
+- url: https://barr.house.gov/
+other_names:
+- name: A. Barr
+- name: Barr, A.
+- name: G.H. Barr
 ids:
   twitter: RepAndyBarr
   youtube: UCVL2s6x7f7H0ZJ-uwU0pQ6Q
@@ -84,3 +87,9 @@ other_identifiers:
   identifier: kg:/m/0ddc6r6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andy_Barr
+- url: https://barr.house.gov
+- url: https://en.wikipedia.org/wiki/Andy_Barr_(American_politician)
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/garland_barr/412541
+- url: https://www.linkedin.com/in/andy-barr-7b6a534
diff --git a/data/us/legislature/Andy-Biggs-86b4b077-b73b-579b-bb73-bc5a4a73719a.yml b/data/us/legislature/Andy-Biggs-86b4b077-b73b-579b-bb73-bc5a4a73719a.yml
index 2bbbff3951..94d308e20c 100644
--- a/data/us/legislature/Andy-Biggs-86b4b077-b73b-579b-bb73-bc5a4a73719a.yml
+++ b/data/us/legislature/Andy-Biggs-86b4b077-b73b-579b-bb73-bc5a4a73719a.yml
@@ -2,45 +2,48 @@ id: ocd-person/86b4b077-b73b-579b-bb73-bc5a4a73719a
 name: Andy Biggs
 given_name: Andy
 family_name: Biggs
-gender: M
 birth_date: 1958-11-07
+gender: Male
+email: https://biggs.house.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/B001302.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-5
 offices:
 - classification: capitol
-  address: 252 Cannon House Office Building Washington DC 20515-0305
+  address: 252 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2635
 - classification: district
-  address: 2509 S. Power Rd. Suite 204; Mesa, AZ 85209
+  address: 2509 S. Power Road, Suite 204 Superstition Plaza, Mesa, AZ 85209
   voice: 480-699-8239
-  name: 'District Office #1'
 links:
 - url: https://biggs.house.gov
   note: website
+- url: https://biggs.house.gov/
+other_names:
+- name: A. Biggs
+- name: A.S. Biggs
+- name: Biggs, A.
 ids:
   twitter: RepAndyBiggsAZ
   youtube: UCqSq9kWOxk9yNTeILBCVC1w
@@ -72,3 +75,7 @@ other_identifiers:
   identifier: Andy Biggs
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andy_Biggs
+- url: https://biggs.house.gov
+- url: https://en.wikipedia.org/wiki/Andy_Biggs
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Andy-Harris-74a68d2f-f563-50d8-80a7-408346b8ba14.yml b/data/us/legislature/Andy-Harris-74a68d2f-f563-50d8-80a7-408346b8ba14.yml
index 0753086dc1..13d4ad36f7 100644
--- a/data/us/legislature/Andy-Harris-74a68d2f-f563-50d8-80a7-408346b8ba14.yml
+++ b/data/us/legislature/Andy-Harris-74a68d2f-f563-50d8-80a7-408346b8ba14.yml
@@ -2,71 +2,71 @@ id: ocd-person/74a68d2f-f563-50d8-80a7-408346b8ba14
 name: Andy Harris
 given_name: Andy
 family_name: Harris
-gender: M
 birth_date: 1957-01-25
+gender: Male
+email: https://harris.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001052.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-1
 offices:
 - classification: capitol
-  address: 1536 Longworth House Office Building Washington DC 20515-2001
+  address: 1536 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5311
 - classification: district
-  address: 15 E. Churchville Rd. Suite 102B; Bel Air, MD 21014
-  voice: 410-588-5670
-  fax: 410-588-5673
-  name: 'District Office #1'
+  address: 100 E. Main St. Suite 702, Salisbury, MD 21801
+  voice: 443-944-8624
 - classification: district
-  address: 100 Olde Point Village Suite 101; Chester, MD 21619
+  address: 100 Olde Point Village Suite 101, Chester, MD 21619
   voice: 410-643-5425
-  fax: 410-643-5429
-  name: 'District Office #2'
 - classification: district
-  address: 100 E. Main St. Suite 702; Salisbury, MD 21801
-  voice: 443-944-8624
-  fax: 443-944-8625
-  name: 'District Office #3'
+  address: 15 E. Churchville Road Suite 102B, Bel Air, MD 21014
+  voice: 410-588-5670
+- classification: district
+  address: 306 High St., Cambridge, MD 21613
 links:
 - url: https://harris.house.gov
   note: website
+- url: https://harris.house.gov/
+other_names:
+- name: A. Harris
+- name: A.P. Harris
+- name: Harris, A.
 ids:
   twitter: RepAndyHarrisMD
   youtube: UCvUuV7FiJfJi1yux4qozgMg
@@ -102,3 +102,10 @@ other_identifiers:
   identifier: Andrew Harris
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andrew_Harris
+- url: https://en.wikipedia.org/wiki/Andrew_P._Harris
+- url: https://harris.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/19157/andy-harris
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andy_harris/412434
+- url: https://www.linkedin.com/in/andy-harris-6192491a
diff --git a/data/us/legislature/Andy-Kim-62227c11-1ad4-5395-b233-f1f526efc5b4.yml b/data/us/legislature/Andy-Kim-62227c11-1ad4-5395-b233-f1f526efc5b4.yml
index c63c690650..db04e69110 100644
--- a/data/us/legislature/Andy-Kim-62227c11-1ad4-5395-b233-f1f526efc5b4.yml
+++ b/data/us/legislature/Andy-Kim-62227c11-1ad4-5395-b233-f1f526efc5b4.yml
@@ -2,46 +2,54 @@ id: ocd-person/62227c11-1ad4-5395-b233-f1f526efc5b4
 name: Andy Kim
 given_name: Andy
 family_name: Kim
-gender: M
 birth_date: 1982-07-12
+gender: Male
+email: https://kim.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/K000394.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-3
 offices:
 - classification: capitol
-  address: 2444 Rayburn House Office Building Washington DC 20515-3003
+  address: 2444 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4765
+  fax: 202-225-0778
 - classification: district
-  address: 535 E Main St; Marlton, NJ 08053-2301
-  name: 'District Office #1'
+  address: 30 Mechanic St., Freehold, NJ 07728
+  voice: 732-504-0490
 - classification: district
-  address: 33 Washington St; Toms River, NJ 08753-7642
-  name: 'District Office #2'
+  address: 429 John F. Kennedy Way P.O. Box 9, Willingboro, NJ 08046
+  voice: 856-703-2700
+  fax: 856-369-8988
+- classification: district
+  address: 4573 S. Broad St., Hamilton, NJ 08620
+  voice: 609-438-6290
 links:
 - url: https://kim.house.gov
   note: website
-ids:
-  twitter: RepAndyKimNJ
+- url: https://kim.house.gov/
 other_names:
+- name: A. Kim
+- name: A.N. Kim
 - name: Kim (NJ)
+- name: Kim, A.
+ids:
+  twitter: RepAndyKimNJ
 other_identifiers:
 - scheme: bioguide
   identifier: K000394
@@ -65,3 +73,10 @@ other_identifiers:
   identifier: '179640'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Andrew_Kim_(New_Jersey)
+- url: https://en.wikipedia.org/wiki/Andy_Kim_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/179640/andy-kim
+- url: https://kim.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/andy_kim/412797
+- url: https://www.linkedin.com/in/andy-kim-511969
diff --git a/data/us/legislature/Angie-Craig-6b47c0e2-77d5-5126-b7a5-82bea8fb9c67.yml b/data/us/legislature/Angie-Craig-6b47c0e2-77d5-5126-b7a5-82bea8fb9c67.yml
index 5f4a03c551..d08b40a3a7 100644
--- a/data/us/legislature/Angie-Craig-6b47c0e2-77d5-5126-b7a5-82bea8fb9c67.yml
+++ b/data/us/legislature/Angie-Craig-6b47c0e2-77d5-5126-b7a5-82bea8fb9c67.yml
@@ -2,40 +2,43 @@ id: ocd-person/6b47c0e2-77d5-5126-b7a5-82bea8fb9c67
 name: Angie Craig
 given_name: Angie
 family_name: Craig
-gender: F
 birth_date: 1972-02-14
+gender: Female
+email: https://craig.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001119.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-2
 offices:
 - classification: capitol
-  address: 2442 Rayburn House Office Building Washington DC 20515-2302
+  address: 2442 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2271
 - classification: district
-  address: 12940 Harriet Ave S Suite 238; Burnsville, MN 55337-2680
+  address: 1915 Plaza Drive Suite 202, Eagan, MN 55122
   voice: 651-846-2120
-  name: 'District Office #1'
 links:
 - url: https://craig.house.gov
   note: website
+- url: https://craig.house.gov/
+other_names:
+- name: A. Craig
+- name: A.D. Craig
+- name: Craig, A.
 ids:
   twitter: RepAngieCraig
 other_identifiers:
@@ -61,3 +64,9 @@ other_identifiers:
   identifier: kg:/g/11fjb43ny7
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Angie_Craig
+- url: https://craig.house.gov
+- url: https://en.wikipedia.org/wiki/Angie_Craig
+- url: https://justfacts.votesmart.org/candidate/biography/166261/angie-craig
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/angie_craig/412789
diff --git a/data/us/legislature/Angus-S-King-Jr-273dd641-da15-5fc0-bdc9-496cc9b65fbd.yml b/data/us/legislature/Angus-S-King-Jr-273dd641-da15-5fc0-bdc9-496cc9b65fbd.yml
index 5a361f2c15..3758830ec1 100644
--- a/data/us/legislature/Angus-S-King-Jr-273dd641-da15-5fc0-bdc9-496cc9b65fbd.yml
+++ b/data/us/legislature/Angus-S-King-Jr-273dd641-da15-5fc0-bdc9-496cc9b65fbd.yml
@@ -1,58 +1,61 @@
 id: ocd-person/273dd641-da15-5fc0-bdc9-496cc9b65fbd
-name: Angus S. King, Jr.
+name: Angus King
 given_name: Angus
 family_name: King
-middle_name: S.
-gender: M
 birth_date: 1944-03-31
+gender: Male
+email: https://www.king.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/K000383.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Independent
+- name: Independent
 roles:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
 offices:
 - classification: capitol
-  address: 133 Hart Senate Office Building Washington DC 20510
+  address: 133 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5344
 - classification: district
-  address: 4 Gabriel Dr. Suite 3; Augusta, ME 04330
-  voice: 207-622-8292
-  name: 'District Office #1'
-- classification: district
-  address: 202 Harlow St. Suite 20350; Bangor, ME 04401
-  voice: 207-945-8000
-  name: 'District Office #2'
+  address: 1 Pleasant St. Suite 4W, Portland, ME 04101
+  voice: 207-245-1565
 - classification: district
-  address: 169 Academy St. Suite A; Presque Isle, ME 04769
+  address: 167 Academy St. Suite A, Presque Isle, ME 04769
   voice: 207-764-5124
-  name: 'District Office #3'
 - classification: district
-  address: 227 Main Street; Biddeford, ME 04005
+  address: 202 Harlow St. Suite 20350, Bangor, ME 04401
+  voice: 207-945-8000
+- classification: district
+  address: 227 Main St., Biddeford, ME 04005
   voice: 207-352-5216
-  name: 'District Office #4'
+- classification: district
+  address: 40 Western Ave., E.S. Muskie Federal Building Room 412, Augusta, ME 04330
+  voice: 207-622-8292
+  fax: 207-621-1286
 links:
 - url: https://www.king.senate.gov
   note: website
 - url: https://www.king.senate.gov/contact
   note: contact form
+- url: https://www.king.senate.gov/
+other_names:
+- name: A. King
+- name: A.S. King
+- name: Angus S. King
+- name: Angus S. King, Jr.
+- name: King (I-ME)
+- name: King, A.
 ids:
   twitter: SenAngusKing
   youtube: UCpp6lGvrmt0XU_lnD4Ak0gA
   facebook: SenatorAngusSKingJr
-other_names:
-- name: Angus S. King
-- name: King (I-ME)
 other_identifiers:
 - scheme: bioguide
   identifier: K000383
@@ -84,3 +87,8 @@ other_identifiers:
   identifier: kg:/m/02hfx0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Angus_King
+- url: https://en.wikipedia.org/wiki/Angus_King
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/angus_king/412545
+- url: https://www.king.senate.gov
diff --git a/data/us/legislature/Ann-M-Kuster-7ed34023-b42f-57bc-af69-b36a680122f2.yml b/data/us/legislature/Ann-M-Kuster-7ed34023-b42f-57bc-af69-b36a680122f2.yml
index e7ffde9406..c3ac4f79ca 100644
--- a/data/us/legislature/Ann-M-Kuster-7ed34023-b42f-57bc-af69-b36a680122f2.yml
+++ b/data/us/legislature/Ann-M-Kuster-7ed34023-b42f-57bc-af69-b36a680122f2.yml
@@ -1,67 +1,68 @@
 id: ocd-person/7ed34023-b42f-57bc-af69-b36a680122f2
-name: Ann M. Kuster
+name: Ann Kuster
 given_name: Ann
 family_name: Kuster
-middle_name: M.
-gender: F
 birth_date: 1956-09-05
+gender: Female
+email: https://kuster.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/K000382.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-2
 offices:
 - classification: capitol
-  address: 2201 Rayburn House Office Building Washington DC 20515-2902
+  address: 2201 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5206
+  fax: 202-225-2946
 - classification: district
-  address: 18 N. Main St. Fourth Floor; Concord, NH 03301
+  address: 18 N. Main St. 4th Floor, Concord, NH 03301
   voice: 603-226-1002
   fax: 603-226-1010
-  name: 'District Office #1'
 - classification: district
-  address: 33 Main St. Suite 202; Littleton, NH 03561
-  voice: 603-444-7700
-  name: 'District Office #2'
-- classification: district
-  address: 184 Main Street Suite 222; Nashua, NH 03060
+  address: 184 Main St. Suite 222, Nashua, NH 03060
   voice: 603-595-2006
-  fax: 603-595-2016
-  name: 'District Office #3'
+- classification: district
+  address: 33 Main St. Suite 202, Littleton, NH 03561
+  voice: 603-444-7700
 links:
 - url: https://kuster.house.gov
   note: website
+- url: https://kuster.house.gov/
+other_names:
+- name: A. Kuster
+- name: A.L.M. Kuster
+- name: Ann M. Kuster
+- name: Kuster, A.
 ids:
   twitter: RepAnnieKuster
   youtube: UCYAD_Eti2b5gXSicbgPsBYA
@@ -97,3 +98,8 @@ other_identifiers:
   identifier: kg:/m/064p47_
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Annie_Kuster
+- url: https://en.wikipedia.org/wiki/Ann_McLane_Kuster
+- url: https://kuster.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ann_kuster/412557
diff --git a/data/us/legislature/Ann-Wagner-12958b9f-2301-5bdb-bf13-81b3de147574.yml b/data/us/legislature/Ann-Wagner-12958b9f-2301-5bdb-bf13-81b3de147574.yml
index daca55a95f..927306531d 100644
--- a/data/us/legislature/Ann-Wagner-12958b9f-2301-5bdb-bf13-81b3de147574.yml
+++ b/data/us/legislature/Ann-Wagner-12958b9f-2301-5bdb-bf13-81b3de147574.yml
@@ -2,56 +2,61 @@ id: ocd-person/12958b9f-2301-5bdb-bf13-81b3de147574
 name: Ann Wagner
 given_name: Ann
 family_name: Wagner
-gender: F
 birth_date: 1962-09-13
+gender: Female
+email: https://wagner.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/W000812.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-2
 offices:
 - classification: capitol
-  address: 2350 Rayburn House Office Building Washington DC 20515-2502
+  address: 2350 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1621
 - classification: district
-  address: 301 Sovereign Ct. Suite 201; Ballwin, MO 63011
+  address: 301 Sovereign Court Suite 201, Ballwin, MO 63011
   voice: 636-779-5449
-  fax: 636-779-5449
-  name: 'District Office #1'
+- classification: district
+  address: 516 Jefferson St., Washington, MO 63090
+  voice: 636-231-1001
 links:
 - url: https://wagner.house.gov
   note: website
+- url: https://wagner.house.gov/
+other_names:
+- name: A. Wagner
+- name: A.L. Wagner
+- name: Wagner, A.
 ids:
   twitter: RepAnnWagner
   youtube: UCy2v2DXXvQnbRc8Zx77Dnsg
@@ -87,3 +92,10 @@ other_identifiers:
   identifier: kg:/m/07q9w8
 sources:
 - url: https://theunitedstates.io/
+- url: https://annwagner.com/about
+- url: https://ballotpedia.org/Ann_Wagner
+- url: https://en.wikipedia.org/wiki/Ann_Wagner
+- url: https://theunitedstates.io
+- url: https://wagner.house.gov
+- url: https://wagner.house.gov/about/meet-ann
+- url: https://www.govtrack.us/congress/members/ann_wagner/412548
diff --git a/data/us/legislature/Anna-G-Eshoo-047b7a92-9713-54e5-8429-bcd2214908c7.yml b/data/us/legislature/Anna-G-Eshoo-047b7a92-9713-54e5-8429-bcd2214908c7.yml
index 2a369f85a9..b979a8e495 100644
--- a/data/us/legislature/Anna-G-Eshoo-047b7a92-9713-54e5-8429-bcd2214908c7.yml
+++ b/data/us/legislature/Anna-G-Eshoo-047b7a92-9713-54e5-8429-bcd2214908c7.yml
@@ -1,108 +1,112 @@
 id: ocd-person/047b7a92-9713-54e5-8429-bcd2214908c7
-name: Anna G. Eshoo
+name: Anna Eshoo
 given_name: Anna
 family_name: Eshoo
-middle_name: G.
-gender: F
 birth_date: 1942-12-13
+gender: Female
+email: https://eshoo.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/E000215.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: CA-16
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: CA-18
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-18
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-18
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-18
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-18
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-14
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-14
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-14
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-14
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-14
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-14
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-14
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-14
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-14
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
+  district: CA-14
 offices:
 - classification: capitol
-  address: 272 Cannon House Office Building Washington DC 20515-0516
+  address: 272 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-8104
+  fax: 202-225-8890
 - classification: district
-  address: 698 Emerson St.; Palo Alto, CA 94301
+  address: 698 Emerson St., Palo Alto, CA 94301
   voice: 650-323-2984
   fax: 650-323-3498
-  name: 'District Office #1'
 links:
 - url: https://eshoo.house.gov
   note: website
+- url: https://eshoo.house.gov/
+other_names:
+- name: A. Eshoo
+- name: A.G. Eshoo
+- name: Anna G. Eshoo
+- name: Eshoo, A.
 ids:
   twitter: RepAnnaEshoo
   youtube: UCjRvhco2d59GBgA78IIIaYQ
@@ -138,3 +142,12 @@ other_identifiers:
   identifier: Anna Eshoo
 sources:
 - url: https://theunitedstates.io/
+- url: https://annaeshoo4congress.com/about
+- url: https://ballotpedia.org/Anna_Eshoo
+- url: https://en.wikipedia.org/wiki/Anna_Eshoo
+- url: https://eshoo.house.gov
+- url: https://eshoo.house.gov/about-anna/biography
+- url: https://justfacts.votesmart.org/candidate/biography/26741/anna-eshoo
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/anna_eshoo/400124
+- url: https://www.linkedin.com/in/anna-eshoo-b0392095
diff --git a/data/us/legislature/Anna-Paulina-Luna-d18ec0cb-328b-54c8-8785-5f924799f5fe.yml b/data/us/legislature/Anna-Paulina-Luna-d18ec0cb-328b-54c8-8785-5f924799f5fe.yml
index f2b9a1b980..77ee5f6d4c 100644
--- a/data/us/legislature/Anna-Paulina-Luna-d18ec0cb-328b-54c8-8785-5f924799f5fe.yml
+++ b/data/us/legislature/Anna-Paulina-Luna-d18ec0cb-328b-54c8-8785-5f924799f5fe.yml
@@ -1,32 +1,38 @@
 id: ocd-person/d18ec0cb-328b-54c8-8785-5f924799f5fe
-name: Anna Paulina Luna
+name: Anna Luna
 given_name: Anna
-family_name: Paulina Luna
-middle_name: (Paulina)
-gender: F
+family_name: Luna
 birth_date: 1989-05-06
+gender: Female
+email: https://luna.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000596.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-13
 offices:
 - classification: capitol
-  address: 1017 Longworth House Office Building Washington DC 20515-0913
+  address: 1017 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5961
+- classification: district
+  address: 9200 113th St. North Suite 305, Seminole, FL 33772
+  voice: 727-610-3980
 links:
 - url: https://luna.house.gov
   note: website
-ids:
-  twitter: RepLuna
+- url: https://luna.house.gov/
 other_names:
+- name: A. Luna
+- name: A.P. Luna
+- name: Anna Paulina Luna
 - name: Luna
+- name: Luna, A.
+ids:
+  twitter: RepLuna
 other_identifiers:
 - scheme: bioguide
   identifier: L000596
@@ -46,3 +52,11 @@ other_identifiers:
   identifier: Anna Paulina Luna
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Anna_Paulina_Luna
+- url: https://en.wikipedia.org/wiki/Anna_Paulina_Luna
+- url: https://justfacts.votesmart.org/candidate/191344/anna-luna
+- url: https://justfacts.votesmart.org/candidate/biography/191344/anna-luna
+- url: https://luna.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/anna_paulina_luna/456891
+- url: https://www.linkedin.com/in/realannapaulina
diff --git a/data/us/legislature/Anthony-DEsposito-e024e123-9750-5f4e-bc3d-6d892218868d.yml b/data/us/legislature/Anthony-DEsposito-e024e123-9750-5f4e-bc3d-6d892218868d.yml
index 9c524bef0c..329b36dd6a 100644
--- a/data/us/legislature/Anthony-DEsposito-e024e123-9750-5f4e-bc3d-6d892218868d.yml
+++ b/data/us/legislature/Anthony-DEsposito-e024e123-9750-5f4e-bc3d-6d892218868d.yml
@@ -1,28 +1,35 @@
 id: ocd-person/e024e123-9750-5f4e-bc3d-6d892218868d
-name: "Anthony D\u2019Esposito"
+name: Anthony D'Esposito
 given_name: Anthony
 family_name: D'Esposito
-middle_name: P.
-gender: M
 birth_date: 1982-02-22
+gender: Male
+email: https://desposito.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/D000632.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-4
 offices:
 - classification: capitol
-  address: 1508 Longworth House Office Building Washington DC 20515-3204
+  address: 1508 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5516
+- classification: district
+  address: 229 7th St. Suite 102, Garden City, NY 11530
+  voice: 516-739-3008
 links:
 - url: https://desposito.house.gov
   note: website
+- url: https://desposito.house.gov/
+other_names:
+- name: A. D'Esposito
+- name: A.P. D'Esposito
+- name: "Anthony D\u2019Esposito"
+- name: D'Esposito, A.
 ids:
   twitter: RepDesposito
 other_identifiers:
@@ -44,3 +51,10 @@ other_identifiers:
   identifier: '174091'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Anthony_D%27Esposito
+- url: https://desposito.house.gov
+- url: https://en.wikipedia.org/wiki/Anthony_D'Esposito
+- url: https://justfacts.votesmart.org/candidate/174091/anthony-desposito
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/anthony_desposito/456922
+- url: https://www.linkedin.com/in/anthony-d-esposito-b734b26b
diff --git a/data/us/legislature/Ashley-Hinson-50705d33-6967-5424-8f57-7df22ecbc6e6.yml b/data/us/legislature/Ashley-Hinson-50705d33-6967-5424-8f57-7df22ecbc6e6.yml
index cdbd5af22a..cab1798e44 100644
--- a/data/us/legislature/Ashley-Hinson-50705d33-6967-5424-8f57-7df22ecbc6e6.yml
+++ b/data/us/legislature/Ashley-Hinson-50705d33-6967-5424-8f57-7df22ecbc6e6.yml
@@ -2,31 +2,44 @@ id: ocd-person/50705d33-6967-5424-8f57-7df22ecbc6e6
 name: Ashley Hinson
 given_name: Ashley
 family_name: Hinson
-gender: F
 birth_date: 1983-06-27
+gender: Female
+email: https://hinson.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001091.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: IA-2
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-2
+  district: IA-1
 offices:
 - classification: capitol
-  address: 1717 Longworth House Office Building Washington DC 20515-1502
+  address: 1717 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2911
+- classification: district
+  address: 1050 Main St., Dubuque, IA 52001
+  voice: 563-557-7789
+- classification: district
+  address: 111 7th Ave. SE Suite 580, Cedar Rapids, IA 52401
+  voice: 319-364-2288
+- classification: district
+  address: 531 Commercial St. Suite 302, Waterloo, IA 50701
+  voice: 319-266-6925
 links:
 - url: https://hinson.house.gov
   note: website
+- url: https://hinson.house.gov/
+other_names:
+- name: A. Hinson
+- name: A.E. Hinson
+- name: Hinson, A.
 ids:
   twitter: RepAshleyHinson
 other_identifiers:
@@ -50,3 +63,10 @@ other_identifiers:
   identifier: Ashley Hinson
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ashley_Hinson
+- url: https://en.wikipedia.org/wiki/Ashley_Hinson
+- url: https://hinson.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/168783/ashley-hinson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ashley_hinson/456816
+- url: https://www.linkedin.com/in/ashleyhinson
diff --git a/data/us/legislature/August-Pfluger-2519c079-f97e-532b-b53e-167398fd7398.yml b/data/us/legislature/August-Pfluger-2519c079-f97e-532b-b53e-167398fd7398.yml
index bd453c4a34..820ffdb2f7 100644
--- a/data/us/legislature/August-Pfluger-2519c079-f97e-532b-b53e-167398fd7398.yml
+++ b/data/us/legislature/August-Pfluger-2519c079-f97e-532b-b53e-167398fd7398.yml
@@ -2,32 +2,54 @@ id: ocd-person/2519c079-f97e-532b-b53e-167398fd7398
 name: August Pfluger
 given_name: August
 family_name: Pfluger
-middle_name: Lee
-gender: M
 birth_date: 1978-12-28
+gender: Male
+email: https://pfluger.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/P000048.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-11
 offices:
 - classification: capitol
-  address: 1124 Longworth House Office Building Washington DC 20515-4311
+  address: 1124 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3605
+- classification: district
+  address: 135 W. Twohig Ave. Suite B, San Angelo, TX 76903
+  voice: 325-659-4010
+- classification: district
+  address: 6 Desta Drive Suite 2000, Midland, TX 79705
+  voice: 432-687-2390
+- classification: district
+  address: Brownwood City Hall 501 Center Ave., Brownwood, TX 76801
+  voice: 325-646-1950
+- classification: district
+  address: County Annex 104 W. Sandstone St., Llano, TX 78643
+  voice: 325-247-2826
+- classification: district
+  address: Ector County Courthouse, Administration Building 1010 E. 8th St., Odessa,
+    TX 79761
+  voice: 432-331-9667
+- classification: district
+  address: Pratt Learning and Leadership Center 505 E. Jasper Drive, Killeen, TX 76541
+  voice: 254-669-6570
 links:
 - url: https://pfluger.house.gov
   note: website
+- url: https://pfluger.house.gov/
+other_names:
+- name: A. Pfluger
+- name: A.L. Pfluger
+- name: Pfluger, A.
 ids:
   twitter: RepPfluger
 other_identifiers:
@@ -47,3 +69,11 @@ other_identifiers:
   identifier: kg:/g/11f3szpd4x
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/August_Pfluger
+- url: https://en.wikipedia.org/wiki/August_Pfluger
+- url: https://justfacts.votesmart.org/candidate/biography/188165/august-pfluger
+- url: https://pfluger.house.gov
+- url: https://theunitedstates.io
+- url: https://www.augustpfluger.com/#mystory
+- url: https://www.govtrack.us/congress/members/august_pfluger/456846
+- url: https://www.linkedin.com/in/august-pfluger-23240577
diff --git a/data/us/legislature/Aumua-Amata-Coleman-Radewagen-eb3fa86b-690c-5cc0-8f5e-54af60f28a06.yml b/data/us/legislature/Aumua-Amata-Coleman-Radewagen-eb3fa86b-690c-5cc0-8f5e-54af60f28a06.yml
index 940c258486..50573ff15c 100644
--- a/data/us/legislature/Aumua-Amata-Coleman-Radewagen-eb3fa86b-690c-5cc0-8f5e-54af60f28a06.yml
+++ b/data/us/legislature/Aumua-Amata-Coleman-Radewagen-eb3fa86b-690c-5cc0-8f5e-54af60f28a06.yml
@@ -1,53 +1,57 @@
 id: ocd-person/eb3fa86b-690c-5cc0-8f5e-54af60f28a06
-name: Aumua Amata Coleman Radewagen
-given_name: Aumua Amata
+name: Amata Radewagen
+given_name: Amata
 family_name: Radewagen
-middle_name: Coleman
-gender: F
 birth_date: 1947-12-29
+gender: Female
+email: https://radewagen.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/R000600.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AS-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AS-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AS-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AS-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AS-AL
 offices:
 - classification: capitol
-  address: 2001 Rayburn House Office Building Washington DC 20515-5200
+  address: 2001 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8577
+  fax: 202-225-8757
 - classification: district
-  address: 1 Fagatogo Square PO Box 5859; Pago Pago, AS 96799
+  address: P.O. Box 5859 1 Fagatogo Square, Pago Pago, AS 96799
   voice: 684-633-3601
   fax: 684-633-3607
-  name: 'District Office #1'
 links:
 - url: https://radewagen.house.gov
   note: website
+- url: https://radewagen.house.gov/
+other_names:
+- name: A. Radewagen
+- name: A.C.C. Radewagen
+- name: Aumua Amata Coleman Radewagen
+- name: Radewagen, A.
 ids:
   twitter: RepAmata
   youtube: UCGdrLQbt1PYDTPsampx4t1A
@@ -81,3 +85,12 @@ other_identifiers:
   identifier: Amata Radewagen
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Aumua_Amata
+- url: https://en.wikipedia.org/wiki/Aumua_Amata
+- url: https://justfacts.votesmart.org/candidate/biography/128380/aumua-amata-radewagen
+- url: https://radewagen.house.gov
+- url: https://radewagen.house.gov/about/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/aumua_amata_radewagen/412664
+- url: https://www.linkedin.com/in/amata-c-radewagen-9988348
+- url: https://www.linkedin.com/in/aumua-amata-194a1a28
diff --git a/data/us/legislature/Austin-Scott-20c33933-79f5-58d1-834c-60779932257e.yml b/data/us/legislature/Austin-Scott-20c33933-79f5-58d1-834c-60779932257e.yml
index 8486471045..fe269d7788 100644
--- a/data/us/legislature/Austin-Scott-20c33933-79f5-58d1-834c-60779932257e.yml
+++ b/data/us/legislature/Austin-Scott-20c33933-79f5-58d1-834c-60779932257e.yml
@@ -2,72 +2,74 @@ id: ocd-person/20c33933-79f5-58d1-834c-60779932257e
 name: Austin Scott
 given_name: Austin
 family_name: Scott
-gender: M
 birth_date: 1969-12-10
+gender: Male
+email: https://austinscott.house.gov/contact-austin
 image: https://theunitedstates.io/images/congress/450x550/S001189.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-8
 offices:
 - classification: capitol
-  address: 2185 Rayburn House Office Building Washington DC 20515-1008
+  address: 2185 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6531
+  fax: 202-225-3013
 - classification: district
-  address: 127-B N. Central Ave.; Tifton, GA 31794
-  voice: 229-396-5175
-  fax: 229-396-5179
-  name: 'District Office #1'
-- classification: district
-  address: 230 Margie Dr. Suite 500; Warner Robins, GA 31088
+  address: 120 Byrd Way Suite 100, Warner Robins, GA 31088
   voice: 478-971-1776
   fax: 478-971-1778
-  name: 'District Office #2'
+- classification: district
+  address: 127-B N. Central Ave., Tifton, GA 31794
+  voice: 229-396-5175
+  fax: 229-396-5179
 links:
 - url: https://austinscott.house.gov
   note: website
+- url: https://austinscott.house.gov/
+other_names:
+- name: A. Scott
+- name: J.A. Scott
+- name: Scott, A.
+- name: Scott, Austin
 ids:
   twitter: AustinScottGA08
   youtube: UC5M7eKHKQStktMyjieiHYZQ
   facebook: RepAustinScott
-other_names:
-- name: Scott, Austin
 other_identifiers:
 - scheme: bioguide
   identifier: S001189
@@ -99,3 +101,10 @@ other_identifiers:
   identifier: kg:/m/076zn3y
 sources:
 - url: https://theunitedstates.io/
+- url: https://austinscott.house.gov
+- url: https://austinscott.house.gov/biography
+- url: https://ballotpedia.org/Austin_Scott
+- url: https://en.wikipedia.org/wiki/Austin_Scott_%28politician%29
+- url: https://justfacts.votesmart.org/candidate/11812/austin-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/austin_scott/412417
diff --git a/data/us/legislature/Ayanna-Pressley-ab80da0d-902f-5d28-b765-1885853182bd.yml b/data/us/legislature/Ayanna-Pressley-ab80da0d-902f-5d28-b765-1885853182bd.yml
index 11c41b3acb..991e461986 100644
--- a/data/us/legislature/Ayanna-Pressley-ab80da0d-902f-5d28-b765-1885853182bd.yml
+++ b/data/us/legislature/Ayanna-Pressley-ab80da0d-902f-5d28-b765-1885853182bd.yml
@@ -2,39 +2,45 @@ id: ocd-person/ab80da0d-902f-5d28-b765-1885853182bd
 name: Ayanna Pressley
 given_name: Ayanna
 family_name: Pressley
-gender: F
 birth_date: 1974-02-03
+gender: Female
+email: https://pressley.house.gov/contact-us/
 image: https://theunitedstates.io/images/congress/450x550/P000617.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
 offices:
 - classification: capitol
-  address: 402 Cannon House Office Building Washington DC 20515-2107
+  address: 402 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5111
+  fax: 202-225-9322
 - classification: district
-  address: 1700 Dorchester Ave; Boston, MA 02122-1373
-  name: 'District Office #1'
+  address: 1295 River St., Hyde Park, MA 02136
+  voice: 617-850-0040
+  fax: 202-225-9322
 links:
 - url: https://pressley.house.gov
   note: website
+- url: https://pressley.house.gov/
+other_names:
+- name: A. Pressley
+- name: A.S. Pressley
+- name: Pressley, A.
 ids:
   twitter: RepPressley
 other_identifiers:
@@ -60,3 +66,9 @@ other_identifiers:
   identifier: Ayanna Pressley
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ayanna_Pressley
+- url: https://en.wikipedia.org/wiki/Ayanna_Pressley
+- url: https://pressley.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ayanna_pressley/412782
+- url: https://www.linkedin.com/in/ayannapressley
diff --git a/data/us/legislature/Barbara-Lee-3cbc3ca2-4447-50e2-abed-ba3fe86569d8.yml b/data/us/legislature/Barbara-Lee-3cbc3ca2-4447-50e2-abed-ba3fe86569d8.yml
index 83c5322219..38b9dc6b47 100644
--- a/data/us/legislature/Barbara-Lee-3cbc3ca2-4447-50e2-abed-ba3fe86569d8.yml
+++ b/data/us/legislature/Barbara-Lee-3cbc3ca2-4447-50e2-abed-ba3fe86569d8.yml
@@ -2,114 +2,105 @@ id: ocd-person/3cbc3ca2-4447-50e2-abed-ba3fe86569d8
 name: Barbara Lee
 given_name: Barbara
 family_name: Lee
-gender: F
 birth_date: 1946-07-16
+gender: Female
+email: https://lee.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/L000551.jpg
 party:
-- start_date: '1998-04-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1998-04-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-12
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-13
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-13
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-13
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-13
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-13
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-13
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-9
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-13
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-9
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-13
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-9
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-9
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-9
+- start_date: 1998-04-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
+  district: CA-9
 offices:
 - classification: capitol
-  address: 2470 Rayburn House Office Building Washington DC 20515-0512
+  address: 2470 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2661
+  fax: 202-225-9817
 - classification: district
-  address: 1550 Oak St. 2nd Floor Staff Room; Alameda, CA 94501
-  name: 'District Office #1'
-- classification: district
-  address: 1249 Marin Ave.; Albany, CA 94706
-  name: 'District Office #2'
-- classification: district
-  address: 1301 Clay St. Suite 1000-N; Oakland, CA 94612
+  address: 1 Kaiser Plaza Suite 1010, Oakland, CA 94612
   voice: 510-763-0370
   fax: 510-763-6538
-  name: 'District Office #3'
-- classification: district
-  address: 1470 Fruitvale Ave.; Oakland, CA 94601
-  name: 'District Office #4'
-- classification: district
-  address: 300 Estudillo Ave.; San Leandro, CA 94577
-  name: 'District Office #5'
 links:
 - url: https://lee.house.gov
   note: website
+- url: https://lee.house.gov/
+other_names:
+- name: B. Lee
+- name: B.J. Lee
+- name: Lee (CA)
+- name: Lee, B.
 ids:
   twitter: RepBarbaraLee
   youtube: UCnRgK2MXAQOUau0JXqseeNA
   facebook: RepBarbaraLee
-other_names:
-- name: Lee (CA)
 other_identifiers:
 - scheme: bioguide
   identifier: L000551
@@ -141,3 +132,9 @@ other_identifiers:
   identifier: Barbara Lee (California)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Barbara_Lee_(California)
+- url: https://en.wikipedia.org/wiki/Barbara_Lee
+- url: https://justfacts.votesmart.org/candidate/8315/barbara-lee
+- url: https://lee.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/barbara_lee/400237
diff --git a/data/us/legislature/Barry-Loudermilk-13e07344-3cec-5f29-a27b-2dd6979dbeb5.yml b/data/us/legislature/Barry-Loudermilk-13e07344-3cec-5f29-a27b-2dd6979dbeb5.yml
index 813ec81e5f..f5d113b65e 100644
--- a/data/us/legislature/Barry-Loudermilk-13e07344-3cec-5f29-a27b-2dd6979dbeb5.yml
+++ b/data/us/legislature/Barry-Loudermilk-13e07344-3cec-5f29-a27b-2dd6979dbeb5.yml
@@ -2,60 +2,58 @@ id: ocd-person/13e07344-3cec-5f29-a27b-2dd6979dbeb5
 name: Barry Loudermilk
 given_name: Barry
 family_name: Loudermilk
-gender: M
 birth_date: 1963-12-22
+gender: Male
+email: https://loudermilk.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/L000583.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-11
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-11
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-11
 offices:
 - classification: capitol
-  address: 2133 Rayburn House Office Building Washington DC 20515-1011
+  address: 2133 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2931
+  fax: 202-225-2944
 - classification: district
-  address: 600 Galleria Pkwy. Suite 120; Atlanta, GA 30339
+  address: 135 W. Cherokee Ave. Suite 122, Cartersville, GA 30120
   voice: 770-429-1776
-  fax: 678-556-5184
-  name: 'District Office #1'
 - classification: district
-  address: 135 W. Cherokee Ave. Suite 122; Cartersville, GA 30120
-  voice: 770-429-1776
-  name: 'District Office #2'
-- classification: district
-  address: 9898 Highway 92 Suite 100; Woodstock, GA 30188
+  address: 9898 Highway 92 Suite 100, Woodstock, GA 30188
   voice: 770-429-1776
   fax: 770-517-7427
-  name: 'District Office #3'
 links:
 - url: https://loudermilk.house.gov
   note: website
+- url: https://loudermilk.house.gov/
+other_names:
+- name: B. Loudermilk
+- name: B.D. Loudermilk
+- name: Loudermilk, B.
 ids:
   twitter: RepLoudermilk
   youtube: UC2Kfw8fjca8k3w3KpzL5tNg
@@ -89,3 +87,11 @@ other_identifiers:
   identifier: Barry Loudermilk
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Barry_Loudermilk
+- url: https://en.wikipedia.org/wiki/Barry_Loudermilk
+- url: https://justfacts.votesmart.org/candidate/biography/31618/barry-loudermilk
+- url: https://loudermilk.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/barry_loudermilk/412624
+- url: https://www.linkedin.com/in/barry-loudermilk-8b246425
+- url: https://www.standwithbarry.com/about
diff --git a/data/us/legislature/Barry-Moore-b242258c-669a-53a7-be30-5f529f03398e.yml b/data/us/legislature/Barry-Moore-b242258c-669a-53a7-be30-5f529f03398e.yml
index 440b2cbed5..5ccc5736f7 100644
--- a/data/us/legislature/Barry-Moore-b242258c-669a-53a7-be30-5f529f03398e.yml
+++ b/data/us/legislature/Barry-Moore-b242258c-669a-53a7-be30-5f529f03398e.yml
@@ -2,35 +2,50 @@ id: ocd-person/b242258c-669a-53a7-be30-5f529f03398e
 name: Barry Moore
 given_name: Barry
 family_name: Moore
-gender: M
 birth_date: 1966-09-26
+gender: Male
+email: https://barrymoore.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001212.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-2
 offices:
 - classification: capitol
-  address: 1504 Longworth House Office Building Washington DC 20515-0102
+  address: 1504 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2901
+- classification: district
+  address: 217 Graceland Drive, Dothan, AL 36305
+  voice: 334-547-6630
+- classification: district
+  address: 307 Elm St., Troy, AL 36081
+  voice: 334-465-7244
+- classification: district
+  address: 408 S. Main St. Suite 200, Wetumpka, AL 36092
+  voice: 334-478-6330
+- classification: district
+  address: 505 E. 3 Notch St. Suite 322, Andalusia, AL 36420
+  voice: 334-428-1129
+  fax: 334-222-3342
 links:
 - url: https://barrymoore.house.gov
   note: website
-ids:
-  twitter: RepBarryMoore
 other_names:
+- name: B. Moore
+- name: F.B. Moore
 - name: Moore (AL)
+- name: Moore, B.
+ids:
+  twitter: RepBarryMoore
 other_identifiers:
 - scheme: bioguide
   identifier: M001212
@@ -50,3 +65,11 @@ other_identifiers:
   identifier: Barry Moore (Alabama)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Barry_Moore_(Alabama)
+- url: https://barrymoore.house.gov
+- url: https://barrymooreforcongress.com/#MeetBarry
+- url: https://en.wikipedia.org/wiki/Barry_Moore_(Alabama_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/121792/barry-moore
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/barry_moore/456800
+- url: https://www.linkedin.com/in/barry-moore-09371717
diff --git a/data/us/legislature/Becca-Balint-510c6c69-df0f-5b09-b4c7-066256ace832.yml b/data/us/legislature/Becca-Balint-510c6c69-df0f-5b09-b4c7-066256ace832.yml
index 2c1223a775..56bf635695 100644
--- a/data/us/legislature/Becca-Balint-510c6c69-df0f-5b09-b4c7-066256ace832.yml
+++ b/data/us/legislature/Becca-Balint-510c6c69-df0f-5b09-b4c7-066256ace832.yml
@@ -2,27 +2,36 @@ id: ocd-person/510c6c69-df0f-5b09-b4c7-066256ace832
 name: Becca Balint
 given_name: Becca
 family_name: Balint
-middle_name: A.
-gender: F
 birth_date: 1968-05-04
+gender: Female
+email: https://balint.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001318.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
 offices:
 - classification: capitol
-  address: 1408 Longworth House Office Building Washington DC 20515-4500
+  address: 1408 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4115
+  fax: 771-200-5791
+- classification: district
+  address: 159 Bank St. Suite 204, Burlington, VT 05401
+  voice: 802-652-2450
+  fax: 771-200-5791
 links:
 - url: https://balint.house.gov
   note: website
+- url: https://legislature.vermont.gov/people/single/2022/24029
+- url: https://balint.house.gov/
+other_names:
+- name: B. Balint
+- name: Balint, B.
+- name: R.A. Balint
 ids:
   twitter: RepBeccaB
 other_identifiers:
@@ -44,3 +53,9 @@ other_identifiers:
   identifier: '154056'
 sources:
 - url: https://theunitedstates.io/
+- url: https://balint.house.gov
+- url: https://ballotpedia.org/Becca_Balint
+- url: https://en.wikipedia.org/wiki/Becca_Balint
+- url: https://justfacts.votesmart.org/candidate/biography/154056/becca-balint
+- url: https://legislature.vermont.gov/people/single/2022/24029
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Ben-Cline-bb0d60f6-19a4-5229-a67d-a1d428e7c0b2.yml b/data/us/legislature/Ben-Cline-bb0d60f6-19a4-5229-a67d-a1d428e7c0b2.yml
index 2b6cc3ec58..68b8c809ee 100644
--- a/data/us/legislature/Ben-Cline-bb0d60f6-19a4-5229-a67d-a1d428e7c0b2.yml
+++ b/data/us/legislature/Ben-Cline-bb0d60f6-19a4-5229-a67d-a1d428e7c0b2.yml
@@ -2,56 +2,58 @@ id: ocd-person/bb0d60f6-19a4-5229-a67d-a1d428e7c0b2
 name: Ben Cline
 given_name: Ben
 family_name: Cline
-gender: M
 birth_date: 1972-02-29
+gender: Male
+email: https://cline.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001118.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-6
 offices:
 - classification: capitol
-  address: 2443 Rayburn House Office Building Washington DC 20515-4606
+  address: 2443 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5431
+  fax: 540-857-2675
 - classification: district
-  address: 70 N Mason St Suite 110; Harrisonburg, VA 22802-4126
-  voice: 540-432-2391
-  fax: 540-432-6593
-  name: 'District Office #1'
-- classification: district
-  address: 916 Main St Suite 300; Lynchburg, VA 24504-1600
-  voice: 434-845-8306
-  fax: 434-845-8245
-  name: 'District Office #2'
-- classification: district
-  address: 10 Franklin Rd SE Suite 510; Roanoke, VA 24011-2133
+  address: 10 Franklin Road SE Suite 510, Roanoke, VA 24011
   voice: 540-857-2672
   fax: 540-857-2675
-  name: 'District Office #3'
 - classification: district
-  address: 117 S Lewis St Suite 215; Staunton, VA 24401-4282
+  address: 100 N. Loudoun St. Suite 120, Winchester, VA 22601
+  voice: 540-546-0876
+  fax: 540-857-2675
+- classification: district
+  address: 117 S. Lewis St. Suite 215, Staunton, VA 24401
   voice: 540-885-3861
-  fax: 540-885-3930
-  name: 'District Office #4'
+  fax: 540-857-2675
+- classification: district
+  address: 70 N. Mason St. Suite 110, Harrisonburg, VA 22802
+  voice: 540-432-2391
+  fax: 540-857-2675
 links:
 - url: https://cline.house.gov
   note: website
+- url: https://virginiageneralassembly.gov/house/members/members.php?id=H0161
+- url: https://cline.house.gov/
+other_names:
+- name: B. Cline
+- name: B.L. Cline
+- name: Cline, B.
 ids:
   twitter: RepBenCline
 other_identifiers:
@@ -77,3 +79,11 @@ other_identifiers:
   identifier: Ben Cline
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ben_Cline
+- url: https://cline.house.gov
+- url: https://en.wikipedia.org/wiki/Ben_Cline
+- url: https://justfacts.votesmart.org/candidate/biography/50959/ben-cline
+- url: https://theunitedstates.io
+- url: https://virginiageneralassembly.gov/house/members/members.php?id=H0161
+- url: https://www.govtrack.us/congress/members/ben_cline/412832
+- url: https://www.linkedin.com/in/ben-cline-7517406
diff --git a/data/us/legislature/Ben-Ray-Lujn-5f5817b7-43b0-5bb3-93de-0f838a801635.yml b/data/us/legislature/Ben-Ray-Lujn-5f5817b7-43b0-5bb3-93de-0f838a801635.yml
index f487cf3e82..38b6dfd8d8 100644
--- a/data/us/legislature/Ben-Ray-Lujn-5f5817b7-43b0-5bb3-93de-0f838a801635.yml
+++ b/data/us/legislature/Ben-Ray-Lujn-5f5817b7-43b0-5bb3-93de-0f838a801635.yml
@@ -1,95 +1,89 @@
 id: ocd-person/5f5817b7-43b0-5bb3-93de-0f838a801635
 name: "Ben Ray Luj\xE1n"
-given_name: Ben
+given_name: Ben Ray
 family_name: "Luj\xE1n"
-middle_name: Ray
-gender: M
 birth_date: 1972-06-07
+gender: Male
+email: https://www.lujan.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/L000570.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New Mexico
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New Mexico
 offices:
 - classification: capitol
-  address: 498 Russell Senate Office Building Washington DC 20510
+  address: 498 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6621
+  fax: 202-224-3370
 - classification: district
-  address: 800 Municipal Dr.; Farmington, NM 87401
-  voice: 505-324-1005
-  fax: 505-324-1026
-  name: 'District Office #1'
+  address: 100 S. Avenue A Suite 113, Portales, NM 88130
+  voice: 575-252-6188
+  fax: 833-702-2620
 - classification: district
-  address: 110 W. Aztec Ave.; Gallup, NM 87301
-  voice: 505-863-0582
-  fax: 505-863-0678
-  name: 'District Office #2'
+  address: 120 S. Federal Place Suite 302, Santa Fe, NM 87501
+  voice: 505-230-7040
+  fax: 833-702-2621
 - classification: district
-  address: 1103 National Ave Suite 210; Las Vegas, NM 87701-4024
-  voice: 505-454-3038
-  fax: 505-454-3265
-  name: 'District Office #3'
+  address: 201 N. Church St. Suite 201B, Las Cruces, NM 88001
+  voice: 575-288-4644
+  fax: 833-907-0887
 - classification: district
-  address: 3200 Civic Center NE Suite 330; Rio Rancho, NM 87144
-  voice: 505-994-0499
-  fax: 505-994-0550
-  name: 'District Office #4'
+  address: 500 Marquette Ave. NW Suite 1460, Albuquerque, NM 87102
+  voice: 505-337-7023
+  fax: 833-907-0886
 - classification: district
-  address: 1611 Calle Lorca Suite A; Santa Fe, NM 87505
-  voice: 505-984-8950
-  fax: 505-986-5047
-  name: 'District Office #5'
-- classification: district
-  address: 404 W. Route 66 Blvd.; Tucumcari, NM 88401
-  voice: 575-461-3029
-  fax: 575-461-3192
-  name: 'District Office #6'
+  address: New Mexico Highlands University 1103 National Ave. Suite 210, Las Vegas,
+    NM 87701
+  voice: 505-398-9465
+  fax: 833-907-0888
 links:
 - url: https://www.lujan.senate.gov
   note: website
 - url: https://www.lujan.senate.gov/contact/
   note: contact form
-ids:
-  twitter: SenatorLujan
+- url: https://www.lujan.senate.gov/
 other_names:
+- name: "B. Luj\xE1n"
+- name: "B.R. Luj\xE1n"
 - name: Ben R. Lujan
 - name: Lujan (D-NM)
+- name: "Luj\xE1n, B."
+ids:
+  twitter: SenatorLujan
 other_identifiers:
 - scheme: bioguide
   identifier: L000570
@@ -125,3 +119,9 @@ other_identifiers:
   identifier: "Ben Ray Luj\xE1n"
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ben_Ray_Luj%C3%A1n
+- url: https://en.wikipedia.org/wiki/Ben_Ray_Luj%C3%A1n
+- url: https://justfacts.votesmart.org/candidate/biography/102842/ben-lujan-jr
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ben_lujan/412293
+- url: https://www.lujan.senate.gov
diff --git a/data/us/legislature/Benjamin-L-Cardin-18b53a95-c658-5a23-8c3e-074a7e0d27e3.yml b/data/us/legislature/Benjamin-L-Cardin-18b53a95-c658-5a23-8c3e-074a7e0d27e3.yml
index d36afac3ba..91ce621dc1 100644
--- a/data/us/legislature/Benjamin-L-Cardin-18b53a95-c658-5a23-8c3e-074a7e0d27e3.yml
+++ b/data/us/legislature/Benjamin-L-Cardin-18b53a95-c658-5a23-8c3e-074a7e0d27e3.yml
@@ -1,122 +1,121 @@
 id: ocd-person/18b53a95-c658-5a23-8c3e-074a7e0d27e3
-name: Benjamin L. Cardin
-given_name: Benjamin
+name: Ben Cardin
+given_name: Ben
 family_name: Cardin
-middle_name: L.
-gender: M
 birth_date: 1943-10-05
+gender: Male
+email: https://www.cardin.senate.gov/email-ben/
 image: https://theunitedstates.io/images/congress/450x550/C000141.jpg
 party:
-- start_date: '1987-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2007-01-03
+  end_date: 2025-01-02
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Maryland
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Maryland
+- start_date: 2007-01-04
+  end_date: 2013-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Maryland
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Maryland
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Maryland
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Maryland
 offices:
 - classification: capitol
-  address: 509 Hart Senate Office Building Washington DC 20510
+  address: 509 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4524
+  fax: 202-224-1651
 - classification: district
-  address: 100 S. Charles St. Suite 1710; Baltimore, MD 21201
+  address: 100 S. Charles St. Tower 1, Suite 1710, Baltimore, MD 21201
   voice: 410-962-4436
   fax: 410-962-4156
-  name: 'District Office #1'
 - classification: district
-  address: 10201 Martin Luther King Jr. Highway Suite 210; Bowie, MD 20720
-  voice: 301-860-0414
-  fax: 301-860-0416
-  name: 'District Office #2'
+  address: 114 S. Washington St. Suite 202, Easton, MD 21601
+  voice: 410-546-4250
 - classification: district
-  address: 13 Canal St. Room 305; Cumberland, MD 21502
+  address: 13 Canal St. Room 305, Cumberland, MD 21502
   voice: 301-777-2957
   fax: 301-777-2959
-  name: 'District Office #3'
 - classification: district
-  address: 451 Hungerford Dr. Suite 230; Rockville, MD 20850
+  address: 451 Hungerford Drive Suite 230, Rockville, MD 20850
   voice: 301-762-2974
   fax: 301-762-2976
-  name: 'District Office #4'
 - classification: district
-  address: 212 W. Main St. Suite 301C; Salisbury, MD 21801
-  voice: 410-546-4250
-  fax: 202-224-1651
-  name: 'District Office #5'
+  address: Vista Gardens Marketplace 10201 Martin Luther King, Jr. Highway, Suite
+    210, Bowie, MD 20720
+  voice: 301-860-0414
+  fax: 301-860-0416
 links:
 - url: https://www.cardin.senate.gov
   note: website
 - url: https://www.cardin.senate.gov/contact/
   note: contact form
+- url: https://www.cardin.senate.gov/
+other_names:
+- name: B. Cardin
+- name: B.L. Cardin
+- name: Ben Cardin
+- name: Benjamin L. Cardin
+- name: Cardin (D-MD)
+- name: Cardin, B.
 ids:
   twitter: SenatorCardin
   youtube: UCiQaJnMzlfzzG3VESgyZChA
   facebook: senatorbencardin
-other_names:
-- name: Ben Cardin
-- name: Cardin (D-MD)
 other_identifiers:
 - scheme: bioguide
   identifier: C000141
@@ -152,3 +151,11 @@ other_identifiers:
   identifier: kg:/m/025k3k
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ben_Cardin
+- url: https://en.wikipedia.org/wiki/Ben_Cardin
+- url: https://justfacts.votesmart.org/candidate/26888/ben-cardin
+- url: https://senatorcardin.weebly.com
+- url: https://theunitedstates.io
+- url: https://www.cardin.senate.gov
+- url: https://www.cardin.senate.gov/about
+- url: https://www.govtrack.us/congress/members/benjamin_cardin/400064
diff --git a/data/us/legislature/Bennie-G-Thompson-c171d352-db84-5c96-8260-1fcd7eab2575.yml b/data/us/legislature/Bennie-G-Thompson-c171d352-db84-5c96-8260-1fcd7eab2575.yml
index b17dfb0da6..1aa2fd5fe7 100644
--- a/data/us/legislature/Bennie-G-Thompson-c171d352-db84-5c96-8260-1fcd7eab2575.yml
+++ b/data/us/legislature/Bennie-G-Thompson-c171d352-db84-5c96-8260-1fcd7eab2575.yml
@@ -1,138 +1,139 @@
 id: ocd-person/c171d352-db84-5c96-8260-1fcd7eab2575
-name: Bennie G. Thompson
+name: Bennie Thompson
 given_name: Bennie
 family_name: Thompson
-middle_name: G.
-gender: M
 birth_date: 1948-01-28
+gender: Male
+email: https://benniethompson.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/T000193.jpg
 party:
-- start_date: '1993-04-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-04-13'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1993-04-13
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-2
 offices:
 - classification: capitol
-  address: 2466 Rayburn House Office Building Washington DC 20515-2402
+  address: 2466 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5876
+  fax: 202-225-5898
 - classification: district
-  address: 107 W. Madison St.; Bolton, MS 39041
+  address: 107 W. Madison St. P.O. Box 610, Bolton, MS 39041
   voice: 601-866-9003
   fax: 601-866-9036
-  name: 'District Office #1'
 - classification: district
-  address: 910 Courthouse Ln.; Greenville, MS 38701
-  voice: 662-335-9003
-  fax: 662-334-1304
-  name: 'District Office #2'
+  address: 208 Lynda Lee Drive Room 41, Natchez, MS 39120
+  voice: 601-492-9003
 - classification: district
-  address: 728 Main Street Suite A; Greenwood, MS 38930
-  voice: 662-455-9003
-  fax: 662-453-0118
-  name: 'District Office #3'
+  address: 263 E. Main St., Marks, MS 38646
+  voice: 662-326-9003
 - classification: district
-  address: 3607 Medgar Evers Blvd.; Jackson, MS 39213
+  address: 3607 Medgar Evers Blvd., Jackson, MS 39213
   voice: 601-946-9003
   fax: 601-982-5337
-  name: 'District Office #4'
 - classification: district
-  address: 263 E. Main St.; Marks, MS 38646
-  voice: 662-326-9003
-  name: 'District Office #5'
+  address: 728 Main St. Suite A, Greenwood, MS 38930
+  voice: 662-455-9003
+  fax: 662-453-0118
 - classification: district
-  address: 106 Green Avenue Suite 106; Mound Bayou, MS 38762
+  address: 910 Courthouse Lane, Greenville, MS 38701
+  voice: 662-335-9003
+  fax: 662-334-1304
+- classification: district
+  address: Mound Bayou City Hall 106 Green Ave., Suite 106, Mound Bayou, MS 38762
   voice: 662-741-9003
   fax: 662-741-9002
-  name: 'District Office #6'
 links:
 - url: https://benniethompson.house.gov
   note: website
+- url: https://benniethompson.house.gov/
+other_names:
+- name: B. Thompson
+- name: B.G. Thompson
+- name: Bennie G. Thompson
+- name: Thompson (MS)
+- name: Thompson, B.
 ids:
   twitter: BennieGThompson
   youtube: UCzt2pBxh0dI24kYrWretXRw
   facebook: CongressmanBennieGThompson
-other_names:
-- name: Thompson (MS)
 other_identifiers:
 - scheme: bioguide
   identifier: T000193
@@ -164,3 +165,10 @@ other_identifiers:
   identifier: Bennie Thompson
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bennie_Thompson
+- url: https://benniethompson.com/meet-bennie
+- url: https://benniethompson.house.gov
+- url: https://en.wikipedia.org/wiki/Bennie_Thompson
+- url: https://justfacts.votesmart.org/candidate/26929/bennie-thompson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bennie_thompson/400402
diff --git a/data/us/legislature/Bernard-Sanders-a1ec37b6-9f54-529a-8165-ff96e9d8d93e.yml b/data/us/legislature/Bernard-Sanders-a1ec37b6-9f54-529a-8165-ff96e9d8d93e.yml
index df35118780..96d3fd8a35 100644
--- a/data/us/legislature/Bernard-Sanders-a1ec37b6-9f54-529a-8165-ff96e9d8d93e.yml
+++ b/data/us/legislature/Bernard-Sanders-a1ec37b6-9f54-529a-8165-ff96e9d8d93e.yml
@@ -1,95 +1,93 @@
 id: ocd-person/a1ec37b6-9f54-529a-8165-ff96e9d8d93e
-name: Bernard Sanders
-given_name: Bernard
+name: Bernie Sanders
+given_name: Bernie
 family_name: Sanders
-gender: M
 birth_date: 1941-09-08
+gender: Male
+email: https://www.sanders.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S000033.jpg
 party:
-- start_date: '1991-01-03'
-  end_date: '2025-01-03'
-  name: Independent
+- name: Independent
 roles:
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Vermont
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Vermont
+- start_date: 2007-01-04
+  end_date: 2013-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Vermont
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Vermont
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Vermont
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Vermont
 offices:
 - classification: capitol
-  address: 332 Dirksen Senate Office Building Washington DC 20510
+  address: 332 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-5141
+  fax: 202-228-0776
 - classification: district
-  address: 1 Church St. 3rd Floor; Burlington, VT 05401
+  address: 1 Church St. 3rd Floor, Burlington, VT 05401
   voice: 802-862-0697
   fax: 802-860-6370
-  name: 'District Office #1'
-- classification: district
-  address: 357 Western Ave. Suite 1B; St. Johnsbury, VT 05819
-  voice: 800-339-9834
-  fax: 802-860-6370
-  name: 'District Office #2'
 links:
 - url: https://www.sanders.senate.gov
   note: website
 - url: https://www.sanders.senate.gov/contact/
   note: contact form
+- url: https://www.sanders.senate.gov/
+other_names:
+- name: B. Sanders
+- name: Bernard Sanders
+- name: Sanders (I-VT)
+- name: Sanders, B.
 ids:
   twitter: SenSanders
   youtube: UCD_DaKNac0Ta-2PeHuoQ1uA
   facebook: senatorsanders
-other_names:
-- name: Sanders (I-VT)
 other_identifiers:
 - scheme: bioguide
   identifier: S000033
@@ -125,3 +123,12 @@ other_identifiers:
   identifier: kg:/m/01_gbv
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bernie_Sanders
+- url: https://berniesanders.com/about
+- url: https://en.wikipedia.org/wiki/Bernie_Sanders
+- url: https://justfacts.votesmart.org/candidate/27110/bernie-sanders
+- url: https://theunitedstates.io
+- url: https://www.bloomberg.com/profile/person/13388480
+- url: https://www.govtrack.us/congress/members/bernard_sanders/400357
+- url: https://www.sanders.senate.gov
+- url: https://www.sanders.senate.gov/about-bernie
diff --git a/data/us/legislature/Beth-Van-Duyne-861bd195-d8aa-5e72-9699-4f5ad3d5e499.yml b/data/us/legislature/Beth-Van-Duyne-861bd195-d8aa-5e72-9699-4f5ad3d5e499.yml
index 150c0b76ec..4a7692dec7 100644
--- a/data/us/legislature/Beth-Van-Duyne-861bd195-d8aa-5e72-9699-4f5ad3d5e499.yml
+++ b/data/us/legislature/Beth-Van-Duyne-861bd195-d8aa-5e72-9699-4f5ad3d5e499.yml
@@ -2,32 +2,40 @@ id: ocd-person/861bd195-d8aa-5e72-9699-4f5ad3d5e499
 name: Beth Van Duyne
 given_name: Beth
 family_name: Van Duyne
-middle_name: Ann
-gender: F
 birth_date: 1970-11-16
+gender: Female
+email: https://vanduyne.house.gov/e-mail-me
 image: https://theunitedstates.io/images/congress/450x550/V000134.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-24
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-24
 offices:
 - classification: capitol
-  address: 1725 Longworth House Office Building Washington DC 20515-4324
+  address: 1725 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6605
+  fax: 202-225-0074
+- classification: district
+  address: 14951 Dallas Parkway Unit 830, Dallas, TX 75254
+  voice: 972-966-5500
+  fax: 771-200-5833
 links:
 - url: https://vanduyne.house.gov
   note: website
+- url: https://vanduyne.house.gov/
+other_names:
+- name: B. Van Duyne
+- name: E.A. Van Duyne
+- name: Van Duyne, B.
 ids:
   twitter: RepBethVanDuyne
 other_identifiers:
@@ -51,3 +59,11 @@ other_identifiers:
   identifier: Beth Van Duyne
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Beth_Van_Duyne
+- url: https://bethfortexas.com/about-beth-van-duyne
+- url: https://en.wikipedia.org/wiki/Beth_Van_Duyne
+- url: https://justfacts.votesmart.org/candidate/biography/79150/beth-van-duyne
+- url: https://theunitedstates.io
+- url: https://vanduyne.house.gov
+- url: https://www.govtrack.us/congress/members/beth_van_duyne/456850
+- url: https://www.linkedin.com/in/bethvanduynetx
diff --git a/data/us/legislature/Betty-McCollum-61c4224a-c1d6-5739-bca6-0db7e58d84bd.yml b/data/us/legislature/Betty-McCollum-61c4224a-c1d6-5739-bca6-0db7e58d84bd.yml
index 37882a4ce4..d1a4c80f13 100644
--- a/data/us/legislature/Betty-McCollum-61c4224a-c1d6-5739-bca6-0db7e58d84bd.yml
+++ b/data/us/legislature/Betty-McCollum-61c4224a-c1d6-5739-bca6-0db7e58d84bd.yml
@@ -2,87 +2,90 @@ id: ocd-person/61c4224a-c1d6-5739-bca6-0db7e58d84bd
 name: Betty McCollum
 given_name: Betty
 family_name: McCollum
-middle_name: Louise
-gender: F
 birth_date: 1954-07-12
+gender: Female
+email: https://mccollum.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/M001143.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-4
 offices:
 - classification: capitol
-  address: 2426 Rayburn House Office Building Washington DC 20515-2304
+  address: 2426 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6631
+  fax: 202-225-1968
 - classification: district
-  address: 661 LaSalle Street Suite 110; St. Paul, MN 55114
+  address: 661 LaSalle St. Suite 110, St. Paul, MN 55114
   voice: 651-224-9191
   fax: 651-224-3056
-  name: 'District Office #1'
 links:
 - url: https://mccollum.house.gov
   note: website
+- url: https://mccollum.house.gov/
+other_names:
+- name: B. McCollum
+- name: B.L. McCollum
+- name: McCollum, B.
 ids:
   twitter: BettyMcCollum04
   youtube: UC3sZJSdiZo2EBHbsOlsnI7A
@@ -118,3 +121,9 @@ other_identifiers:
   identifier: kg:/m/0249hy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Betty_McCollum
+- url: https://en.wikipedia.org/wiki/Betty_McCollum
+- url: https://justfacts.votesmart.org/candidate/3812/betty-mccollum
+- url: https://mccollum.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/betty_mccollum/400259
diff --git a/data/us/legislature/Bill-Cassidy-851546e4-4af0-5505-8a1c-4f2a83813589.yml b/data/us/legislature/Bill-Cassidy-851546e4-4af0-5505-8a1c-4f2a83813589.yml
index 2ce1778ddb..b1a3c7b8fa 100644
--- a/data/us/legislature/Bill-Cassidy-851546e4-4af0-5505-8a1c-4f2a83813589.yml
+++ b/data/us/legislature/Bill-Cassidy-851546e4-4af0-5505-8a1c-4f2a83813589.yml
@@ -2,88 +2,83 @@ id: ocd-person/851546e4-4af0-5505-8a1c-4f2a83813589
 name: Bill Cassidy
 given_name: Bill
 family_name: Cassidy
-gender: M
 birth_date: 1957-09-28
+gender: Male
+email: https://www.cassidy.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001075.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Louisiana
+- start_date: 2015-01-06
+  end_date: 2021-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Louisiana
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Louisiana
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Louisiana
 offices:
 - classification: capitol
-  address: 455 Dirksen Senate Office Building Washington DC 20510
+  address: 455 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-5824
 - classification: district
-  address: 3600 Jackson St. Suite 115A; Alexandria, LA 71303
-  voice: 318-448-7176
-  fax: 318-448-5175
-  name: 'District Office #1'
-- classification: district
-  address: 5555 Hilton Ave. Suite 100; Baton Rouge, LA 70808
-  voice: 225-929-7711
-  fax: 225-929-7688
-  name: 'District Office #2'
-- classification: district
-  address: 1 Lakeshore Dr. Suite 1155; Lake Charles, LA 70629
-  voice: 337-493-5398
-  fax: 337-493-5629
-  name: 'District Office #3'
-- classification: district
-  address: 101 La Rue France Suite 505; Lafayette, LA 70508
+  address: 101 La Rue France Suite 505, Lafayette, LA 70508
   voice: 337-261-1400
   fax: 337-261-1490
-  name: 'District Office #4'
 - classification: district
-  address: 3421 N. Causeway Blvd. Suite 204; Metairie, LA 70002
-  voice: 504-838-0130
-  fax: 504-838-0133
-  name: 'District Office #5'
+  address: 1611 Arnold Drive Suite 112, Alexandria, LA 71303
+  voice: 318-448-7176
+  fax: 318-448-5175
 - classification: district
-  address: 1651 Louisville Ave. Suite 123; Monroe, LA 70201
+  address: 1651 Louisville Ave. Suite 123, Monroe, LA 71201
   voice: 318-324-2111
   fax: 318-324-2197
-  name: 'District Office #6'
 - classification: district
-  address: 6425 Youree Dr. Suite 415; Shreveport, LA 71105
+  address: 3421 N. Causeway Blvd. Suite 204, Metairie, LA 70002
+  voice: 504-838-0130
+  fax: 504-838-0133
+- classification: district
+  address: 401 Market St. Suite 1018, Shreveport, LA 71101
   voice: 318-798-3215
-  fax: 318-798-6959
-  name: 'District Office #7'
+  fax: 318-798-8473
+- classification: district
+  address: 450 Laurel St. Suite 1400, Baton Rouge, LA 70801
+  voice: 225-929-7711
+  fax: 225-383-3768
+- classification: district
+  address: 611 Broad St. Suite 117, Lake Charles, LA 70601
+  voice: 337-602-7253
 links:
 - url: https://www.cassidy.senate.gov
   note: website
 - url: https://www.cassidy.senate.gov/contact
   note: contact form
+- url: https://www.cassidy.senate.gov/
+other_names:
+- name: B. Cassidy
+- name: Cassidy (R-LA)
+- name: Cassidy, B.
+- name: W. Cassidy
 ids:
   twitter: SenBillCassidy
   youtube: UCCEyGhUzxgkxFzWCY-rxz8g
-other_names:
-- name: Cassidy (R-LA)
 other_identifiers:
 - scheme: bioguide
   identifier: C001075
@@ -119,3 +114,9 @@ other_identifiers:
   identifier: kg:/m/0286t7r
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Cassidy
+- url: https://en.wikipedia.org/wiki/Bill_Cassidy
+- url: https://justfacts.votesmart.org/candidate/69494/bill-cassidy
+- url: https://theunitedstates.io
+- url: https://www.cassidy.senate.gov
+- url: https://www.govtrack.us/congress/members/bill_cassidy/412269
diff --git a/data/us/legislature/Bill-Foster-a512ad2f-4554-5b04-a00b-1de672f9099a.yml b/data/us/legislature/Bill-Foster-a512ad2f-4554-5b04-a00b-1de672f9099a.yml
index b2082d2f75..76746eca3f 100644
--- a/data/us/legislature/Bill-Foster-a512ad2f-4554-5b04-a00b-1de672f9099a.yml
+++ b/data/us/legislature/Bill-Foster-a512ad2f-4554-5b04-a00b-1de672f9099a.yml
@@ -2,69 +2,68 @@ id: ocd-person/a512ad2f-4554-5b04-a00b-1de672f9099a
 name: Bill Foster
 given_name: Bill
 family_name: Foster
-gender: M
 birth_date: 1955-10-07
+gender: Male
+email: https://foster.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/F000454.jpg
 party:
-- start_date: '2008-03-08'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2008-03-08'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-14
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: IL-11
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-14
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: IL-11
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-11
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-11
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-11
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: IL-14
+- start_date: 2008-03-08
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-11
+  district: IL-14
 offices:
 - classification: capitol
-  address: 2366 Rayburn House Office Building Washington DC 20515-1311
+  address: 2366 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3515
 - classification: district
-  address: 2711 E. New York St. Suite 204; Aurora, IL 60502
+  address: 2000 W. Galena Blvd Suite 303, Aurora, IL 60506
   voice: 630-585-7672
-  name: 'District Office #1'
-- classification: district
-  address: 195 Springfield Ave. Suite 102; Joliet, IL 60435
-  voice: 815-280-5876
-  name: 'District Office #2'
 links:
 - url: https://foster.house.gov
   note: website
+- url: https://foster.house.gov/
+other_names:
+- name: B. Foster
+- name: Foster, B.
+- name: G.W. Foster
 ids:
   twitter: RepBillFoster
   youtube: UCicixINQr_-3cFHI2bJzFpQ
@@ -102,3 +101,11 @@ other_identifiers:
   identifier: kg:/m/02rq8nc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Foster_(Illinois)
+- url: https://en.wikipedia.org/wiki/Bill_Foster_(Illinois_politician)
+- url: https://foster.house.gov
+- url: https://foster.house.gov/about/full-biography
+- url: https://justfacts.votesmart.org/candidate/101632/bill-foster
+- url: https://theunitedstates.io
+- url: https://www.billfoster.com/meet-bill
+- url: https://www.govtrack.us/congress/members/bill_foster/412257
diff --git a/data/us/legislature/Bill-Hagerty-fb408324-49e1-56ad-8425-65c2a1e88103.yml b/data/us/legislature/Bill-Hagerty-fb408324-49e1-56ad-8425-65c2a1e88103.yml
index a900994772..2e24fac0f9 100644
--- a/data/us/legislature/Bill-Hagerty-fb408324-49e1-56ad-8425-65c2a1e88103.yml
+++ b/data/us/legislature/Bill-Hagerty-fb408324-49e1-56ad-8425-65c2a1e88103.yml
@@ -2,33 +2,66 @@ id: ocd-person/fb408324-49e1-56ad-8425-65c2a1e88103
 name: Bill Hagerty
 given_name: Bill
 family_name: Hagerty
-middle_name: Francis
-gender: M
 birth_date: 1959-08-14
+gender: Male
+email: https://www.hagerty.senate.gov/email-me/
 image: https://theunitedstates.io/images/congress/450x550/H000601.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Tennessee
 offices:
 - classification: capitol
-  address: 251 Russell Senate Office Building Washington DC 20510
+  address: 251 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4944
+- classification: district
+  address: 719 Church St. Suite 2150, Nashville, TN 37203
+  voice: 615-736-5129
+  fax: 615-269-4803
+- classification: district
+  address: Clifford Davis-Odell Horton Federal Building 167 N. Main St., Suite 1068,
+    Memphis, TN 38103
+  voice: 901-544-4224
+- classification: district
+  address: Ed Jones Federal Building 109 S. Highland Ave., Suite 216, Jackson, TN
+    38301
+  voice: 731-234-9358
+  fax: 731-664-3129
+- classification: district
+  address: Howard H. Baker, Jr. U.S. Courthouse 800 Market St., Suite 112, Knoxville,
+    TN 37902
+  voice: 865-545-4253
+  fax: 865-545-4252
+- classification: district
+  address: Joel W. Soloman Federal Building 900 Georgia Ave., Suite 260, Chattanooga,
+    TN 37402
+  voice: 423-752-5337
+  fax: 423-752-2504
+- classification: district
+  address: L. Clure Morton Federal Building 9 E. Broad St., 3rd Floor, Cookeville,
+    TN 38503
+  voice: 931-400-7080
+- classification: district
+  address: Tri-Cities Regional Airport 2525 Highway 75, Suite 101, Blountville, TN
+    37617
+  voice: 423-325-6240
+  fax: 423-325-6236
 links:
-- url: https://www.hagerty.senate.gov
-  note: website
 - url: https://www.hagerty.senate.gov/email-me/
   note: contact form
-ids:
-  twitter: SenatorHagerty
+- url: https://www.hagerty.senate.gov
+  note: website
 other_names:
+- name: B. Hagerty
 - name: Hagerty (R-TN)
+- name: Hagerty, B.
+- name: W.F. Hagerty
+ids:
+  twitter: SenatorHagerty
 other_identifiers:
 - scheme: bioguide
   identifier: H000601
@@ -52,3 +85,10 @@ other_identifiers:
   identifier: Bill Hagerty
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Hagerty
+- url: https://en.wikipedia.org/wiki/Bill_Hagerty_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/128466/bill-hagerty
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bill_hagerty/456798
+- url: https://www.hagerty.senate.gov
+- url: https://www.linkedin.com/in/bill-hagerty-363876b4
diff --git a/data/us/legislature/Bill-Huizenga-ce06af2e-4591-560d-8f14-8f1817c9ad1f.yml b/data/us/legislature/Bill-Huizenga-ce06af2e-4591-560d-8f14-8f1817c9ad1f.yml
index 589e3ad65b..c5c8346aed 100644
--- a/data/us/legislature/Bill-Huizenga-ce06af2e-4591-560d-8f14-8f1817c9ad1f.yml
+++ b/data/us/legislature/Bill-Huizenga-ce06af2e-4591-560d-8f14-8f1817c9ad1f.yml
@@ -2,66 +2,68 @@ id: ocd-person/ce06af2e-4591-560d-8f14-8f1817c9ad1f
 name: Bill Huizenga
 given_name: Bill
 family_name: Huizenga
-gender: M
 birth_date: 1969-01-31
+gender: Male
+email: https://huizenga.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/H001058.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: MI-4
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-4
+  district: MI-2
 offices:
 - classification: capitol
-  address: 2232 Rayburn House Office Building Washington DC 20515-2204
+  address: 2232 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4401
+  fax: 202-226-0779
 - classification: district
-  address: 1 S. Harbor Ave. Suite 6B; Grand Haven, MI 49417
-  voice: 616-414-5516
-  fax: 616-570-0934
-  name: 'District Office #1'
+  address: 170 College Ave. Suite 160, Holland, MI 49423
+  voice: 616-251-6741
+  fax: 616-329-1801
 - classification: district
-  address: 4555 Wilson Ave. SW Suite 3; Grandville, MI 49418
-  voice: 616-570-0917
-  fax: 616-570-0934
-  name: 'District Office #2'
+  address: 5228 Lovers Lane Suite 108, Portage, MI 49002
+  voice: 269-569-8595
 links:
 - url: https://huizenga.house.gov
   note: website
+- url: https://huizenga.house.gov/
+other_names:
+- name: B. Huizenga
+- name: Huizenga, B.
+- name: W.P. Huizenga
 ids:
   twitter: RepHuizenga
   youtube: UCQPlLLiMnysMmeJ5qUSSjQg
@@ -97,3 +99,10 @@ other_identifiers:
   identifier: kg:/m/05b0j1w
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Huizenga
+- url: https://en.wikipedia.org/wiki/Bill_Huizenga
+- url: https://huizenga.house.gov
+- url: https://justfacts.votesmart.org/candidate/38351/bill-huizenga
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bill_huizenga/412437
+- url: https://www.linkedin.com/in/bill-huizenga-59993110
diff --git a/data/us/legislature/Bill-Posey-40abdb56-d1b4-54a3-bc53-b586f8c06ac3.yml b/data/us/legislature/Bill-Posey-40abdb56-d1b4-54a3-bc53-b586f8c06ac3.yml
index a03cdf70a3..d9bbc76005 100644
--- a/data/us/legislature/Bill-Posey-40abdb56-d1b4-54a3-bc53-b586f8c06ac3.yml
+++ b/data/us/legislature/Bill-Posey-40abdb56-d1b4-54a3-bc53-b586f8c06ac3.yml
@@ -2,66 +2,70 @@ id: ocd-person/40abdb56-d1b4-54a3-bc53-b586f8c06ac3
 name: Bill Posey
 given_name: Bill
 family_name: Posey
-gender: M
 birth_date: 1947-12-18
+gender: Male
+email: https://posey.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/P000599.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-15
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: FL-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-15
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-8
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-15
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-8
+  district: FL-15
 offices:
 - classification: capitol
-  address: 2150 Rayburn House Office Building Washington DC 20515-0908
+  address: 2150 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3671
+  fax: 202-225-3516
 - classification: district
-  address: 2725 Judge Fran Jamieson Way; Melbourne, FL 32940
+  address: 2725 Judge Fran Jamieson Way Building C, Melbourne, FL 32940
   voice: 321-632-1776
   fax: 321-639-8595
-  name: 'District Office #1'
 links:
 - url: https://posey.house.gov
   note: website
+- url: https://posey.house.gov/
+other_names:
+- name: B. Posey
+- name: Posey, B.
+- name: W.J. Posey
 ids:
   twitter: CongBillPosey
   youtube: UCoUwUkDpe1ZYd6tiaZfiMuA
@@ -97,3 +101,10 @@ other_identifiers:
   identifier: kg:/m/0281vxy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Posey
+- url: https://billposey.com/about-bill
+- url: https://en.wikipedia.org/wiki/Bill_Posey
+- url: https://justfacts.votesmart.org/candidate/24280/bill-posey
+- url: https://posey.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bill_posey/412309
diff --git a/data/us/legislature/Blaine-Luetkemeyer-686325e7-8dc3-587d-9ee1-e0ad14202350.yml b/data/us/legislature/Blaine-Luetkemeyer-686325e7-8dc3-587d-9ee1-e0ad14202350.yml
index 03efa29f2e..3f4bb9c7cb 100644
--- a/data/us/legislature/Blaine-Luetkemeyer-686325e7-8dc3-587d-9ee1-e0ad14202350.yml
+++ b/data/us/legislature/Blaine-Luetkemeyer-686325e7-8dc3-587d-9ee1-e0ad14202350.yml
@@ -2,75 +2,74 @@ id: ocd-person/686325e7-8dc3-587d-9ee1-e0ad14202350
 name: Blaine Luetkemeyer
 given_name: Blaine
 family_name: Luetkemeyer
-gender: M
 birth_date: 1952-05-07
+gender: Male
+email: https://luetkemeyer.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/L000569.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MO-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: MO-3
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MO-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: MO-3
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MO-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: MO-9
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MO-3
+  district: MO-9
 offices:
 - classification: capitol
-  address: 2230 Rayburn House Office Building Washington DC 20515-2503
+  address: 2230 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2956
+  fax: 202-225-5712
 - classification: district
-  address: 2117 Missouri Blvd.; Jefferson City, MO 65109
+  address: 2117 Missouri Blvd., Jefferson City, MO 65109
   voice: 573-635-7232
   fax: 573-635-8347
-  name: 'District Office #1'
 - classification: district
-  address: 516 Jefferson St.; Washington, MO 63090
-  voice: 636-239-2276
-  fax: 636-239-0478
-  name: 'District Office #2'
-- classification: district
-  address: 113 E. Pearce Blvd.; Wentzville, MO 63385
+  address: 5342 Highway North, Cottleville, MO 63304
   voice: 636-327-7055
-  name: 'District Office #3'
+  fax: 636-327-3254
 links:
 - url: https://luetkemeyer.house.gov
   note: website
+- url: https://luetkemeyer.house.gov/
+other_names:
+- name: B. Luetkemeyer
+- name: Luetkemeyer, B.
+- name: W.B. Luetkemeyer
 ids:
   twitter: RepBlaine
   youtube: UCifiiQclKbBBrkSbCnN6REg
@@ -106,3 +105,8 @@ other_identifiers:
   identifier: Blaine Luetkemeyer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Blaine_Luetkemeyer
+- url: https://en.wikipedia.org/wiki/Blaine_Luetkemeyer
+- url: https://luetkemeyer.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/blaine_luetkemeyer/412292
diff --git a/data/us/legislature/Blake-D-Moore-3854aa11-1cec-58f6-8e90-c721a0db3525.yml b/data/us/legislature/Blake-D-Moore-3854aa11-1cec-58f6-8e90-c721a0db3525.yml
index 5feed3ef70..0c7a54c2d6 100644
--- a/data/us/legislature/Blake-D-Moore-3854aa11-1cec-58f6-8e90-c721a0db3525.yml
+++ b/data/us/legislature/Blake-D-Moore-3854aa11-1cec-58f6-8e90-c721a0db3525.yml
@@ -1,37 +1,45 @@
 id: ocd-person/3854aa11-1cec-58f6-8e90-c721a0db3525
-name: Blake D. Moore
+name: Blake Moore
 given_name: Blake
 family_name: Moore
-middle_name: David
-gender: M
 birth_date: 1980-06-22
+gender: Male
+email: https://blakemoore.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001213.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-1
 offices:
 - classification: capitol
-  address: 1131 Longworth House Office Building Washington DC 20515-4401
+  address: 1131 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-0453
+  fax: 202-225-5857
+- classification: district
+  address: 324 25th St., Ogden, UT 84401
+  voice: 801-625-0107
+  fax: 385-405-2155
 links:
 - url: https://blakemoore.house.gov
   note: website
-ids:
-  twitter: RepBlakeMoore
+- url: https://blakemoore.house.gov/
 other_names:
+- name: B. Moore
+- name: B.D. Moore
+- name: Blake D. Moore
 - name: Moore (UT)
+- name: Moore, B.
+ids:
+  twitter: RepBlakeMoore
 other_identifiers:
 - scheme: bioguide
   identifier: M001213
@@ -49,3 +57,10 @@ other_identifiers:
   identifier: kg:/g/11ftchfsgn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Blake_Moore
+- url: https://blakemoore.house.gov
+- url: https://en.wikipedia.org/wiki/Blake_Moore
+- url: https://justfacts.votesmart.org/candidate/biography/191164/blake-moore
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/blake_moore/456851
+- url: https://www.linkedin.com/in/blake-d-moore-1979952a
diff --git a/data/us/legislature/Bob-Good-e53e5a13-c82a-5208-96d0-f6769c0d8a67.yml b/data/us/legislature/Bob-Good-e53e5a13-c82a-5208-96d0-f6769c0d8a67.yml
index b92c5586d1..74fee69f05 100644
--- a/data/us/legislature/Bob-Good-e53e5a13-c82a-5208-96d0-f6769c0d8a67.yml
+++ b/data/us/legislature/Bob-Good-e53e5a13-c82a-5208-96d0-f6769c0d8a67.yml
@@ -1,37 +1,43 @@
 id: ocd-person/e53e5a13-c82a-5208-96d0-f6769c0d8a67
 name: Bob Good
-given_name: Robert
+given_name: Bob
 family_name: Good
-middle_name: G.
-gender: M
 birth_date: 1965-09-11
+gender: Male
+email: https://good.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000595.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-5
 offices:
 - classification: capitol
-  address: 461 Cannon House Office Building Washington DC 20515-4605
+  address: 461 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4711
+  fax: 202-225-5681
+- classification: district
+  address: 20436 Lynchburg Highway, Suite F, Lynchburg, VA 24502
+  voice: 434-791-2596
 links:
 - url: https://good.house.gov
   note: website
-ids:
-  twitter: RepBobGood
+- url: https://good.house.gov/
 other_names:
+- name: B. Good
 - name: Good (VA)
+- name: Good, B.
+- name: R.G. Good
+ids:
+  twitter: RepBobGood
 other_identifiers:
 - scheme: bioguide
   identifier: G000595
@@ -49,3 +55,10 @@ other_identifiers:
   identifier: kg:/g/11fsfm06kc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bob_Good
+- url: https://en.wikipedia.org/wiki/Bob_Good
+- url: https://good.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/190745/robert-good
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robert_good/456853
+- url: https://www.linkedin.com/in/bogood
diff --git a/data/us/legislature/Bonnie-Watson-Coleman-ff55ab02-9d61-544c-8f4d-710a09d8f5db.yml b/data/us/legislature/Bonnie-Watson-Coleman-ff55ab02-9d61-544c-8f4d-710a09d8f5db.yml
index 823232b251..9a4bc7413b 100644
--- a/data/us/legislature/Bonnie-Watson-Coleman-ff55ab02-9d61-544c-8f4d-710a09d8f5db.yml
+++ b/data/us/legislature/Bonnie-Watson-Coleman-ff55ab02-9d61-544c-8f4d-710a09d8f5db.yml
@@ -2,51 +2,55 @@ id: ocd-person/ff55ab02-9d61-544c-8f4d-710a09d8f5db
 name: Bonnie Watson Coleman
 given_name: Bonnie
 family_name: Watson Coleman
-gender: F
 birth_date: 1945-02-06
+gender: Female
+email: https://watsoncoleman.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000822.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-12
 offices:
 - classification: capitol
-  address: 168 Cannon House Office Building Washington DC 20515-3012
+  address: 168 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5801
+  fax: 202-225-6025
 - classification: district
-  address: 850 Bear Tavern Rd. Suite 201; Ewing, NJ 08628
+  address: 850 Bear Tavern Road Suite 201, Ewing, NJ 08628
   voice: 609-883-0026
   fax: 609-883-2093
-  name: 'District Office #1'
 links:
 - url: https://watsoncoleman.house.gov
   note: website
+- url: https://watsoncoleman.house.gov/
+other_names:
+- name: B. Watson Coleman
+- name: B.M. Watson Coleman
+- name: Watson Coleman, B.
 ids:
   twitter: RepBonnie
   youtube: UCrxEaX0VKZKwg3930du2D5A
@@ -80,3 +84,10 @@ other_identifiers:
   identifier: '21538'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bonnie_Watson_Coleman
+- url: https://en.wikipedia.org/wiki/Bonnie_Watson_Coleman
+- url: https://theunitedstates.io
+- url: https://watsoncoleman.house.gov
+- url: https://watsoncoleman.house.gov/about
+- url: https://www.bonnieforcongress.com/about
+- url: https://www.govtrack.us/congress/members/bonnie_watson_coleman/412644
diff --git a/data/us/legislature/Brad-Finstad-bc26b71a-566f-57fd-9d5b-23bc27e4c4a4.yml b/data/us/legislature/Brad-Finstad-bc26b71a-566f-57fd-9d5b-23bc27e4c4a4.yml
index 0c430754f6..f9478756b0 100644
--- a/data/us/legislature/Brad-Finstad-bc26b71a-566f-57fd-9d5b-23bc27e4c4a4.yml
+++ b/data/us/legislature/Brad-Finstad-bc26b71a-566f-57fd-9d5b-23bc27e4c4a4.yml
@@ -2,31 +2,41 @@ id: ocd-person/bc26b71a-566f-57fd-9d5b-23bc27e4c4a4
 name: Brad Finstad
 given_name: Brad
 family_name: Finstad
-gender: M
 birth_date: 1976-05-30
+gender: Male
+email: https://finstad.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000475.jpg
 party:
-- start_date: '2022-08-12'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2022-08-12'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2022-08-12
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-1
 offices:
 - classification: capitol
-  address: 1605 Longworth House Office Building Washington DC 20515-2301
+  address: 1605 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2472
+- classification: district
+  address: 110 N. Minnesota St. Suite 5, New Ulm, MN 56073
+  voice: 507-577-6151
+- classification: district
+  address: 2746 Superior Drive NW Suite 100, Rochester, MN 55901
+  voice: 507-577-6141
 links:
 - url: https://finstad.house.gov
   note: website
+- url: https://finstad.house.gov/
+other_names:
+- name: B. Finstad
+- name: B.H. Finstad
+- name: Finstad, B.
 other_identifiers:
 - scheme: bioguide
   identifier: F000475
@@ -46,3 +56,10 @@ other_identifiers:
   identifier: '38612'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brad_Finstad
+- url: https://en.wikipedia.org/wiki/Brad_Finstad
+- url: https://finstad.house.gov
+- url: https://finstad.house.gov/about-brad
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brad_finstad/456869
+- url: https://www.linkedin.com/in/brad-finstad-593588aa
diff --git a/data/us/legislature/Brad-R-Wenstrup-717ac307-3248-5726-bdcf-de58d683943f.yml b/data/us/legislature/Brad-R-Wenstrup-717ac307-3248-5726-bdcf-de58d683943f.yml
index b56559ec50..9268137589 100644
--- a/data/us/legislature/Brad-R-Wenstrup-717ac307-3248-5726-bdcf-de58d683943f.yml
+++ b/data/us/legislature/Brad-R-Wenstrup-717ac307-3248-5726-bdcf-de58d683943f.yml
@@ -1,66 +1,69 @@
 id: ocd-person/717ac307-3248-5726-bdcf-de58d683943f
-name: Brad R. Wenstrup
+name: Brad Wenstrup
 given_name: Brad
 family_name: Wenstrup
-middle_name: R.
-gender: M
 birth_date: 1958-06-17
+gender: Male
+email: https://wenstrup.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000815.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-2
 offices:
 - classification: capitol
-  address: 2335 Rayburn House Office Building Washington DC 20515-3502
+  address: 2335 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3164
+  fax: 202-225-1992
 - classification: district
-  address: 4350 Aicholtz Rd.; Cincinnati, OH 45245
-  name: 'District Office #1'
+  address: 170 N. Main St., Peebles, OH 45660
+  voice: 513-605-1380
+  fax: 937-798-4024
 - classification: district
-  address: 7954 Beechmont Ave. Suite 200; Cincinnati, OH 45255
+  address: 4350 Aicholtz Road Suite 110, Cincinnati, OH 45245
   voice: 513-474-7777
   fax: 513-605-1377
-  name: 'District Office #2'
 - classification: district
-  address: 170 N. Main St.; Peebles, OH 45660
-  voice: 513-605-1380
-  fax: 937-798-4024
-  name: 'District Office #3'
+  address: 475 Western Ave. Suite B, Chillicothe, OH 45601
+  voice: 740-672-7040
 links:
 - url: https://wenstrup.house.gov
   note: website
+- url: https://wenstrup.house.gov/
+other_names:
+- name: B. Wenstrup
+- name: B.R. Wenstrup
+- name: Brad R. Wenstrup
+- name: Wenstrup, B.
 ids:
   twitter: RepBradWenstrup
   youtube: UCaK7SeUvmHdHTMtF3HXb-jA
@@ -94,3 +97,11 @@ other_identifiers:
   identifier: kg:/m/0j63b7n
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brad_Wenstrup
+- url: https://en.wikipedia.org/wiki/Brad_Wenstrup
+- url: https://justfacts.votesmart.org/candidate/biography/135326/brad-wenstrup
+- url: https://theunitedstates.io
+- url: https://usabrad.com/meet-brad
+- url: https://wenstrup.house.gov
+- url: https://wenstrup.house.gov/about
+- url: https://www.govtrack.us/congress/members/brad_wenstrup/412564
diff --git a/data/us/legislature/Brad-Sherman-4015098b-d823-5776-9b47-ceb09bf523a9.yml b/data/us/legislature/Brad-Sherman-4015098b-d823-5776-9b47-ceb09bf523a9.yml
index 362f364c78..6dfda05d8f 100644
--- a/data/us/legislature/Brad-Sherman-4015098b-d823-5776-9b47-ceb09bf523a9.yml
+++ b/data/us/legislature/Brad-Sherman-4015098b-d823-5776-9b47-ceb09bf523a9.yml
@@ -2,97 +2,100 @@ id: ocd-person/4015098b-d823-5776-9b47-ceb09bf523a9
 name: Brad Sherman
 given_name: Brad
 family_name: Sherman
-middle_name: J.
-gender: M
 birth_date: 1954-10-24
+gender: Male
+email: https://sherman.house.gov/help
 image: https://theunitedstates.io/images/congress/450x550/S000344.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-24
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-32
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-24
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-30
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-24
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-30
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-30
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-30
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-30
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-27
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-27
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-27
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-24
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-30
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-24
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
+  district: CA-24
 offices:
 - classification: capitol
-  address: 2365 Rayburn House Office Building Washington DC 20515-0532
+  address: 2365 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5911
+  fax: 202-225-5879
 - classification: district
-  address: 5000 Van Nuys Blvd. Suite 420; Sherman Oaks, CA 91403
+  address: 5000 Van Nuys Blvd. Suite 420, Sherman Oaks, CA 91403
   voice: 818-501-9200
   fax: 818-501-1554
-  name: 'District Office #1'
 links:
 - url: https://sherman.house.gov
   note: website
+- url: https://sherman.house.gov/
+other_names:
+- name: B. Sherman
+- name: B.J. Sherman
+- name: Sherman, B.
 ids:
   twitter: BradSherman
   youtube: UCPisrz6-SLwVy2l9Mcy8kug
@@ -128,3 +131,12 @@ other_identifiers:
   identifier: Brad Sherman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brad_Sherman_(California)
+- url: https://bradsherman.com/about
+- url: https://en.wikipedia.org/wiki/Brad_Sherman
+- url: https://justfacts.votesmart.org/candidate/142/brad-sherman
+- url: https://sherman.house.gov
+- url: https://sherman.house.gov/about/about-brad-sherman
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brad_sherman/400371
+- url: https://www.linkedin.com/in/brad-sherman-856236a9
diff --git a/data/us/legislature/Bradley-Scott-Schneider-a3c68bbd-f241-52c8-a7e9-7f340f316b7a.yml b/data/us/legislature/Bradley-Scott-Schneider-a3c68bbd-f241-52c8-a7e9-7f340f316b7a.yml
index 076189da31..f8e9a697ab 100644
--- a/data/us/legislature/Bradley-Scott-Schneider-a3c68bbd-f241-52c8-a7e9-7f340f316b7a.yml
+++ b/data/us/legislature/Bradley-Scott-Schneider-a3c68bbd-f241-52c8-a7e9-7f340f316b7a.yml
@@ -1,59 +1,57 @@
 id: ocd-person/a3c68bbd-f241-52c8-a7e9-7f340f316b7a
-name: Bradley Scott Schneider
-given_name: Bradley
+name: Brad Schneider
+given_name: Brad
 family_name: Schneider
-middle_name: Scott
-gender: M
 birth_date: 1961-08-20
+gender: Male
+email: https://schneider.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001190.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-10
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-10
 offices:
 - classification: capitol
-  address: 300 Cannon House Office Building Washington DC 20515-1310
+  address: 300 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4835
+  fax: 202-225-0837
 - classification: district
-  address: 111 Barclay Blvd. Suite 200; Lincolnshire, IL 60069
+  address: 111 Barclay Blvd. Suite 200, Lincolnshire, IL 60069
   voice: 847-383-4870
   fax: 847-793-0677
-  name: 'District Office #1'
-- classification: district
-  address: 433 E Washington St.; Round Lake Park, IL 60073
-  name: 'District Office #2'
-- classification: district
-  address: 100 N Martin Luther King Jr Ave; Waukegan, IL 60085-4328
-  name: 'District Office #3'
 links:
 - url: https://schneider.house.gov
   note: website
+- url: https://schneider.house.gov/
+other_names:
+- name: B. Schneider
+- name: B.S. Schneider
+- name: Bradley Scott Schneider
+- name: Schneider, B.
 ids:
   twitter: RepSchneider
   facebook: CongressmanBradSchneider
@@ -86,3 +84,9 @@ other_identifiers:
   identifier: kg:/m/0j63zyv
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brad_Schneider
+- url: https://en.wikipedia.org/wiki/Brad_Schneider
+- url: https://schneider.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bradley_schneider/412534
+- url: https://www.linkedin.com/in/brad-schneider-4b91586
diff --git a/data/us/legislature/Brandon-Williams-4b5ef955-4806-51d0-83f3-177000f67b3c.yml b/data/us/legislature/Brandon-Williams-4b5ef955-4806-51d0-83f3-177000f67b3c.yml
index e4778ae66a..e67e1fad39 100644
--- a/data/us/legislature/Brandon-Williams-4b5ef955-4806-51d0-83f3-177000f67b3c.yml
+++ b/data/us/legislature/Brandon-Williams-4b5ef955-4806-51d0-83f3-177000f67b3c.yml
@@ -2,29 +2,37 @@ id: ocd-person/4b5ef955-4806-51d0-83f3-177000f67b3c
 name: Brandon Williams
 given_name: Brandon
 family_name: Williams
-middle_name: McDonald
-gender: M
 birth_date: 1967-05-22
+gender: Male
+email: https://brandonwilliams.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000828.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-22
 offices:
 - classification: capitol
-  address: 1022 Longworth House Office Building Washington DC 20515-3222
+  address: 1022 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3701
+- classification: district
+  address: 421 Broad St. Suite 7, Utica, NY 13501
+  voice: 315-732-0713
+- classification: district
+  address: The Galleries of Syracuse 440 S. Warren St., Suite 706, Syracuse, NY 13202
+  voice: 315-233-4333
 links:
 - url: https://brandonwilliams.house.gov
   note: website
+- url: https://brandonwilliams.house.gov/
 other_names:
+- name: B. Williams
+- name: B.M. Williams
 - name: Williams (NY)
+- name: Williams, B.
 other_identifiers:
 - scheme: bioguide
   identifier: W000828
@@ -42,3 +50,9 @@ other_identifiers:
   identifier: Q115805431
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brandon_Williams_(New_York)
+- url: https://brandonwilliams.house.gov
+- url: https://en.wikipedia.org/wiki/Brandon_Williams_(politician)
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brandon_williams/456926
+- url: https://www.linkedin.com/in/brandonmwilliams
diff --git a/data/us/legislature/Brendan-F-Boyle-d1509871-89c0-5f39-bc3d-b55e444e3909.yml b/data/us/legislature/Brendan-F-Boyle-d1509871-89c0-5f39-bc3d-b55e444e3909.yml
index 55dde85eb3..f0ccc57aff 100644
--- a/data/us/legislature/Brendan-F-Boyle-d1509871-89c0-5f39-bc3d-b55e444e3909.yml
+++ b/data/us/legislature/Brendan-F-Boyle-d1509871-89c0-5f39-bc3d-b55e444e3909.yml
@@ -1,69 +1,71 @@
 id: ocd-person/d1509871-89c0-5f39-bc3d-b55e444e3909
-name: Brendan F. Boyle
+name: Brendan Boyle
 given_name: Brendan
 family_name: Boyle
-middle_name: F.
-gender: M
 birth_date: 1977-02-06
+gender: Male
+email: https://boyle.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/B001296.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-13
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: PA-2
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-13
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-2
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-13
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-2
+  district: PA-13
 offices:
 - classification: capitol
-  address: 1502 Longworth House Office Building Washington DC 20515-3802
+  address: 1502 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6111
+  fax: 202-226-0611
 - classification: district
-  address: 5675 N. Front St. Suite 180; Philadelphia, PA 19120
-  voice: 267-335-5643
-  fax: 267-437-3886
-  name: 'District Office #1'
+  address: 1318 W. Girard Ave., Philadelphia, PA 19123
+  voice: 215-982-1156
+  fax: 267-639-9944
 - classification: district
-  address: 8572 Bustleton Ave.; Philadelphia, PA 19152
+  address: 8572 Bustleton Ave., Philadelphia, PA 19152
   voice: 215-335-3355
   fax: 215-856-3734
-  name: 'District Office #2'
 - classification: district
-  address: 2630 Memphis St Ste 180; Philadelphia, PA 19125-2344
-  voice: 215-426-4616
-  fax: 215-426-7741
-  name: 'District Office #3'
+  address: One and Olney Shopping Center 5675 N. Front St., Suite 180, Philadelphia,
+    PA 19120
+  voice: 267-335-5643
+  fax: 267-437-3886
 links:
 - url: https://boyle.house.gov
   note: website
+- url: https://boyle.house.gov/
+other_names:
+- name: B. Boyle
+- name: B.F. Boyle
+- name: Boyle (PA)
+- name: Boyle, B.
+- name: Brendan F. Boyle
 ids:
   twitter: CongBoyle
   youtube: UCMP_Anj7lz4eZuSh8GwFqQQ
   facebook: CongressmanBoyle
-other_names:
-- name: Boyle (PA)
 other_identifiers:
 - scheme: bioguide
   identifier: B001296
@@ -93,3 +95,11 @@ other_identifiers:
   identifier: Brendan Boyle
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brendan_Boyle
+- url: https://boyle.house.gov
+- url: https://boyle.house.gov/about/biography
+- url: https://en.wikipedia.org/wiki/Brendan_Boyle
+- url: https://theunitedstates.io
+- url: https://voteboyle.com/about-brendan
+- url: https://www.govtrack.us/congress/members/brendan_boyle/412652
+- url: https://www.linkedin.com/in/brendan-boyle-6504328
diff --git a/data/us/legislature/Brett-Guthrie-a7ba76d3-828f-52bd-9b30-cdbacf0af2b8.yml b/data/us/legislature/Brett-Guthrie-a7ba76d3-828f-52bd-9b30-cdbacf0af2b8.yml
index b4a27e09cc..a95064e9cf 100644
--- a/data/us/legislature/Brett-Guthrie-a7ba76d3-828f-52bd-9b30-cdbacf0af2b8.yml
+++ b/data/us/legislature/Brett-Guthrie-a7ba76d3-828f-52bd-9b30-cdbacf0af2b8.yml
@@ -2,72 +2,75 @@ id: ocd-person/a7ba76d3-828f-52bd-9b30-cdbacf0af2b8
 name: Brett Guthrie
 given_name: Brett
 family_name: Guthrie
-gender: M
 birth_date: 1964-02-18
+gender: Male
+email: https://guthrie.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/G000558.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-2
 offices:
 - classification: capitol
-  address: 2434 Rayburn House Office Building Washington DC 20515-1702
+  address: 2434 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3501
+  fax: 202-226-2019
 - classification: district
-  address: 996 Wilkinson Trce. Suite B2; Bowling Green, KY 42103
-  voice: 270-842-9896
-  fax: 270-842-9081
-  name: 'District Office #1'
+  address: 2200 Airport Road, Owensboro, KY 42301
+  voice: 270-438-6594
 - classification: district
-  address: 2200 Airport Rd.; Owensboro, KY 42301
-  name: 'District Office #2'
+  address: 411 W. Lincoln Trail Blvd., Radcliff, KY 40160
 - classification: district
-  address: 411 W. Lincoln Trail Blvd.; Radcliff, KY 40160
-  name: 'District Office #3'
+  address: 996 Wilkinson Trace Suite B2, Bowling Green, KY 42103
+  voice: 270-842-9896
+  fax: 270-842-9081
 links:
 - url: https://guthrie.house.gov
   note: website
+- url: https://guthrie.house.gov/
+other_names:
+- name: B. Guthrie
+- name: Guthrie, B.
+- name: S.B. Guthrie
 ids:
   twitter: RepGuthrie
   youtube: UCdJhDw-YbdH0RHfWK0sIfiw
@@ -103,3 +106,9 @@ other_identifiers:
   identifier: kg:/m/0411qqt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brett_Guthrie
+- url: https://en.wikipedia.org/wiki/Brett_Guthrie
+- url: https://guthrie.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/18829/brett-guthrie
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brett_guthrie/412278
diff --git a/data/us/legislature/Brian-Babin-e1f14f02-810c-52c5-8ad5-b2744b95a069.yml b/data/us/legislature/Brian-Babin-e1f14f02-810c-52c5-8ad5-b2744b95a069.yml
index 82fd7f2de4..6150c85614 100644
--- a/data/us/legislature/Brian-Babin-e1f14f02-810c-52c5-8ad5-b2744b95a069.yml
+++ b/data/us/legislature/Brian-Babin-e1f14f02-810c-52c5-8ad5-b2744b95a069.yml
@@ -2,60 +2,62 @@ id: ocd-person/e1f14f02-810c-52c5-8ad5-b2744b95a069
 name: Brian Babin
 given_name: Brian
 family_name: Babin
-gender: M
 birth_date: 1948-03-23
+gender: Male
+email: https://babin.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001291.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-36
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-36
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-36
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-36
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-36
 offices:
 - classification: capitol
-  address: 2236 Rayburn House Office Building Washington DC 20515-4336
+  address: 2236 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1555
+  fax: 202-226-0396
 - classification: district
-  address: 203 Ivy Ave. Suite 600; Deer Park, TX 77536
+  address: 203 Ivy Ave. Suite 600, Deer Park, TX 77536
   voice: 832-780-0966
   fax: 832-780-0964
-  name: 'District Office #1'
 - classification: district
-  address: 1201 Childers Rd.; Orange, TX 77630
+  address: 769 S. Main St. Suite 301, Lumberton, TX 77657
   voice: 409-883-8075
   fax: 409-886-9918
-  name: 'District Office #2'
 - classification: district
-  address: 100 W. Bluff Dr.; Woodville, TX 75979
+  address: Tyler County Courthouse 100 W. Bluff Drive, Woodville, TX 75979
   voice: 409-331-8066
-  name: 'District Office #3'
 links:
 - url: https://babin.house.gov
   note: website
+- url: https://babin.house.gov/
+other_names:
+- name: B. Babin
+- name: B.P. Babin
+- name: Babin, B.
 ids:
   twitter: RepBrianBabin
   youtube: UCPVEZgw-VbDRbLV1MRGVQNQ
@@ -89,3 +91,10 @@ other_identifiers:
   identifier: Brian Babin
 sources:
 - url: https://theunitedstates.io/
+- url: https://babin.house.gov
+- url: https://ballotpedia.org/Brian_Babin
+- url: https://en.wikipedia.org/wiki/Brian_Babin
+- url: https://justfacts.votesmart.org/candidate/biography/360/brian-babin
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brian_babin/412655
+- url: https://www.linkedin.com/in/drbrianbabinforcongress
diff --git a/data/us/legislature/Brian-J-Mast-e7b50abf-92e8-56f1-a5f7-7db9a63fb43f.yml b/data/us/legislature/Brian-J-Mast-e7b50abf-92e8-56f1-a5f7-7db9a63fb43f.yml
index 481badb839..ee7e1a1b9e 100644
--- a/data/us/legislature/Brian-J-Mast-e7b50abf-92e8-56f1-a5f7-7db9a63fb43f.yml
+++ b/data/us/legislature/Brian-J-Mast-e7b50abf-92e8-56f1-a5f7-7db9a63fb43f.yml
@@ -1,59 +1,60 @@
 id: ocd-person/e7b50abf-92e8-56f1-a5f7-7db9a63fb43f
-name: Brian J. Mast
+name: Brian Mast
 given_name: Brian
 family_name: Mast
-middle_name: J.
-gender: M
 birth_date: 1980-07-10
+gender: Male
+email: https://mast.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/M001199.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-18
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: FL-21
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-18
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-18
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-21
+  district: FL-18
 offices:
 - classification: capitol
-  address: 2182 Rayburn House Office Building Washington DC 20515-0921
+  address: 2182 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3026
+  fax: 202-225-8398
 - classification: district
-  address: 121 SW. Port St. Lucie Blvd.; Port St. Lucie, FL 34984
-  voice: 772-336-2877
-  name: 'District Office #1'
+  address: 100 N. U.S. Highway 1 Suite 217, Fort Pierce, FL 34950
+  voice: 772-446-8855
 - classification: district
-  address: 420 U.S. Highway One Suite 19; North Palm Beach, FL 33408
-  voice: 561-530-7778
-  name: 'District Office #2'
+  address: 121 SW Port St. Lucie Blvd., Port St. Lucie, FL 34984
+  voice: 772-336-2877
 - classification: district
-  address: 171 SW Flagler Ave.; Stuart, FL 34994
+  address: 171 SW Flager Ave., Stuart, FL 34994
   voice: 772-403-0900
-  name: 'District Office #3'
 - classification: district
-  address: 7305 N Military Trl 1A-366; Riviera Beach, FL 33410-7417
+  address: 601 Heritage Drive Suite 144, North Palm Beach, FL 33458
   voice: 561-530-7778
-  name: 'District Office #4'
 links:
 - url: https://mast.house.gov
   note: website
+- url: https://mast.house.gov/
+other_names:
+- name: B. Mast
+- name: B.J. Mast
+- name: Brian J. Mast
+- name: Mast, B.
 ids:
   twitter: RepBrianMast
   facebook: repbrianmast
@@ -84,3 +85,12 @@ other_identifiers:
   identifier: '21735'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brian_Mast
+- url: https://en.wikipedia.org/wiki/Brian_Mast
+- url: https://justfacts.votesmart.org/candidate/biography/166245/brian-mast
+- url: https://mast.house.gov
+- url: https://mast.house.gov/biography
+- url: https://mastforcongress.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brian_mast/412698
+- url: https://www.linkedin.com/in/brian-mast-0687a6131
diff --git a/data/us/legislature/Brian-K-Fitzpatrick-a6a4c673-58ba-587b-b36b-7a559c379f23.yml b/data/us/legislature/Brian-K-Fitzpatrick-a6a4c673-58ba-587b-b36b-7a559c379f23.yml
index 4eb06ae916..afb83cbd40 100644
--- a/data/us/legislature/Brian-K-Fitzpatrick-a6a4c673-58ba-587b-b36b-7a559c379f23.yml
+++ b/data/us/legislature/Brian-K-Fitzpatrick-a6a4c673-58ba-587b-b36b-7a559c379f23.yml
@@ -1,48 +1,52 @@
 id: ocd-person/a6a4c673-58ba-587b-b36b-7a559c379f23
-name: Brian K. Fitzpatrick
+name: Brian Fitzpatrick
 given_name: Brian
 family_name: Fitzpatrick
-middle_name: K.
-gender: M
 birth_date: 1973-12-17
+gender: Male
+email: https://fitzpatrick.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/F000466.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-1
+  district: PA-8
 offices:
 - classification: capitol
-  address: 271 Cannon House Office Building Washington DC 20515-3801
+  address: 271 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4276
+  fax: 202-225-9511
 - classification: district
-  address: 1717 Langhorne-Newtown Rd. Suite 400; Langhorne, PA 19047
+  address: 1717 Langhorne-Newtown Road Suite 225, Langhorne, PA 19047
   voice: 215-579-8102
   fax: 215-579-8109
-  name: 'District Office #1'
 links:
 - url: https://fitzpatrick.house.gov
   note: website
+- url: https://fitzpatrick.house.gov/
+other_names:
+- name: B. Fitzpatrick
+- name: B.K. Fitzpatrick
+- name: Brian K. Fitzpatrick
+- name: Fitzpatrick, B.
 ids:
   twitter: RepBrianFitz
   youtube: UCYMNcgHss4_Q5JY2vSvMpgw
@@ -74,3 +78,9 @@ other_identifiers:
   identifier: Brian Fitzpatrick
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brian_Fitzpatrick
+- url: https://en.wikipedia.org/wiki/Brian_Fitzpatrick_(American_politician)
+- url: https://fitzpatrick.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/167708/brian-fitzpatrick
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/brian_fitzpatrick/412721
diff --git a/data/us/legislature/Brian-Schatz-bd24fe60-5756-5d23-bcbf-4734f366c257.yml b/data/us/legislature/Brian-Schatz-bd24fe60-5756-5d23-bcbf-4734f366c257.yml
index 1c3092b1af..ca1a3351e0 100644
--- a/data/us/legislature/Brian-Schatz-bd24fe60-5756-5d23-bcbf-4734f366c257.yml
+++ b/data/us/legislature/Brian-Schatz-bd24fe60-5756-5d23-bcbf-4734f366c257.yml
@@ -2,55 +2,58 @@ id: ocd-person/bd24fe60-5756-5d23-bcbf-4734f366c257
 name: Brian Schatz
 given_name: Brian
 family_name: Schatz
-middle_name: Emanuel
-gender: M
 birth_date: 1972-10-20
+gender: Male
+email: https://www.schatz.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/S001194.jpg
 party:
-- start_date: '2012-12-27'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2012-12-27'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Hawaii
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Hawaii
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Hawaii
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2012-12-27
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Hawaii
 offices:
 - classification: capitol
-  address: 722 Hart Senate Office Building Washington DC 20510
+  address: 722 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3934
+  fax: 202-228-1153
 - classification: district
-  address: 300 Ala Moana Blvd. Room 7-212; Honolulu, HI 96850
+  address: Prince Kuhio Federal Building 300 Ala Moana Blvd., Room 7-212, Honolulu,
+    HI 96850
   voice: 808-523-2061
-  fax: 808-523-2065
-  name: 'District Office #1'
+  fax: 202-228-1153
 links:
 - url: https://www.schatz.senate.gov
   note: website
 - url: https://www.schatz.senate.gov/contact
   note: contact form
+- url: https://www.schatz.senate.gov/
+other_names:
+- name: B. Schatz
+- name: B.E. Schatz
+- name: Schatz (D-HI)
+- name: Schatz, B.
 ids:
   twitter: SenBrianSchatz
   youtube: UC8-mSYp2WqBiB_5iwtwKfow
   facebook: SenBrianSchatz
-other_names:
-- name: Schatz (D-HI)
 other_identifiers:
 - scheme: lis
   identifier: S353
@@ -84,3 +87,11 @@ other_identifiers:
   identifier: kg:/m/0dd109
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brian_Schatz
+- url: https://en.wikipedia.org/wiki/Brian_Schatz
+- url: https://justfacts.votesmart.org/candidate/17852/brian-schatz
+- url: https://theunitedstates.io
+- url: https://www.brianschatz.com/about
+- url: https://www.govtrack.us/congress/members/brian_schatz/412507
+- url: https://www.schatz.senate.gov
+- url: https://www.schatz.senate.gov/about
diff --git a/data/us/legislature/Brittany-Pettersen-4f00239f-feef-59fa-87de-5a62e277bb5f.yml b/data/us/legislature/Brittany-Pettersen-4f00239f-feef-59fa-87de-5a62e277bb5f.yml
index 4476fd4aca..fac071e76d 100644
--- a/data/us/legislature/Brittany-Pettersen-4f00239f-feef-59fa-87de-5a62e277bb5f.yml
+++ b/data/us/legislature/Brittany-Pettersen-4f00239f-feef-59fa-87de-5a62e277bb5f.yml
@@ -2,27 +2,36 @@ id: ocd-person/4f00239f-feef-59fa-87de-5a62e277bb5f
 name: Brittany Pettersen
 given_name: Brittany
 family_name: Pettersen
-middle_name: Louise
-gender: F
 birth_date: 1981-12-06
+gender: Female
+email: https://pettersen.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/P000620.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-7
 offices:
 - classification: capitol
-  address: 1230 Longworth House Office Building Washington DC 20515-0607
+  address: 1230 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2645
+- classification: district
+  address: 550 S. Wadsworth Blvd. Suite 400, Lakewood, CO 80226
+  voice: 303-274-7944
+- classification: district
+  address: "611 Greenwood Ave. Suite C, Ca\xF1on City, CO 81212"
+  voice: 719-458-6161
 links:
 - url: https://pettersen.house.gov
   note: website
+- url: https://pettersen.house.gov/
+other_names:
+- name: B. Pettersen
+- name: B.L. Pettersen
+- name: Pettersen, B.
 other_identifiers:
 - scheme: bioguide
   identifier: P000620
@@ -40,3 +49,7 @@ other_identifiers:
   identifier: '138744'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Brittany_Pettersen
+- url: https://en.wikipedia.org/wiki/Brittany_Pettersen
+- url: https://pettersen.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Bruce-Westerman-c46204bc-8484-585e-91de-6053bd3c3cbc.yml b/data/us/legislature/Bruce-Westerman-c46204bc-8484-585e-91de-6053bd3c3cbc.yml
index 453349b6cb..a6db6fed74 100644
--- a/data/us/legislature/Bruce-Westerman-c46204bc-8484-585e-91de-6053bd3c3cbc.yml
+++ b/data/us/legislature/Bruce-Westerman-c46204bc-8484-585e-91de-6053bd3c3cbc.yml
@@ -2,66 +2,66 @@ id: ocd-person/c46204bc-8484-585e-91de-6053bd3c3cbc
 name: Bruce Westerman
 given_name: Bruce
 family_name: Westerman
-gender: M
 birth_date: 1967-11-18
+gender: Male
+email: https://westerman.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/W000821.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-4
 offices:
 - classification: capitol
-  address: 202 Cannon House Office Building Washington DC 20515-0404
+  address: 202 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3772
+  fax: 202-225-1314
 - classification: district
-  address: 101 N. Washington Ave. Suite 406; El Dorado, AR 71730
-  voice: 870-864-8946
+  address: 101 N. Washington Ave. Suite 406, El Dorado, AR 71730
+  voice: 501-609-9796
   fax: 870-864-8958
-  name: 'District Office #1'
 - classification: district
-  address: 101 Reserve St. Suite 200; Hot Springs, AR 71901
+  address: 101 Reserve St. Suite 200, Hot Springs, AR 71901
   voice: 501-609-9796
   fax: 501-609-9887
-  name: 'District Office #2'
 - classification: district
-  address: 211 W. Commercial St.; Ozark, AR 72949
-  voice: 479-667-0075
-  fax: 501-609-9887
-  name: 'District Office #3'
+  address: 211 W. 3rd Ave. Suite 245, Pine Bluff, AR 71601
+  voice: 501-609-9796
+  fax: 570-536-8364
 - classification: district
-  address: 100 E. 8th Ave. Room 2521; Pine Bluff, AR 71601
-  voice: 870-536-8178
-  fax: 870-536-8364
-  name: 'District Office #4'
+  address: 500 W. Main St. Suite 110, Russellville, AR 72801
+  voice: 501-609-9796
 links:
 - url: https://westerman.house.gov
   note: website
+- url: https://westerman.house.gov/
+other_names:
+- name: B. Westerman
+- name: B.E. Westerman
+- name: Westerman, B.
 ids:
   twitter: RepWesterman
   youtube: UCNshPbmupCwP5a7Hi79jETQ
@@ -95,3 +95,11 @@ other_identifiers:
   identifier: Bruce Westerman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bruce_Westerman
+- url: https://en.wikipedia.org/wiki/Bruce_Westerman
+- url: https://justfacts.votesmart.org/candidate/119120/bruce-westerman
+- url: https://theunitedstates.io
+- url: https://westerman.house.gov
+- url: https://westerman.house.gov/about
+- url: https://www.govtrack.us/congress/members/bruce_westerman/412610
+- url: https://www.linkedin.com/in/bruce-westerman-45a06034
diff --git a/data/us/legislature/Bryan-Steil-3203c6f1-12ea-59aa-aeb4-9faa94e04f17.yml b/data/us/legislature/Bryan-Steil-3203c6f1-12ea-59aa-aeb4-9faa94e04f17.yml
index a89a378ab8..da9883499c 100644
--- a/data/us/legislature/Bryan-Steil-3203c6f1-12ea-59aa-aeb4-9faa94e04f17.yml
+++ b/data/us/legislature/Bryan-Steil-3203c6f1-12ea-59aa-aeb4-9faa94e04f17.yml
@@ -2,48 +2,57 @@ id: ocd-person/3203c6f1-12ea-59aa-aeb4-9faa94e04f17
 name: Bryan Steil
 given_name: Bryan
 family_name: Steil
-gender: M
-birth_date: 1981-03-30
+birth_date: 1981-03-03
+gender: Male
+email: https://steil.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001213.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-1
 offices:
 - classification: capitol
-  address: 1526 Longworth House Office Building Washington DC 20515-4901
+  address: 1526 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3031
 - classification: district
-  address: 20 S Main St Suite 10; Janesville, WI 53545-3959
+  address: 20 S. Main St. Suite 10, Janesville, WI 53545
   voice: 608-752-4050
-  name: 'District Office #1'
 - classification: district
-  address: 730 Wisconsin Ave Suite 101; Racine, WI 53403-1238
-  voice: 262-637-0510
-  name: 'District Office #2'
+  address: Beloit City Hall Conference Room 100 State St., Beloit, WI 53511
 - classification: district
-  address: 7511 12th Street; Somers, WI 53171
+  address: Kenosha County Center 19600 75th St., Room 177, Bristol, WI 53104
   voice: 262-654-1901
-  name: 'District Office #3'
+- classification: district
+  address: Matheson Memorial Library, Mary Bray Room 101 N. Wisconsin St., Elkhorn,
+    WI 53121
+- classification: district
+  address: Racine County Courthouse 730 Wisconsin Ave., Room 101, Racine, WI 53403
+  voice: 262-637-0510
+- classification: district
+  address: St. Francis Civic Center 3400 E. Howard Ave., St. Francis, WI 53235
+  voice: 414-285-2120
 links:
 - url: https://steil.house.gov
   note: website
+- url: https://steil.house.gov/
+other_names:
+- name: B. Steil
+- name: B.G. Steil
+- name: Steil, B.
 ids:
   twitter: RepBryanSteil
 other_identifiers:
@@ -69,3 +78,9 @@ other_identifiers:
   identifier: '181289'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bryan_Steil
+- url: https://en.wikipedia.org/wiki/Bryan_Steil
+- url: https://steil.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/bryan_steil/412836
+- url: https://www.linkedin.com/in/bryan-steil-80698845
diff --git a/data/us/legislature/Burgess-Owens-f5c47b2f-8eb9-51f9-b403-d41b5bdcd229.yml b/data/us/legislature/Burgess-Owens-f5c47b2f-8eb9-51f9-b403-d41b5bdcd229.yml
index c4eca0ba16..d5f87bef1b 100644
--- a/data/us/legislature/Burgess-Owens-f5c47b2f-8eb9-51f9-b403-d41b5bdcd229.yml
+++ b/data/us/legislature/Burgess-Owens-f5c47b2f-8eb9-51f9-b403-d41b5bdcd229.yml
@@ -1,32 +1,39 @@
 id: ocd-person/f5c47b2f-8eb9-51f9-b403-d41b5bdcd229
 name: Burgess Owens
-given_name: Clarence
+given_name: Burgess
 family_name: Owens
-gender: M
 birth_date: 1951-08-02
+gender: Male
+email: https://owens.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/O000086.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-4
 offices:
 - classification: capitol
-  address: 309 Cannon House Office Building Washington DC 20515-4404
+  address: 309 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3011
+- classification: district
+  address: 9067 S. 1300 West Suite 101, West Jordan, UT 84088
+  voice: 801-999-9801
 links:
 - url: https://owens.house.gov
   note: website
+- url: https://owens.house.gov/
+other_names:
+- name: B. Owens
+- name: C.B. Owens
+- name: Owens, B.
 ids:
   twitter: RepBurgessOwens
 other_identifiers:
@@ -48,3 +55,11 @@ other_identifiers:
   identifier: Burgess Owens
 sources:
 - url: https://theunitedstates.io/
+- url: https://burgessowens.com
+- url: https://ballotpedia.org/Burgess_Owens
+- url: https://en.wikipedia.org/wiki/Burgess_Owens
+- url: https://justfacts.votesmart.org/candidate/biography/191166/burgess-owens
+- url: https://owens.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/clarence_owens/456852
+- url: https://www.linkedin.com/in/burgessowens
diff --git a/data/us/legislature/Byron-Donalds-c281df65-bcd6-5f42-860c-874e38bcd03a.yml b/data/us/legislature/Byron-Donalds-c281df65-bcd6-5f42-860c-874e38bcd03a.yml
index ea8be8a911..630753f681 100644
--- a/data/us/legislature/Byron-Donalds-c281df65-bcd6-5f42-860c-874e38bcd03a.yml
+++ b/data/us/legislature/Byron-Donalds-c281df65-bcd6-5f42-860c-874e38bcd03a.yml
@@ -2,32 +2,42 @@ id: ocd-person/c281df65-bcd6-5f42-860c-874e38bcd03a
 name: Byron Donalds
 given_name: Byron
 family_name: Donalds
-middle_name: Lowell
-gender: M
 birth_date: 1978-10-28
+gender: Male
+email: https://donalds.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/D000032.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-19
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-19
 offices:
 - classification: capitol
-  address: 1719 Longworth House Office Building Washington DC 20515-0919
+  address: 1719 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2536
+- classification: district
+  address: 1039 SE 9th Ave. Suite 308, Cape Coral, FL 33990
+  voice: 239-599-6033
+- classification: district
+  address: 3299 Tamiami Trail East Suite 105, Naples, FL 34112
+  voice: 239-252-6225
 links:
 - url: https://donalds.house.gov
   note: website
+- url: https://www.myfloridahouse.gov/Sections/Representatives/details.aspx?MemberId=4636
+- url: https://donalds.house.gov/
+other_names:
+- name: B. Donalds
+- name: B.L. Donalds
+- name: Donalds, B.
 ids:
   twitter: RepDonaldsPress
 other_identifiers:
@@ -49,3 +59,10 @@ other_identifiers:
   identifier: '137655'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Byron_Donalds
+- url: https://donalds.house.gov
+- url: https://en.wikipedia.org/wiki/Byron_Donalds
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/byron_donalds/456808
+- url: https://www.linkedin.com/in/byron-donalds-35163733
+- url: https://www.myfloridahouse.gov/Sections/Representatives/details.aspx?MemberId=4636
diff --git a/data/us/legislature/C-A-Dutch-Ruppersberger-6badec3f-9e2b-5f2c-8683-dd8a7ae87d9f.yml b/data/us/legislature/C-A-Dutch-Ruppersberger-6badec3f-9e2b-5f2c-8683-dd8a7ae87d9f.yml
index 84f51f6a8a..55fa04335e 100644
--- a/data/us/legislature/C-A-Dutch-Ruppersberger-6badec3f-9e2b-5f2c-8683-dd8a7ae87d9f.yml
+++ b/data/us/legislature/C-A-Dutch-Ruppersberger-6badec3f-9e2b-5f2c-8683-dd8a7ae87d9f.yml
@@ -1,83 +1,87 @@
 id: ocd-person/6badec3f-9e2b-5f2c-8683-dd8a7ae87d9f
-name: C. A. Dutch Ruppersberger
-given_name: C.
+name: Dutch Ruppersberger
+given_name: Dutch
 family_name: Ruppersberger
-middle_name: A. Dutch
-gender: M
 birth_date: 1946-01-31
+gender: Male
+email: https://ruppersberger.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/R000576.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2003-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-2
 offices:
 - classification: capitol
-  address: 2206 Rayburn House Office Building Washington DC 20515-2002
+  address: 2206 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3061
+  fax: 202-225-3094
 - classification: district
-  address: 375 W. Padonia Rd. Suite 200; Timonium, MD 21093
+  address: The Atrium 375 W. Padonia Road, Suite 200, Timonium, MD 21093
   voice: 410-628-2701
   fax: 410-628-2708
-  name: 'District Office #1'
 links:
 - url: https://ruppersberger.house.gov
   note: website
+- url: https://ruppersberger.house.gov/
+other_names:
+- name: C. A. Dutch Ruppersberger
+- name: C.A.D. Ruppersberger
+- name: D. Ruppersberger
+- name: Ruppersberger, D.
 ids:
   twitter: Call_Me_Dutch
   youtube: UCk2S9iSHNpo1E1A7qZ0SPIw
@@ -113,3 +117,9 @@ other_identifiers:
   identifier: Dutch Ruppersberger
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dutch_Ruppersberger
+- url: https://en.wikipedia.org/wiki/Dutch_Ruppersberger
+- url: https://justfacts.votesmart.org/candidate/36130/dutch-ruppersberger
+- url: https://ruppersberger.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/a_dutch_ruppersberger/400349
diff --git a/data/us/legislature/Carlos-A-Gimenez-9db37a87-2ba9-56a0-9b42-89697222e044.yml b/data/us/legislature/Carlos-A-Gimenez-9db37a87-2ba9-56a0-9b42-89697222e044.yml
index 683aacda98..e1ece3a0b9 100644
--- a/data/us/legislature/Carlos-A-Gimenez-9db37a87-2ba9-56a0-9b42-89697222e044.yml
+++ b/data/us/legislature/Carlos-A-Gimenez-9db37a87-2ba9-56a0-9b42-89697222e044.yml
@@ -1,33 +1,46 @@
 id: ocd-person/9db37a87-2ba9-56a0-9b42-89697222e044
-name: Carlos A. Gimenez
+name: "Carlos Gim\xE9nez"
 given_name: Carlos
-family_name: Gimenez
-middle_name: A.
-gender: M
+family_name: "Gim\xE9nez"
 birth_date: 1954-01-17
+gender: Male
+email: https://gimenez.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/G000593.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-26
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-28
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-28
+  district: FL-26
 offices:
 - classification: capitol
-  address: 448 Cannon House Office Building Washington DC 20515-0001
+  address: 448 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2778
+- classification: district
+  address: 1100 Simonton St. Room 1-213, Key West, FL 33040
+  voice: 305-292-4485
+- classification: district
+  address: 14221 SW 120th St. Suite 115, Miami, FL 33186
+  voice: 305-222-0160
+- classification: district
+  address: 404 W. Palm Drive, Florida City, FL 33034
+  voice: 305-222-0160
 links:
 - url: https://gimenez.house.gov
   note: website
+- url: https://gimenez.house.gov/
+other_names:
+- name: "C. Gim\xE9nez"
+- name: "C.A. Gim\xE9nez"
+- name: Carlos A. Gimenez
+- name: "Gim\xE9nez, C."
 ids:
   twitter: RepCarlos
 other_identifiers:
@@ -51,3 +64,9 @@ other_identifiers:
   identifier: Carlos Gimenez
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Carlos_Gimenez
+- url: https://en.wikipedia.org/wiki/Carlos_A._Gim%c3%a9nez
+- url: https://gimenez.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/81366/carlos-gimenez
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/carlos_gimenez/456809
diff --git a/data/us/legislature/Carol-D-Miller-1ad151d2-5d26-5421-9b6f-a87d4a05396f.yml b/data/us/legislature/Carol-D-Miller-1ad151d2-5d26-5421-9b6f-a87d4a05396f.yml
index b9fd49e0ef..1c9b7e1107 100644
--- a/data/us/legislature/Carol-D-Miller-1ad151d2-5d26-5421-9b6f-a87d4a05396f.yml
+++ b/data/us/legislature/Carol-D-Miller-1ad151d2-5d26-5421-9b6f-a87d4a05396f.yml
@@ -1,53 +1,56 @@
 id: ocd-person/1ad151d2-5d26-5421-9b6f-a87d4a05396f
-name: Carol D. Miller
+name: Carol Miller
 given_name: Carol
 family_name: Miller
-middle_name: D.
-gender: F
 birth_date: 1950-11-04
+gender: Female
+email: https://millerforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001205.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: WV-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: WV-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: WV-1
+  district: WV-3
 offices:
 - classification: capitol
-  address: 465 Cannon House Office Building Washington DC 20515-4801
+  address: 465 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3452
 - classification: district
-  address: 307 Prince St; Beckley, WV 25801-4515
-  voice: 304-250-6177
-  name: 'District Office #1'
+  address: 2699 Park Ave. Suite 220, Huntington, WV 25701
+  voice: 304-522-2201
+  fax: 304-529-5716
 - classification: district
-  address: 601 Federal St; Bluefield, WV 24701-3066
-  name: 'District Office #2'
+  address: 3 Tennessee Ave., Charleston, WV 25302
+  voice: 681-945-6556
 - classification: district
-  address: 845 5th Ave; Huntington, WV 25701-2014
-  voice: 304-522-2201
-  name: 'District Office #3'
+  address: 3049 Robert C. Byrd Drive Suite 330, Beckley, WV 25801
+  voice: 304-250-6177
+  fax: 304-250-6179
 links:
 - url: https://miller.house.gov
   note: website
-ids:
-  twitter: RepCarolMiller
+- url: https://miller.house.gov/
 other_names:
+- name: C. Miller
+- name: C.D. Miller
+- name: Carol D. Miller
 - name: Miller (WV)
+- name: Miller, C.
+ids:
+  twitter: RepCarolMiller
 other_identifiers:
 - scheme: bioguide
   identifier: M001205
@@ -71,3 +74,9 @@ other_identifiers:
   identifier: Carol Miller (West Virginia)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Carol_Miller_(West_Virginia)
+- url: https://en.wikipedia.org/wiki/Carol_Miller_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/52123/carol-miller
+- url: https://miller.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/carol_miller/412837
diff --git a/data/us/legislature/Catherine-Cortez-Masto-00bdfb60-1b6f-5a4a-9157-b7cafc399c46.yml b/data/us/legislature/Catherine-Cortez-Masto-00bdfb60-1b6f-5a4a-9157-b7cafc399c46.yml
index 39f4213f6c..12e486c68a 100644
--- a/data/us/legislature/Catherine-Cortez-Masto-00bdfb60-1b6f-5a4a-9157-b7cafc399c46.yml
+++ b/data/us/legislature/Catherine-Cortez-Masto-00bdfb60-1b6f-5a4a-9157-b7cafc399c46.yml
@@ -2,49 +2,50 @@ id: ocd-person/00bdfb60-1b6f-5a4a-9157-b7cafc399c46
 name: Catherine Cortez Masto
 given_name: Catherine
 family_name: Cortez Masto
-gender: F
 birth_date: 1964-03-29
+gender: Female
+email: https://www.cortezmasto.senate.gov/contact/connect/
 image: https://theunitedstates.io/images/congress/450x550/C001113.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nevada
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nevada
 offices:
 - classification: capitol
-  address: 520 Hart Senate Office Building Washington DC 20510
+  address: 520 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3542
 - classification: district
-  address: 333 Las Vegas Boulevard South Suite 8016; Las Vegas, NV 89101
+  address: 333 Las Vegas Blvd. South Suite 8016, Las Vegas, NV 89101
   voice: 702-388-5020
   fax: 702-388-5030
-  name: 'District Office #1'
 - classification: district
-  address: 400 South Virginia Street Suite 902; Reno, NV 89501
+  address: 400 S. Virginia St. Suite 902, Reno, NV 89501
   voice: 775-686-5750
   fax: 775-686-5757
-  name: 'District Office #2'
 links:
 - url: https://www.cortezmasto.senate.gov
   note: website
 - url: https://www.cortezmasto.senate.gov/contact
   note: contact form
+- url: https://www.cortezmasto.senate.gov/
+other_names:
+- name: C. Cortez Masto
+- name: C.M. Cortez Masto
+- name: Cortez Masto (D-NV)
+- name: Cortez Masto, C.
 ids:
   twitter: SenCortezMasto
   youtube: UCip_83SiKUqwnUT57VOXrCg
   facebook: SenatorCortezMasto
-other_names:
-- name: Cortez Masto (D-NV)
 other_identifiers:
 - scheme: bioguide
   identifier: C001113
@@ -74,3 +75,10 @@ other_identifiers:
   identifier: '41700'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Catherine_Cortez_Masto
+- url: https://catherinecortezmasto.com/meet-catherine
+- url: https://en.wikipedia.org/wiki/Catherine_Cortez_Masto
+- url: https://justfacts.votesmart.org/candidate/biography/69579/catherine-cortez-masto
+- url: https://theunitedstates.io
+- url: https://www.cortezmasto.senate.gov
+- url: https://www.govtrack.us/congress/members/catherine_cortez_masto/412681
diff --git a/data/us/legislature/Cathy-McMorris-Rodgers-b420935f-8662-5012-ab5a-befcdc9e39f2.yml b/data/us/legislature/Cathy-McMorris-Rodgers-b420935f-8662-5012-ab5a-befcdc9e39f2.yml
index 40f300e3a1..9a075ba684 100644
--- a/data/us/legislature/Cathy-McMorris-Rodgers-b420935f-8662-5012-ab5a-befcdc9e39f2.yml
+++ b/data/us/legislature/Cathy-McMorris-Rodgers-b420935f-8662-5012-ab5a-befcdc9e39f2.yml
@@ -2,90 +2,89 @@ id: ocd-person/b420935f-8662-5012-ab5a-befcdc9e39f2
 name: Cathy McMorris Rodgers
 given_name: Cathy
 family_name: McMorris Rodgers
-middle_name: Anne
-gender: F
 birth_date: 1969-05-22
+gender: Female
+email: https://mcmorris.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001159.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-5
 offices:
 - classification: capitol
-  address: 2188 Rayburn House Office Building Washington DC 20515-4705
+  address: 2188 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2006
 - classification: district
-  address: 555 S. Main St.; Colville, WA 99114
+  address: 26 E. Main St. Suite 2, Walla Walla, WA 99362
+  voice: 509-529-9358
+- classification: district
+  address: 555 S. Main St. Suite C, Colville, WA 99114
   voice: 509-684-3481
-  name: 'District Office #1'
 - classification: district
-  address: 10 North Post Street Suite 625; Spokane, WA 99201
+  address: 850 E. Spokane Falls Blvd. Suite 270, Spokane, WA 99202
   voice: 509-353-2374
-  name: 'District Office #2'
-- classification: district
-  address: 26 E. Main St. Suite 2; Walla Walla, WA 99362
-  voice: 509-529-9358
-  name: 'District Office #3'
 links:
 - url: https://mcmorris.house.gov
   note: website
+- url: https://mcmorris.house.gov/
+other_names:
+- name: C. McMorris Rodgers
+- name: C.A. McMorris Rodgers
+- name: McMorris Rodgers, C.
+- name: Rodgers (WA)
 ids:
   twitter: CathyMcMorris
   youtube: UCRp0lwIxAhq2Ia9_YgRWUkg
   facebook: mcmorrisrodgers
-other_names:
-- name: Rodgers (WA)
 other_identifiers:
 - scheme: bioguide
   identifier: M001159
@@ -117,3 +116,10 @@ other_identifiers:
   identifier: kg:/m/03dlf3
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cathy_McMorris_Rodgers
+- url: https://en.wikipedia.org/wiki/Cathy_McMorris_Rodgers
+- url: https://justfacts.votesmart.org/candidate/biography/3217/cathy-rodgers
+- url: https://mcmorris.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/cathy_mcmorris_rodgers/400659
+- url: https://www.linkedin.com/in/cathymcmorrisrodgers
diff --git a/data/us/legislature/Celeste-Maloy-d242dd37-9f71-5412-9328-798305153967.yml b/data/us/legislature/Celeste-Maloy-d242dd37-9f71-5412-9328-798305153967.yml
index 5ed1674216..be3ba848e9 100644
--- a/data/us/legislature/Celeste-Maloy-d242dd37-9f71-5412-9328-798305153967.yml
+++ b/data/us/legislature/Celeste-Maloy-d242dd37-9f71-5412-9328-798305153967.yml
@@ -2,26 +2,34 @@ id: ocd-person/d242dd37-9f71-5412-9328-798305153967
 name: Celeste Maloy
 given_name: Celeste
 family_name: Maloy
-gender: F
 birth_date: 1981-05-22
+gender: Female
+email: https://maloy.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001228.jpg
 party:
-- start_date: '2023-11-21'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-11-21'
-  end_date: '2025-01-03'
+- start_date: 2023-11-21
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-2
 offices:
 - classification: capitol
-  address: 166 Cannon House Office Building Washington DC 20515-4402
+  address: 166 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-9730
+- classification: district
+  address: 16 S. 300 West, St. George, UT 84770
+- classification: district
+  address: '585 W. 500 South #230, Bountiful, UT 84010'
+  voice: 801-364-5550
 links:
 - url: https://maloy.house.gov
   note: website
+- url: https://maloy.house.gov/
+other_names:
+- name: C. Maloy
+- name: Maloy, C.
 other_identifiers:
 - scheme: bioguide
   identifier: M001228
@@ -39,3 +47,9 @@ other_identifiers:
   identifier: Celeste Maloy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Celeste_Maloy
+- url: https://en.wikipedia.org/wiki/Celeste_Maloy
+- url: https://maloy.house.gov
+- url: https://theunitedstates.io
+- url: https://www.celesteforutah.com/meet-celeste
+- url: https://www.linkedin.com/in/celeste-maloy-71043166
diff --git a/data/us/legislature/Charles-E-Schumer-ced62f94-88a6-5a4b-b470-89cf1ee4bdac.yml b/data/us/legislature/Charles-E-Schumer-ced62f94-88a6-5a4b-b470-89cf1ee4bdac.yml
index 2ad2ad87e6..b6d06908ee 100644
--- a/data/us/legislature/Charles-E-Schumer-ced62f94-88a6-5a4b-b470-89cf1ee4bdac.yml
+++ b/data/us/legislature/Charles-E-Schumer-ced62f94-88a6-5a4b-b470-89cf1ee4bdac.yml
@@ -1,141 +1,137 @@
 id: ocd-person/ced62f94-88a6-5a4b-b470-89cf1ee4bdac
-name: Charles E. Schumer
-given_name: Charles
+name: Chuck Schumer
+given_name: Chuck
 family_name: Schumer
-middle_name: E.
-gender: M
 birth_date: 1950-11-23
+gender: Male
+email: https://www.schumer.senate.gov/contact/message-chuck
 image: https://theunitedstates.io/images/congress/450x550/S000148.jpg
 party:
-- start_date: '1981-01-05'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New York
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New York
+- start_date: 2011-01-05
+  end_date: 2017-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New York
+- start_date: 2005-01-04
+  end_date: 2011-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New York
+- start_date: 1999-01-06
+  end_date: 2005-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: New York
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-16
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+  district: NY-9
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+  district: NY-9
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+  district: NY-9
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-10
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-10
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-10
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: NY-10
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: NY-10
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
-- start_date: '1999-01-06'
-  end_date: '2005-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New York
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New York
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New York
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New York
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: New York
+  district: NY-16
 offices:
 - classification: capitol
-  address: 322 Hart Senate Office Building Washington DC 20510
+  address: 322 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6542
-- classification: district
-  address: 100 State St. Room 3040; Rochester, NY 14614
-  voice: 585-263-5866
-  fax: 585-263-3173
-  name: 'District Office #1'
-- classification: district
-  address: 1 Clinton Ave. Room 420; Albany, NY 12207
+  fax: 202-228-3027
+- classification: capitol
+  address: Leo O'Brien Building Room 827, Albany, NY 12207
   voice: 518-431-4070
   fax: 518-431-4076
-  name: 'District Office #2'
 - classification: district
-  address: 15 Henry St. Room. 100 A-F; Binghamton, NY 13901
-  voice: 607-772-6792
-  fax: 607-772-8124
-  name: 'District Office #3'
+  address: 1 Park Place Suite 100, Peekskill, NY 10566
+  voice: 914-734-1532
+  fax: 914-734-1673
+- classification: district
+  address: 100 S. Clinton St. Room 841, Syracuse, NY 13261
+  voice: 315-423-5471
+  fax: 315-423-5185
+- classification: district
+  address: 100 State St. Room 3040, Rochester, NY 14614
+  voice: 585-263-5866
+  fax: 585-263-3173
 - classification: district
-  address: '130 S. Elmwood Ave. #660; Buffalo, NY 14202'
+  address: 130 S. Elmwood Ave. Suite 660, Buffalo, NY 14202
   voice: 716-846-4111
   fax: 716-846-4113
-  name: 'District Office #4'
 - classification: district
-  address: 145 Pine Lawn Rd. Suite 300; Melville, NY 11747
+  address: 145 Pine Lawn Road Suite 300N, Melville, NY 11747
   voice: 631-753-0978
-  fax: 631-753-0997
-  name: 'District Office #5'
+  fax: 631-391-9068
 - classification: district
-  address: 780 Third Ave. Suite 2301; New York, NY 10017
+  address: 780 3rd Ave. Suite 2301, New York, NY 10017
   voice: 212-486-4430
-  fax: 202-228-2838
-  name: 'District Office #6'
+  fax: 212-228-2838
 - classification: district
-  address: One Park Place Suite 100; Peekskill, NY 10566
-  voice: 914-734-1532
-  fax: 914-734-1673
-  name: 'District Office #7'
-- classification: district
-  address: 100 S. Clinton St. Room 841; Syracuse, NY 13261
-  voice: 315-423-5471
-  fax: 315-423-5185
-  name: 'District Office #8'
+  address: Federal Office Building 15 Henry St., Room 100 A-F, Binghamton, NY 13901
+  voice: 607-772-6792
+  fax: 607-772-8124
 links:
 - url: https://www.schumer.senate.gov
   note: website
 - url: https://www.schumer.senate.gov/contact/email-chuck
   note: contact form
+- url: https://www.schumer.senate.gov/
+other_names:
+- name: C. Schumer
+- name: C.E. Schumer
+- name: Charles E. Schumer
+- name: Schumer (D-NY)
+- name: Schumer, C.
 ids:
   twitter: SenSchumer
   youtube: UC-ABttxh8uQv_10qmwGaidw
   facebook: senschumer
-other_names:
-- name: Schumer (D-NY)
 other_identifiers:
 - scheme: bioguide
   identifier: S000148
@@ -171,3 +167,9 @@ other_identifiers:
   identifier: kg:/m/01w74d
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chuck_Schumer
+- url: https://en.wikipedia.org/wiki/Chuck_Schumer
+- url: https://justfacts.votesmart.org/candidate/26976/chuck-schumer
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/charles_schumer/300087
+- url: https://www.schumer.senate.gov
diff --git a/data/us/legislature/Charles-J-Chuck-Fleischmann-640abb7e-8890-59bc-b5cb-b21c88288657.yml b/data/us/legislature/Charles-J-Chuck-Fleischmann-640abb7e-8890-59bc-b5cb-b21c88288657.yml
index fa94555e0a..2f9bf27d6e 100644
--- a/data/us/legislature/Charles-J-Chuck-Fleischmann-640abb7e-8890-59bc-b5cb-b21c88288657.yml
+++ b/data/us/legislature/Charles-J-Chuck-Fleischmann-640abb7e-8890-59bc-b5cb-b21c88288657.yml
@@ -1,73 +1,75 @@
 id: ocd-person/640abb7e-8890-59bc-b5cb-b21c88288657
-name: Charles J. "Chuck" Fleischmann
-given_name: Charles
+name: Chuck Fleischmann
+given_name: Chuck
 family_name: Fleischmann
-middle_name: J.
-gender: M
 birth_date: 1962-10-11
+gender: Male
+email: https://fleischmann.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/F000459.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-3
 offices:
 - classification: capitol
-  address: 2187 Rayburn House Office Building Washington DC 20515-4203
+  address: 2187 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3271
+  fax: 202-225-3494
 - classification: district
-  address: 6 E. Madison Ave.; Athens, TN 37303
-  voice: 423-745-4671
-  fax: 423-745-6025
-  name: 'District Office #1'
+  address: 200 Administration Road Suite 100, Oak Ridge, TN 37830
+  voice: 865-576-1976
+  fax: 865-576-3221
 - classification: district
-  address: 900 Georgia Ave. Suite 126; Chattanooga, TN 37402
+  address: 900 Georgia Ave. Suite 126, Chattanooga, TN 37402
   voice: 423-756-2342
   fax: 423-756-6613
-  name: 'District Office #2'
 - classification: district
-  address: 200 Administration Rd. Suite 100; Oak Ridge, TN 37830
-  voice: 865-576-1976
-  fax: 865-576-3221
-  name: 'District Office #3'
+  address: Athens Courthouse 6 E. Madison Ave., Athens, TN 37303
+  voice: 423-745-4671
+  fax: 423-745-6025
 links:
 - url: https://fleischmann.house.gov
   note: website
+- url: https://fleischmann.house.gov/
+other_names:
+- name: C. Fleischmann
+- name: C.J. Fleischmann
+- name: Charles J. "Chuck" Fleischmann
+- name: Fleischmann, C.
 ids:
   twitter: RepChuck
   youtube: UCTtRrJkM-R-f2K0byCMvHgw
@@ -103,3 +105,9 @@ other_identifiers:
   identifier: Charles Fleischmann
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Charles_Fleischmann
+- url: https://en.wikipedia.org/wiki/Chuck_Fleischmann
+- url: https://fleischmann.house.gov
+- url: https://justfacts.votesmart.org/candidate/123456/chuck-fleischmann
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/charles_fleischmann/412476
diff --git a/data/us/legislature/Chellie-Pingree-78a440e5-f314-5f5b-930b-48ab822bb39a.yml b/data/us/legislature/Chellie-Pingree-78a440e5-f314-5f5b-930b-48ab822bb39a.yml
index 7e8def8e77..f5018b2118 100644
--- a/data/us/legislature/Chellie-Pingree-78a440e5-f314-5f5b-930b-48ab822bb39a.yml
+++ b/data/us/legislature/Chellie-Pingree-78a440e5-f314-5f5b-930b-48ab822bb39a.yml
@@ -2,71 +2,74 @@ id: ocd-person/78a440e5-f314-5f5b-930b-48ab822bb39a
 name: Chellie Pingree
 given_name: Chellie
 family_name: Pingree
-gender: F
 birth_date: 1955-04-02
+gender: Female
+email: https://pingree.house.gov/contact/contactform.htm
 image: https://theunitedstates.io/images/congress/450x550/P000597.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-1
 offices:
 - classification: capitol
-  address: 2354 Rayburn House Office Building Washington DC 20515-1901
+  address: 2354 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6116
+  fax: 202-225-5590
 - classification: district
-  address: 2 Portland Fish Pier Suite 304; Portland, ME 04101
-  voice: 207-774-5019
-  fax: 207-871-0720
-  name: 'District Office #1'
-- classification: district
-  address: 1 Silver St.; Waterville, ME 04901
+  address: 1 Silver St., Waterville, ME 04901
   voice: 207-873-5713
   fax: 207-873-5717
-  name: 'District Office #2'
+- classification: district
+  address: 2 Portland Fish Pier Suite 304, Portland, ME 04101
+  voice: 207-774-5019
+  fax: 207-871-0720
 links:
 - url: https://pingree.house.gov
   note: website
+- url: https://pingree.house.gov/
+other_names:
+- name: C. Pingree
+- name: Pingree, C.
+- name: R.M. Pingree
 ids:
   twitter: ChelliePingree
   youtube: UCLKaWFM7I84WcreDRhhhkVg
@@ -104,3 +107,9 @@ other_identifiers:
   identifier: kg:/m/05gflq
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chellie_Pingree
+- url: https://en.wikipedia.org/wiki/Chellie_Pingree
+- url: https://justfacts.votesmart.org/candidate/6586/chellie-pingree
+- url: https://pingree.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/chellie_pingree/412307
diff --git a/data/us/legislature/Chip-Roy-2398f81d-6371-544d-a7ff-24cf993a716b.yml b/data/us/legislature/Chip-Roy-2398f81d-6371-544d-a7ff-24cf993a716b.yml
index fb09512f1f..374e15ad37 100644
--- a/data/us/legislature/Chip-Roy-2398f81d-6371-544d-a7ff-24cf993a716b.yml
+++ b/data/us/legislature/Chip-Roy-2398f81d-6371-544d-a7ff-24cf993a716b.yml
@@ -2,41 +2,50 @@ id: ocd-person/2398f81d-6371-544d-a7ff-24cf993a716b
 name: Chip Roy
 given_name: Chip
 family_name: Roy
-gender: M
 birth_date: 1972-08-07
+gender: Male
+email: https://roy.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/R000614.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-21
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-21
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-21
 offices:
 - classification: capitol
-  address: 103 Cannon House Office Building Washington DC 20515-4321
+  address: 103 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4236
 - classification: district
-  address: 1100 NE Loop 410 Suite 640; San Antonio, TX 78209-1537
+  address: 125 Lehmann Drive Suite 201, Kerrville, TX 78028
+  voice: 830-896-0154
+- classification: district
+  address: 16414 San Pedro Ave. Suite 817, San Antonio, TX 78232
   voice: 210-821-5024
   fax: 210-821-5947
-  name: 'District Office #1'
+- classification: district
+  address: 5900 Southwest Parkway Building 5, Suite 520, Austin, TX 78735
+  voice: 512-871-5959
 links:
 - url: https://roy.house.gov
   note: website
+- url: https://roy.house.gov/
+other_names:
+- name: C. Roy
+- name: C.E. Roy
+- name: Roy, C.
 ids:
   twitter: RepChipRoy
 other_identifiers:
@@ -62,3 +71,12 @@ other_identifiers:
   identifier: kg:/g/11fghyq4y1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chip_Roy
+- url: https://chiproy.com/about
+- url: https://en.wikipedia.org/wiki/Chip_Roy
+- url: https://justfacts.votesmart.org/candidate/biography/177319/chip-roy
+- url: https://roy.house.gov
+- url: https://roy.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/chip_roy/412826
+- url: https://www.linkedin.com/in/chip-roy-1055923
diff --git a/data/us/legislature/Chris-Pappas-22a8725b-acc8-530a-9a57-6b0a7f750fca.yml b/data/us/legislature/Chris-Pappas-22a8725b-acc8-530a-9a57-6b0a7f750fca.yml
index 8a5642d810..b4537b93b9 100644
--- a/data/us/legislature/Chris-Pappas-22a8725b-acc8-530a-9a57-6b0a7f750fca.yml
+++ b/data/us/legislature/Chris-Pappas-22a8725b-acc8-530a-9a57-6b0a7f750fca.yml
@@ -2,40 +2,50 @@ id: ocd-person/22a8725b-acc8-530a-9a57-6b0a7f750fca
 name: Chris Pappas
 given_name: Chris
 family_name: Pappas
-gender: M
 birth_date: 1980-06-04
+gender: Male
+email: https://pappas.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/P000614.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NH-1
 offices:
 - classification: capitol
-  address: 452 Cannon House Office Building Washington DC 20515-2901
+  address: 452 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5456
 - classification: district
-  address: 660 Central Ave Suite 101; Dover, NH 03820-3491
+  address: 2541 White Mountain Highway Building 1, Unit 4, North Conway, NH 03860
+  voice: 603-733-5100
+- classification: district
+  address: 660 Central Ave. Suite 101, Dover, NH 03820
   voice: 603-285-4300
-  name: 'District Office #1'
+  fax: 603-343-1326
+- classification: district
+  address: 889 Elm St., Manchester, NH 03101
+  voice: 603-935-6710
 links:
 - url: https://pappas.house.gov
   note: website
+- url: https://pappas.house.gov/
+other_names:
+- name: C. Pappas
+- name: C.C. Pappas
+- name: Pappas, C.
 ids:
   twitter: RepChrisPappas
 other_identifiers:
@@ -61,3 +71,8 @@ other_identifiers:
   identifier: Chris Pappas
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chris_Pappas
+- url: https://en.wikipedia.org/wiki/Chris_Pappas_(American_politician)
+- url: https://pappas.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/chris_pappas/412795
diff --git a/data/us/legislature/Chris-Van-Hollen-6b768c01-2e7d-5316-9ece-d5e215648f85.yml b/data/us/legislature/Chris-Van-Hollen-6b768c01-2e7d-5316-9ece-d5e215648f85.yml
index 9bde81a5ec..096c61009b 100644
--- a/data/us/legislature/Chris-Van-Hollen-6b768c01-2e7d-5316-9ece-d5e215648f85.yml
+++ b/data/us/legislature/Chris-Van-Hollen-6b768c01-2e7d-5316-9ece-d5e215648f85.yml
@@ -2,99 +2,97 @@ id: ocd-person/6b768c01-2e7d-5316-9ece-d5e215648f85
 name: Chris Van Hollen
 given_name: Chris
 family_name: Van Hollen
-gender: M
 birth_date: 1959-01-10
+gender: Male
+email: https://www.vanhollen.senate.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/V000128.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Maryland
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Maryland
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Maryland
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Maryland
 offices:
 - classification: capitol
-  address: 730 Hart Senate Office Building Washington DC 20510
+  address: 730 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4654
+  fax: 202-228-0629
 - classification: district
-  address: 111 Rockville Pike Suite 960; Rockville, MD 20850
+  address: 1040 Park Ave. Suite 120, Baltimore, MD 21201
+  voice: 667-212-4610
+- classification: district
+  address: 1101 Mercantile Lane Suite 210, Largo, MD 20774
+  voice: 301-322-6560
+- classification: district
+  address: 111 Rockville Pike Suite 960, Rockville, MD 20850
   voice: 301-545-1500
   fax: 301-545-1512
-  name: 'District Office #1'
 - classification: district
-  address: 32 West Washington Street Suite 203; Hagerstown, MD 21740
-  voice: 301-797-2826
-  name: 'District Office #2'
+  address: 204 Cedar St. Suite 200C, Cambridge, MD 21613
+  voice: 410-221-2074
 - classification: district
-  address: 1900 North Howard Street Suite 100; Baltimore, MD 21218
-  voice: 667-212-4610
-  name: 'District Office #3'
+  address: 32 W. Washington St. Suite 203, Hagerstown, MD 21740
+  voice: 301-797-2826
 - classification: district
-  address: 60 West Street Suite 107; Annapolis, MD 21401
+  address: 60 West St. Suite 107, Annapolis, MD 21401
   voice: 410-263-1325
-  name: 'District Office #4'
-- classification: district
-  address: 204 Cedar Street Suite 200C; Cambridge, MD 21613
-  voice: 410-221-2074
-  name: 'District Office #5'
-- classification: district
-  address: 1101 Mercantile Ln Suite 210; Largo, MD 20774-5360
-  voice: 301-322-6560
-  name: 'District Office #6'
 links:
 - url: https://www.vanhollen.senate.gov
   note: website
 - url: https://www.vanhollen.senate.gov/contact/email
   note: contact form
+- url: https://www.vanhollen.senate.gov/
+other_names:
+- name: C. Van Hollen
+- name: C.J. Van Hollen
+- name: Van Hollen (D-MD)
+- name: Van Hollen, C.
 ids:
   twitter: ChrisVanHollen
   youtube: UCkpfJWu1N9Okd6PE_NidtBQ
   facebook: chrisvanhollen
-other_names:
-- name: Van Hollen (D-MD)
 other_identifiers:
 - scheme: bioguide
   identifier: V000128
@@ -130,3 +128,12 @@ other_identifiers:
   identifier: Chris Van Hollen
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chris_Van_Hollen
+- url: https://en.wikipedia.org/wiki/Chris_Van_Hollen
+- url: https://justfacts.votesmart.org/candidate/biography/6098/chris-van-hollen-jr
+- url: https://theunitedstates.io
+- url: https://vanhollen.org/about
+- url: https://www.bloomberg.com/profile/person/4204169?leadSource=uverify%20wall
+- url: https://www.govtrack.us/congress/members/chris_van_hollen/400415
+- url: https://www.vanhollen.senate.gov
+- url: https://www.vanhollen.senate.gov/about
diff --git a/data/us/legislature/Chrissy-Houlahan-04b67b59-b46f-5db7-96e3-a78591cf0734.yml b/data/us/legislature/Chrissy-Houlahan-04b67b59-b46f-5db7-96e3-a78591cf0734.yml
index 0469e43480..e404edb7fc 100644
--- a/data/us/legislature/Chrissy-Houlahan-04b67b59-b46f-5db7-96e3-a78591cf0734.yml
+++ b/data/us/legislature/Chrissy-Houlahan-04b67b59-b46f-5db7-96e3-a78591cf0734.yml
@@ -2,40 +2,46 @@ id: ocd-person/04b67b59-b46f-5db7-96e3-a78591cf0734
 name: Chrissy Houlahan
 given_name: Chrissy
 family_name: Houlahan
-gender: F
 birth_date: 1967-06-05
+gender: Female
+email: https://houlahan.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/H001085.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-6
 offices:
 - classification: capitol
-  address: 1727 Longworth House Office Building Washington DC 20515-3806
+  address: 1727 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4315
 - classification: district
-  address: 815 Washington St 2-48; Reading, PA 19601-3615
+  address: 201 Penn St. Suite 201, Reading, PA 19601
   voice: 610-295-0815
-  name: 'District Office #1'
+- classification: district
+  address: 709 E. Gay St. Suite 4, West Chester, PA 19380
+  voice: 610-883-5050
 links:
 - url: https://houlahan.house.gov
   note: website
+- url: https://houlahan.house.gov/
+other_names:
+- name: C. Houlahan
+- name: C.M.J. Houlahan
+- name: Houlahan, C.
 ids:
   twitter: RepHoulahan
 other_identifiers:
@@ -61,3 +67,10 @@ other_identifiers:
   identifier: kg:/g/11fghyq4ym
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chrissy_Houlahan
+- url: https://en.wikipedia.org/wiki/Chrissy_Houlahan
+- url: https://houlahan.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/178893/chrissy-houlahan
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/chrissy_houlahan/412810
+- url: https://www.linkedin.com/in/christina-houlahan-572a217
diff --git a/data/us/legislature/Christopher-A-Coons-792faee4-b972-54ed-b42d-47b41a22ccb3.yml b/data/us/legislature/Christopher-A-Coons-792faee4-b972-54ed-b42d-47b41a22ccb3.yml
index 45a527b80b..5b090eae34 100644
--- a/data/us/legislature/Christopher-A-Coons-792faee4-b972-54ed-b42d-47b41a22ccb3.yml
+++ b/data/us/legislature/Christopher-A-Coons-792faee4-b972-54ed-b42d-47b41a22ccb3.yml
@@ -1,56 +1,56 @@
 id: ocd-person/792faee4-b972-54ed-b42d-47b41a22ccb3
-name: Christopher A. Coons
-given_name: Christopher
+name: Chris Coons
+given_name: Chris
 family_name: Coons
-middle_name: Andrew
-gender: M
 birth_date: 1963-09-09
+gender: Male
+email: https://www.coons.senate.gov/contact/share-your-opinion
 image: https://theunitedstates.io/images/congress/450x550/C001088.jpg
 party:
-- start_date: '2010-11-15'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2010-11-15'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Delaware
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Delaware
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2010-11-15
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Delaware
 offices:
 - classification: capitol
-  address: 218 Russell Senate Office Building Washington DC 20510
+  address: 218 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5042
 - classification: district
-  address: 500 W. Loockerman St. Suite 450; Dover, DE 19904
+  address: 1105 N. Market St. Suite 100, Wilmington, DE 19801
+  voice: 302-573-6345
+- classification: district
+  address: 555 E. Loockerman St. Suite 330, Dover, DE 19901
   voice: 302-736-5601
   fax: 302-736-5609
-  name: 'District Office #1'
-- classification: district
-  address: 1105 N. Market St. Suite 100; Wilmington, DE 19801-1233
-  voice: 302-573-6345
-  fax: 302-573-6351
-  name: 'District Office #2'
 links:
 - url: https://www.coons.senate.gov
   note: website
 - url: https://www.coons.senate.gov/contact
   note: contact form
+- url: https://www.coons.senate.gov/
+other_names:
+- name: C. Coons
+- name: C.A. Coons
+- name: Christopher A. Coons
+- name: Coons (D-DE)
+- name: Coons, C.
 ids:
   twitter: ChrisCoons
   youtube: UC2lOVbsddn1HIkcDnmCw6tA
   facebook: senatorchriscoons
-other_names:
-- name: Coons (D-DE)
 other_identifiers:
 - scheme: bioguide
   identifier: C001088
@@ -82,3 +82,12 @@ other_identifiers:
   identifier: kg:/m/082d3d
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chris_Coons
+- url: https://chriscoons.com/meet-chris
+- url: https://en.wikipedia.org/wiki/Chris_Coons
+- url: https://justfacts.votesmart.org/candidate/122834/chris-coons
+- url: https://theunitedstates.io
+- url: https://www.coons.senate.gov
+- url: https://www.coons.senate.gov/about
+- url: https://www.govtrack.us/congress/members/christopher_coons/412390
+- url: https://www.linkedin.com/in/christopher-coons-36663b4
diff --git a/data/us/legislature/Christopher-H-Smith-84a22f15-cf83-5f0b-a048-a6fc50aa60fe.yml b/data/us/legislature/Christopher-H-Smith-84a22f15-cf83-5f0b-a048-a6fc50aa60fe.yml
index 2faf0bcfc7..bba878b10e 100644
--- a/data/us/legislature/Christopher-H-Smith-84a22f15-cf83-5f0b-a048-a6fc50aa60fe.yml
+++ b/data/us/legislature/Christopher-H-Smith-84a22f15-cf83-5f0b-a048-a6fc50aa60fe.yml
@@ -1,153 +1,148 @@
 id: ocd-person/84a22f15-cf83-5f0b-a048-a6fc50aa60fe
-name: Christopher H. Smith
-given_name: Christopher
+name: Chris Smith
+given_name: Chris
 family_name: Smith
-middle_name: H.
-gender: M
 birth_date: 1953-03-04
+gender: Male
+email: https://chrissmith.house.gov/contact/zipauth.htm
 image: https://theunitedstates.io/images/congress/450x550/S000522.jpg
 party:
-- start_date: '1981-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-4
 offices:
 - classification: capitol
-  address: 2373 Rayburn House Office Building Washington DC 20515-3004
+  address: 2373 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3765
+  fax: 202-225-7768
 - classification: district
-  address: 112 Village Center Dr. Second Floor; Freehold, NJ 07728
+  address: 1715 N. Highway 35 Suite 303, Middletown, NJ 07748
   voice: 732-780-3035
-  fax: 732-780-3079
-  name: 'District Office #1'
 - classification: district
-  address: 4573 S. Broad St.; Hamilton, NJ 08620
-  voice: 609-585-7878
-  fax: 609-585-9155
-  name: 'District Office #2'
-- classification: district
-  address: 405 Route 539 (Pinehurst Rd.); Plumsted, NJ 08514
-  voice: 609-585-7878
-  fax: 609-585-9155
-  name: 'District Office #3'
+  address: 33 Washington St. P.O. Box 728, Toms River, NJ 08753
+  voice: 732-504-0567
 links:
 - url: https://chrissmith.house.gov
   note: website
+- url: https://chrissmith.house.gov/
+other_names:
+- name: C. Smith
+- name: C.H. Smith
+- name: Christopher H. Smith
+- name: Smith (NJ)
+- name: Smith, C.
 ids:
   youtube: UCtCNUDo3-I1gsd_03ppDfZg
   facebook: RepChrisSmith
-other_names:
-- name: Smith (NJ)
 other_identifiers:
 - scheme: bioguide
   identifier: S000522
@@ -179,3 +174,9 @@ other_identifiers:
   identifier: Chris Smith (New Jersey)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chris_Smith_(New_Jersey)
+- url: https://chrissmith.house.gov
+- url: https://en.wikipedia.org/wiki/Chris_Smith_%28New_Jersey_politician%29
+- url: https://justfacts.votesmart.org/candidate/26952/chris-smith
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/christopher_smith/400380
diff --git a/data/us/legislature/Christopher-Murphy-ef439b89-0461-56c7-aec5-93b6369e18a7.yml b/data/us/legislature/Christopher-Murphy-ef439b89-0461-56c7-aec5-93b6369e18a7.yml
index 03336ba495..d93dbd1c65 100644
--- a/data/us/legislature/Christopher-Murphy-ef439b89-0461-56c7-aec5-93b6369e18a7.yml
+++ b/data/us/legislature/Christopher-Murphy-ef439b89-0461-56c7-aec5-93b6369e18a7.yml
@@ -1,62 +1,63 @@
 id: ocd-person/ef439b89-0461-56c7-aec5-93b6369e18a7
-name: Christopher Murphy
-given_name: Christopher
+name: Chris Murphy
+given_name: Chris
 family_name: Murphy
-middle_name: S.
-gender: M
 birth_date: 1973-08-03
+gender: Male
+email: https://www.murphy.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M001169.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Connecticut
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Connecticut
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Connecticut
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Connecticut
 offices:
 - classification: capitol
-  address: 136 Hart Senate Office Building Washington DC 20510
+  address: 136 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4041
 - classification: district
-  address: 120 Huyshope Ave. Suite 401; Hartford, CT 06106
+  address: Colt Gateway 120 Huyshope Ave., Suite 401, Hartford, CT 06106
   voice: 860-549-8463
-  fax: 860-524-5091
-  name: 'District Office #1'
 links:
 - url: https://www.murphy.senate.gov
   note: website
 - url: https://www.murphy.senate.gov/contact
   note: contact form
+- url: https://www.murphy.senate.gov/
+other_names:
+- name: C. Murphy
+- name: C.S. Murphy
+- name: Christopher Murphy
+- name: Christopher S. Murphy
+- name: Murphy (D-CT)
+- name: Murphy, C.
 ids:
   twitter: SenMurphyOffice
   youtube: UCbcEa40PIFpLpdDe06n3F3Q
   facebook: chrismurphyct
-other_names:
-- name: Christopher S. Murphy
-- name: Murphy (D-CT)
 other_identifiers:
 - scheme: bioguide
   identifier: M001169
@@ -92,3 +93,9 @@ other_identifiers:
   identifier: kg:/m/0cy_dh
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chris_Murphy_(Connecticut)
+- url: https://en.wikipedia.org/wiki/Chris_Murphy
+- url: https://justfacts.votesmart.org/candidate/17189/chris-murphy
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/christopher_murphy/412194
+- url: https://www.murphy.senate.gov
diff --git a/data/us/legislature/Christopher-R-Deluzio-06299567-cfd4-5679-ad04-893e9f980275.yml b/data/us/legislature/Christopher-R-Deluzio-06299567-cfd4-5679-ad04-893e9f980275.yml
index 47d41a990b..f66d9651aa 100644
--- a/data/us/legislature/Christopher-R-Deluzio-06299567-cfd4-5679-ad04-893e9f980275.yml
+++ b/data/us/legislature/Christopher-R-Deluzio-06299567-cfd4-5679-ad04-893e9f980275.yml
@@ -1,28 +1,41 @@
 id: ocd-person/06299567-cfd4-5679-ad04-893e9f980275
-name: Christopher R. Deluzio
+name: Chris Deluzio
 given_name: Chris
 family_name: Deluzio
-middle_name: Raphael
-gender: M
 birth_date: 1984-07-13
+gender: Male
+email: https://deluzio.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/D000530.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-17
 offices:
 - classification: capitol
-  address: 1222 Longworth House Office Building Washington DC 20515-3817
+  address: 1222 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2301
+- classification: district
+  address: 11 Duff Road Suite A-3, Pittsburgh, PA 15235
+  voice: 412-344-5583
+- classification: district
+  address: 3468 Brodhead Road Suite 1, Monaca, PA 15061
+  voice: 724-206-4860
+- classification: district
+  address: 600 N. Bell Ave. Building 1, Suite 102, Carnegie, PA 15106
+  voice: 412-344-5583
 links:
 - url: https://deluzio.house.gov
   note: website
+- url: https://deluzio.house.gov/
+other_names:
+- name: C. Deluzio
+- name: C.R. Deluzio
+- name: Christopher R. Deluzio
+- name: Deluzio, C.
 ids:
   twitter: RepDeluzio
 other_identifiers:
@@ -42,3 +55,8 @@ other_identifiers:
   identifier: '202954'
 sources:
 - url: https://theunitedstates.io/
+- url: https://deluzio.house.gov
+- url: https://en.wikipedia.org/wiki/Chris_Deluzio
+- url: https://justfacts.votesmart.org/candidate/biography/202954/chris-deluzio
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/chris_deluzio/456936
diff --git a/data/us/legislature/Chuck-Edwards-1b8394c7-93d4-5a22-91cf-264782834b9b.yml b/data/us/legislature/Chuck-Edwards-1b8394c7-93d4-5a22-91cf-264782834b9b.yml
index b4d8f5f5d1..60bbefb6d0 100644
--- a/data/us/legislature/Chuck-Edwards-1b8394c7-93d4-5a22-91cf-264782834b9b.yml
+++ b/data/us/legislature/Chuck-Edwards-1b8394c7-93d4-5a22-91cf-264782834b9b.yml
@@ -1,28 +1,35 @@
 id: ocd-person/1b8394c7-93d4-5a22-91cf-264782834b9b
 name: Chuck Edwards
-given_name: Charles (Chuck)
+given_name: Chuck
 family_name: Edwards
-middle_name: Marion
-gender: M
 birth_date: 1960-09-13
+gender: Male
+email: https://edwards.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/E000246.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-11
 offices:
 - classification: capitol
-  address: 1505 Longworth House Office Building Washington DC 20515-3311
+  address: 1505 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6401
+- classification: district
+  address: 200 N. Grove St. Suite 121, Hendersonville, NC 28792
+  voice: 828-435-7310
+  fax: 771-200-5795
 links:
 - url: https://edwards.house.gov
   note: website
+- url: https://edwards.house.gov/
+other_names:
+- name: C. Edwards
+- name: C.M. Edwards
+- name: Edwards, C.
 ids:
   twitter: RepEdwards
 other_identifiers:
@@ -44,3 +51,11 @@ other_identifiers:
   identifier: '166600'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chuck_Edwards
+- url: https://edwards.house.gov
+- url: https://en.wikipedia.org/wiki/Chuck_Edwards
+- url: https://justfacts.votesmart.org/candidate/166600/chuck-edwards
+- url: https://justfacts.votesmart.org/candidate/biography/166600/chuck-edwards
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/charles_chuck_edwards/456914
+- url: https://www.linkedin.com/in/linkchuckedwards
diff --git a/data/us/legislature/Chuck-Grassley-259d896b-e9b5-5237-9243-f5597ae0db7c.yml b/data/us/legislature/Chuck-Grassley-259d896b-e9b5-5237-9243-f5597ae0db7c.yml
index 6209adbf25..4e9c2481ba 100644
--- a/data/us/legislature/Chuck-Grassley-259d896b-e9b5-5237-9243-f5597ae0db7c.yml
+++ b/data/us/legislature/Chuck-Grassley-259d896b-e9b5-5237-9243-f5597ae0db7c.yml
@@ -1,116 +1,113 @@
 id: ocd-person/259d896b-e9b5-5237-9243-f5597ae0db7c
 name: Chuck Grassley
-given_name: Charles
+given_name: Chuck
 family_name: Grassley
-middle_name: E.
-gender: M
 birth_date: 1933-09-17
+gender: Male
+email: https://www.grassley.senate.gov/contact/questions-and-comments
 image: https://theunitedstates.io/images/congress/450x550/G000386.jpg
 party:
-- start_date: '1975-01-14'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1975-01-14'
-  end_date: '1977-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-3
-- start_date: '1977-01-04'
-  end_date: '1979-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-3
-- start_date: '1979-01-15'
-  end_date: '1981-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-3
-- start_date: '1981-01-05'
-  end_date: '1987-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '1987-01-06'
-  end_date: '1993-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '1993-01-05'
-  end_date: '1999-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '1999-01-06'
-  end_date: '2005-01-03'
+- start_date: 2005-01-04
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
+- start_date: 1999-01-06
+  end_date: 2005-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 1993-01-05
+  end_date: 1999-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 1987-01-06
+  end_date: 1993-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 1981-01-05
+  end_date: 1987-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
+- start_date: 1979-01-15
+  end_date: 1981-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IA-3
+- start_date: 1977-01-04
+  end_date: 1979-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IA-3
+- start_date: 1975-01-14
+  end_date: 1977-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IA-3
 offices:
 - classification: capitol
-  address: 135 Hart Senate Office Building Washington DC 20510
+  address: 135 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3744
+  fax: 202-224-6020
 - classification: district
-  address: 111 7th Ave. SE Suite 6800; Cedar Rapids, IA 52401
+  address: 111 7th Ave. SE Box 13, Suite 6800, Cedar Rapids, IA 52401
   voice: 319-363-6832
   fax: 319-363-7179
-  name: 'District Office #1'
 - classification: district
-  address: 8 S. 6th St. 307; Council Bluffs, IA 51501
-  voice: 712-322-7103
-  fax: 712-322-7196
-  name: 'District Office #2'
+  address: 120 Federal Building 320 6th St., Sioux City, IA 51101
+  voice: 712-233-1860
+  fax: 712-233-1634
 - classification: district
-  address: 201 W. 2nd St. Suite 720; Davenport, IA 52801
+  address: 201 W. 2nd St. Suite 720, Davenport, IA 52801
   voice: 563-322-4331
   fax: 563-322-8552
-  name: 'District Office #3'
-- classification: district
-  address: 210 Walnut St. 721; Des Moines, IA 50309
-  voice: 515-288-1145
-  fax: 515-288-5097
-  name: 'District Office #4'
 - classification: district
-  address: 320 6th St. 120; Sioux City, IA 51101
-  voice: 712-233-1860
-  fax: 712-233-1634
-  name: 'District Office #5'
-- classification: district
-  address: 531 Commercial St. 210; Waterloo, IA 50701
+  address: 210 Waterloo Building 531 Commercial St., Waterloo, IA 50701
   voice: 319-232-6657
   fax: 319-232-9965
-  name: 'District Office #6'
+- classification: district
+  address: 2146 27th Ave. Suite 550, Council Bluffs, IA 51501
+  voice: 712-322-7103
+  fax: 712-322-7196
+- classification: district
+  address: 721 Federal Building 210 Walnut St., Des Moines, IA 50309
+  voice: 515-288-1145
+  fax: 515-288-5097
 links:
 - url: https://www.grassley.senate.gov
   note: website
 - url: https://www.grassley.senate.gov/contact
   note: contact form
+- url: https://www.grassley.senate.gov/
+other_names:
+- name: C. Grassley
+- name: C.E. Grassley
+- name: Grassley (R-IA)
+- name: Grassley, C.
 ids:
   twitter: ChuckGrassley
   youtube: UCiCPRkcLMInpDeOqGkMTt4w
   facebook: grassley
-other_names:
-- name: Grassley (R-IA)
 other_identifiers:
 - scheme: bioguide
   identifier: G000386
@@ -144,3 +141,11 @@ other_identifiers:
   identifier: kg:/m/020ymy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Chuck_Grassley
+- url: https://en.wikipedia.org/wiki/Chuck_Grassley
+- url: https://grassleyworks.com/about-chuck-grassley
+- url: https://justfacts.votesmart.org/candidate/53293/chuck-grassley
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/charles_grassley/300048
+- url: https://www.grassley.senate.gov
+- url: https://www.grassley.senate.gov/about/biography
diff --git a/data/us/legislature/Cindy-Hyde-Smith-3827ab20-4901-56bc-a6ea-e7c275da9eb9.yml b/data/us/legislature/Cindy-Hyde-Smith-3827ab20-4901-56bc-a6ea-e7c275da9eb9.yml
index 46a80685e0..1df185385a 100644
--- a/data/us/legislature/Cindy-Hyde-Smith-3827ab20-4901-56bc-a6ea-e7c275da9eb9.yml
+++ b/data/us/legislature/Cindy-Hyde-Smith-3827ab20-4901-56bc-a6ea-e7c275da9eb9.yml
@@ -2,58 +2,57 @@ id: ocd-person/3827ab20-4901-56bc-a6ea-e7c275da9eb9
 name: Cindy Hyde-Smith
 given_name: Cindy
 family_name: Hyde-Smith
-gender: F
 birth_date: 1959-05-10
+gender: Female
+email: https://www.hydesmith.senate.gov/contact-senator
 image: https://theunitedstates.io/images/congress/450x550/H001079.jpg
 party:
-- start_date: '2018-04-09'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2018-04-09'
-  end_date: '2018-11-27'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Mississippi
-- start_date: '2018-11-28'
-  end_date: '2021-01-03'
+- start_date: 2018-11-28
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Mississippi
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2018-04-09
+  end_date: 2018-11-27
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Mississippi
 offices:
 - classification: capitol
-  address: 702 Hart Senate Office Building Washington DC 20510
+  address: 190 E. Capitol St. Suite 550, Jackson, MS 39201
+  voice: 601-965-4459
+  fax: 202-228-6004
+- classification: capitol
+  address: 702 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5054
+  fax: 202-224-5321
 - classification: district
-  address: '190 East Capitol St. #550; Jackson, MS 39201'
-  voice: 601-965-4459
-  fax: 601-965-4919
-  name: 'District Office #1'
+  address: 2012 15th St. Suite 451, Gulfport, MS 39501
+  voice: 228-867-9710
+  fax: 228-867-9789
 - classification: district
-  address: '911 Jackson Ave. #249; Oxford, MS 38655'
+  address: U.S. Federal Courthouse 911 Jackson Ave. East, Suite 249, Oxford, MS 38655
   voice: 662-236-1018
   fax: 662-236-7618
-  name: 'District Office #2'
-- classification: district
-  address: '2012 15th Street #451; Gulfport, MS 39501'
-  voice: 228-867-9710
-  fax: 228-867-9789
-  name: 'District Office #3'
 links:
-- url: https://www.hydesmith.senate.gov
-  note: website
 - url: https://www.hydesmith.senate.gov/contact-senator
   note: contact form
+- url: https://www.hydesmith.senate.gov
+  note: website
+other_names:
+- name: C. Hyde-Smith
+- name: Hyde-Smith (R-MS)
+- name: Hyde-Smith, C.
 ids:
   twitter: SenHydeSmith
   youtube: UCJHxkJhGST0NTlkzJHWV03Q
-other_names:
-- name: Hyde-Smith (R-MS)
 other_identifiers:
 - scheme: bioguide
   identifier: H001079
@@ -81,3 +80,10 @@ other_identifiers:
   identifier: N00043298
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cindy_Hyde-Smith
+- url: https://cindyhydesmith.com/about
+- url: https://en.wikipedia.org/wiki/Cindy_Hyde-Smith
+- url: https://justfacts.votesmart.org/candidate/20784/cindy-hyde-smith
+- url: https://theunitedstates.io
+- url: https://www.hydesmith.senate.gov
+- url: https://www.hydesmith.senate.gov/about-cindy
diff --git a/data/us/legislature/Claudia-Tenney-21f20fe0-1075-512d-99a6-cafcebf57d20.yml b/data/us/legislature/Claudia-Tenney-21f20fe0-1075-512d-99a6-cafcebf57d20.yml
index 94dfd6c224..9e23f573ba 100644
--- a/data/us/legislature/Claudia-Tenney-21f20fe0-1075-512d-99a6-cafcebf57d20.yml
+++ b/data/us/legislature/Claudia-Tenney-21f20fe0-1075-512d-99a6-cafcebf57d20.yml
@@ -2,36 +2,50 @@ id: ocd-person/21f20fe0-1075-512d-99a6-cafcebf57d20
 name: Claudia Tenney
 given_name: Claudia
 family_name: Tenney
-gender: F
 birth_date: 1961-02-04
+gender: Female
+email: https://tenney.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/T000478.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-22
-- start_date: '2021-02-11'
-  end_date: '2023-01-03'
+  district: NY-24
+- start_date: 2021-02-11
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-22
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-24
+  district: NY-22
 offices:
 - classification: capitol
-  address: 2349 Rayburn House Office Building Washington DC 20515-3224
+  address: 2349 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3665
+- classification: district
+  address: 169 Niagara St., Lockport, NY 14094
+  voice: 716-514-5130
+- classification: district
+  address: 317 Washington St. Suite 418, Watertown, NY 13601
+- classification: district
+  address: 46 E. Bridge St. Suite 102, Oswego, NY 13126
+  voice: 315-236-7088
+- classification: district
+  address: 7171 Pittsford-Victor Road Suite 210, Victor, NY 14564
+  voice: 585-869-2060
 links:
 - url: https://tenney.house.gov
   note: website
+- url: https://tenney.house.gov/
+other_names:
+- name: C. Tenney
+- name: Tenney, C.
 ids:
   twitter: RepTenney
 other_identifiers:
@@ -61,3 +75,10 @@ other_identifiers:
   identifier: Claudia Tenney
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Claudia_Tenney
+- url: https://en.wikipedia.org/wiki/Claudia_Tenney
+- url: https://justfacts.votesmart.org/candidate/biography/127668/claudia-tenney
+- url: https://tenney.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/claudia_tenney/412720
+- url: https://www.linkedin.com/in/claudia-t-793899160
diff --git a/data/us/legislature/Clay-Higgins-ffc5bfa2-67c8-5743-afa6-3250b0752485.yml b/data/us/legislature/Clay-Higgins-ffc5bfa2-67c8-5743-afa6-3250b0752485.yml
index 93525d9cc1..c5d444e71f 100644
--- a/data/us/legislature/Clay-Higgins-ffc5bfa2-67c8-5743-afa6-3250b0752485.yml
+++ b/data/us/legislature/Clay-Higgins-ffc5bfa2-67c8-5743-afa6-3250b0752485.yml
@@ -2,54 +2,55 @@ id: ocd-person/ffc5bfa2-67c8-5743-afa6-3250b0752485
 name: Clay Higgins
 given_name: Clay
 family_name: Higgins
-gender: M
 birth_date: 1961-08-24
+gender: Male
+email: https://clayhigginsforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/H001077.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-3
 offices:
 - classification: capitol
-  address: 572 Cannon House Office Building Washington DC 20515-1803
+  address: 572 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2031
 - classification: district
-  address: 600 Jefferson Street Suite 808; Lafayette, LA 70501
-  voice: 337-703-6105
-  name: 'District Office #1'
-- classification: district
-  address: 1 Lakeshore Drive Suite 1670; Lake Charles, LA 70629
+  address: 1625 Ryan St. Suite C, Lake Charles, LA 70601
   voice: 337-656-2833
-  name: 'District Office #2'
+- classification: district
+  address: Chase Building 600 Jefferson St., Suite 808, Lafayette, LA 70501
+  voice: 337-703-6105
 links:
 - url: https://clayhiggins.house.gov
   note: website
+- url: https://clayhiggins.house.gov/
+other_names:
+- name: C. Higgins
+- name: G.C. Higgins
+- name: Higgins (LA)
+- name: Higgins, C.
 ids:
   twitter: RepClayHiggins
   facebook: CongressmanClayHiggins
-other_names:
-- name: Higgins (LA)
 other_identifiers:
 - scheme: bioguide
   identifier: H001077
@@ -77,3 +78,10 @@ other_identifiers:
   identifier: Clay Higgins
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Clay_Higgins
+- url: https://clayhiggins.house.gov
+- url: https://en.wikipedia.org/wiki/Clay_Higgins
+- url: https://justfacts.votesmart.org/candidate/biography/174484/clay-higgins
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/clay_higgins/412705
+- url: https://www.linkedin.com/in/clay-higgins-aab9533a
diff --git a/data/us/legislature/Cliff-Bentz-dd9d3668-b18a-5102-8628-7f2972350402.yml b/data/us/legislature/Cliff-Bentz-dd9d3668-b18a-5102-8628-7f2972350402.yml
index 48db08be92..3fbbcb8d8f 100644
--- a/data/us/legislature/Cliff-Bentz-dd9d3668-b18a-5102-8628-7f2972350402.yml
+++ b/data/us/legislature/Cliff-Bentz-dd9d3668-b18a-5102-8628-7f2972350402.yml
@@ -2,32 +2,43 @@ id: ocd-person/dd9d3668-b18a-5102-8628-7f2972350402
 name: Cliff Bentz
 given_name: Cliff
 family_name: Bentz
-middle_name: Stewart
-gender: M
 birth_date: 1952-01-12
+gender: Male
+email: https://bentz.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B000668.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-2
 offices:
 - classification: capitol
-  address: 409 Cannon House Office Building Washington DC 20515-3702
+  address: 409 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6730
+  fax: 202-225-5774
+- classification: district
+  address: 14 N. Central Ave. Suite 112, Medford, OR 97501
+  voice: 541-776-4646
+  fax: 541-779-0204
+- classification: district
+  address: '2430 SW 4th Ave., #2, Ontario, OR 97914'
+  voice: 541-709-2040
 links:
 - url: https://bentz.house.gov
   note: website
+- url: https://bentz.house.gov/
+other_names:
+- name: Bentz, C.
+- name: C. Bentz
+- name: C.S. Bentz
 ids:
   twitter: RepBentz
 other_identifiers:
@@ -47,3 +58,10 @@ other_identifiers:
   identifier: kg:/m/0gfdsjb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cliff_Bentz
+- url: https://bentz.house.gov
+- url: https://en.wikipedia.org/wiki/Cliff_Bentz
+- url: https://justfacts.votesmart.org/candidate/biography/102400/cliff-bentz
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/cliff_bentz/456842
+- url: https://www.linkedin.com/in/cliff-bentz-b235376a
diff --git a/data/us/legislature/Colin-Z-Allred-45574c8a-7f88-525b-b5b8-255a8d69f335.yml b/data/us/legislature/Colin-Z-Allred-45574c8a-7f88-525b-b5b8-255a8d69f335.yml
index 39ecc1c45c..eb3b87ea07 100644
--- a/data/us/legislature/Colin-Z-Allred-45574c8a-7f88-525b-b5b8-255a8d69f335.yml
+++ b/data/us/legislature/Colin-Z-Allred-45574c8a-7f88-525b-b5b8-255a8d69f335.yml
@@ -1,43 +1,46 @@
 id: ocd-person/45574c8a-7f88-525b-b5b8-255a8d69f335
-name: Colin Z. Allred
+name: Colin Allred
 given_name: Colin
 family_name: Allred
-middle_name: Z.
-gender: M
 birth_date: 1983-04-15
+gender: Male
+email: https://allred.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/A000376.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
 offices:
 - classification: capitol
-  address: 348 Cannon House Office Building Washington DC 20515-4332
+  address: 348 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2231
 - classification: district
-  address: 100 North Central Expressway Suite 602; Richardson, TX 75080-5332
+  address: 100 N. Central Expressway, Suite 602, Richardson, TX 75080
   voice: 972-972-7949
   fax: 888-671-0539
-  name: 'District Office #1'
 links:
 - url: https://allred.house.gov
   note: website
+- url: https://allred.house.gov/
+other_names:
+- name: Allred, C.
+- name: C. Allred
+- name: C.Z. Allred
+- name: Colin Z. Allred
 ids:
   twitter: RepColinAllred
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: Colin Allred
 sources:
 - url: https://theunitedstates.io/
+- url: https://allred.house.gov
+- url: https://allred.house.gov/about
+- url: https://ballotpedia.org/Colin_Allred
+- url: https://en.wikipedia.org/wiki/Colin_Allred
+- url: https://justfacts.votesmart.org/candidate/biography/177357/colin-allred
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/colin_allred/412828
diff --git a/data/us/legislature/Cori-Bush-adba4aa8-0d6a-5a7f-9a71-d1a9f9c5e1a0.yml b/data/us/legislature/Cori-Bush-adba4aa8-0d6a-5a7f-9a71-d1a9f9c5e1a0.yml
index 177d60e526..5760695f0a 100644
--- a/data/us/legislature/Cori-Bush-adba4aa8-0d6a-5a7f-9a71-d1a9f9c5e1a0.yml
+++ b/data/us/legislature/Cori-Bush-adba4aa8-0d6a-5a7f-9a71-d1a9f9c5e1a0.yml
@@ -2,31 +2,39 @@ id: ocd-person/adba4aa8-0d6a-5a7f-9a71-d1a9f9c5e1a0
 name: Cori Bush
 given_name: Cori
 family_name: Bush
-gender: F
 birth_date: 1976-07-21
+gender: Female
+email: https://bush.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/B001224.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-1
 offices:
 - classification: capitol
-  address: 2463 Rayburn House Office Building Washington DC 20515-2501
+  address: 2463 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2406
+  fax: 202-226-3717
+- classification: district
+  address: 1100 Locust St., St. Louis, MO 63101
+  voice: 314-955-9980
 links:
 - url: https://bush.house.gov
   note: website
+- url: https://bush.house.gov/
+other_names:
+- name: Bush, C.
+- name: C. Bush
+- name: C.A. Bush
 ids:
   twitter: RepCori
 other_identifiers:
@@ -48,3 +56,11 @@ other_identifiers:
   identifier: Cori Bush
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cori_Bush
+- url: https://bush.house.gov
+- url: https://coribush.org/about
+- url: https://en.wikipedia.org/wiki/Cori_Bush
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/cori_bush/456829
+- url: https://www.linkedin.com/in/cori-bush-2a6373115
+- url: https://www.linkedin.com/in/cori-bush-57568a3a
diff --git a/data/us/legislature/Cory-A-Booker-d0bb2662-40b6-52d2-94e6-2bf9d588c954.yml b/data/us/legislature/Cory-A-Booker-d0bb2662-40b6-52d2-94e6-2bf9d588c954.yml
index b348bec51b..e1c1739f2d 100644
--- a/data/us/legislature/Cory-A-Booker-d0bb2662-40b6-52d2-94e6-2bf9d588c954.yml
+++ b/data/us/legislature/Cory-A-Booker-d0bb2662-40b6-52d2-94e6-2bf9d588c954.yml
@@ -1,56 +1,58 @@
 id: ocd-person/d0bb2662-40b6-52d2-94e6-2bf9d588c954
-name: Cory A. Booker
+name: Cory Booker
 given_name: Cory
 family_name: Booker
-middle_name: Anthony
-gender: M
 birth_date: 1969-04-27
+gender: Male
+email: https://www.booker.senate.gov/contact/write-to-cory
 image: https://theunitedstates.io/images/congress/450x550/B001288.jpg
 party:
-- start_date: '2013-10-31'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-10-31'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Jersey
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Jersey
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2013-10-31
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Jersey
 offices:
 - classification: capitol
-  address: 717 Hart Senate Office Building Washington DC 20510
+  address: 717 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3224
+  fax: 202-224-8378
 - classification: district
-  address: 2 Riverside Dr. Suite 505; Camden, NJ 08101
-  voice: 856-338-8922
-  fax: 856-338-8936
-  name: 'District Office #1'
-- classification: district
-  address: One Gateway Center 23rd Floor; Newark, NJ 07102
+  address: 1 Gateway Center 23rd Floor, Newark, NJ 07102
   voice: 973-639-8700
-  fax: 973-639-8723
-  name: 'District Office #2'
+  fax: 202-224-5702
+- classification: district
+  address: 1 Port Center 2 Riverside Drive, Suite 505, Camden, NJ 08103
+  voice: 856-338-8922
+  fax: 202-224-5701
 links:
 - url: https://www.booker.senate.gov
   note: website
 - url: https://www.booker.senate.gov/?p=contact
   note: contact form
+- url: https://www.booker.senate.gov/
+other_names:
+- name: Booker (D-NJ)
+- name: Booker, C.
+- name: C. Booker
+- name: C.A. Booker
+- name: Cory A. Booker
+- name: Cory Booker
 ids:
   twitter: SenBooker
   youtube: UC6FlymqNS1VettnVZa7goPA
-other_names:
-- name: Cory Booker
-- name: Booker (D-NJ)
 other_identifiers:
 - scheme: bioguide
   identifier: B001288
@@ -82,3 +84,12 @@ other_identifiers:
   identifier: '41308'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cory_Booker
+- url: https://corybooker.com/about-cory
+- url: https://en.wikipedia.org/wiki/Cory_Booker
+- url: https://justfacts.votesmart.org/candidate/76151/cory-booker
+- url: https://theunitedstates.io
+- url: https://www.booker.senate.gov
+- url: https://www.booker.senate.gov/about-cory
+- url: https://www.govtrack.us/congress/members/cory_booker/412598
+- url: https://www.linkedin.com/in/corybooker
diff --git a/data/us/legislature/Cory-Mills-e9c6e580-58c8-5a0c-a18c-d11c073a9964.yml b/data/us/legislature/Cory-Mills-e9c6e580-58c8-5a0c-a18c-d11c073a9964.yml
index 6bb0bf7709..09ea5e9273 100644
--- a/data/us/legislature/Cory-Mills-e9c6e580-58c8-5a0c-a18c-d11c073a9964.yml
+++ b/data/us/legislature/Cory-Mills-e9c6e580-58c8-5a0c-a18c-d11c073a9964.yml
@@ -2,26 +2,35 @@ id: ocd-person/e9c6e580-58c8-5a0c-a18c-d11c073a9964
 name: Cory Mills
 given_name: Cory
 family_name: Mills
-gender: M
-birth_date: 1980-07-30
+birth_date: 1980-07-13
+gender: Male
+email: https://mills.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001216.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-7
 offices:
 - classification: capitol
-  address: 1237 Longworth House Office Building Washington DC 20515-0907
+  address: 1237 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4035
+- classification: district
+  address: 1000 City Center Circle, Port Orange, FL 32129
+  voice: 386-238-9711
+- classification: district
+  address: '1525 International Parkway, #1051, Lake Mary, FL 32746'
+  voice: 407-638-7900
 links:
 - url: https://mills.house.gov
   note: website
+- url: https://mills.house.gov/
+other_names:
+- name: C. Mills
+- name: Mills, C.
 other_identifiers:
 - scheme: bioguide
   identifier: M001216
@@ -39,3 +48,9 @@ other_identifiers:
   identifier: '209085'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cory_Mills
+- url: https://en.wikipedia.org/wiki/Cory_Mills
+- url: https://mills.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/cory_mills/456889
+- url: https://www.linkedin.com/in/cory-m-1b531b92
diff --git a/data/us/legislature/Cynthia-M-Lummis-b6ae1e91-803f-5ce8-98fe-86f85c52dd42.yml b/data/us/legislature/Cynthia-M-Lummis-b6ae1e91-803f-5ce8-98fe-86f85c52dd42.yml
index c17eeef027..012b8be448 100644
--- a/data/us/legislature/Cynthia-M-Lummis-b6ae1e91-803f-5ce8-98fe-86f85c52dd42.yml
+++ b/data/us/legislature/Cynthia-M-Lummis-b6ae1e91-803f-5ce8-98fe-86f85c52dd42.yml
@@ -1,54 +1,75 @@
 id: ocd-person/b6ae1e91-803f-5ce8-98fe-86f85c52dd42
-name: Cynthia M. Lummis
+name: Cynthia Lummis
 given_name: Cynthia
 family_name: Lummis
-middle_name: M.
-gender: F
 birth_date: 1954-09-10
+gender: Female
+email: https://www.lummis.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/L000571.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Wyoming
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WY-AL
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WY-AL
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WY-AL
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WY-AL
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Wyoming
 offices:
 - classification: capitol
-  address: 127A Russell Senate Office Building Washington DC 20510
+  address: 127A Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3424
+- classification: capitol
+  address: Federal Center 2120 Capitol Ave., Suite 2007, Cheyenne, WY 82001
+  voice: 307-772-2477
+- classification: district
+  address: 120 N. 4th St. Suite B, Sundance, WY 82729
+  voice: 307-283-3461
+- classification: district
+  address: 1285 Sheridan Ave. Suite 215, Cody, WY 82414
+  voice: 307-527-9444
+- classification: district
+  address: Dick Cheney Federal Building 100 E. B St., Suite 3201, Casper, WY 82602
+  voice: 307-261-6572
+- classification: district
+  address: P.O. Box 1630 80 1st St., Suite 105, Afton, WY 83110
+  voice: 307-248-1736
+- classification: district
+  address: P.O. Box 6677, Sheridan, WY 82801
+  voice: 307-439-7783
 links:
 - url: https://www.lummis.senate.gov
   note: website
 - url: https://www.lummis.senate.gov/contact/contact-form/
   note: contact form
-ids:
-  twitter: SenLummis
+- url: https://www.lummis.senate.gov/
 other_names:
+- name: C. Lummis
+- name: C.M. Lummis
+- name: Cynthia M. Lummis
 - name: Lummis (R-WY)
+- name: Lummis, C.
+ids:
+  twitter: SenLummis
 other_identifiers:
 - scheme: bioguide
   identifier: L000571
@@ -84,3 +105,9 @@ other_identifiers:
   identifier: kg:/m/02qvjv3
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Cynthia_Lummis
+- url: https://en.wikipedia.org/wiki/Cynthia_Lummis
+- url: https://justfacts.votesmart.org/candidate/biography/15546/cynthia-lummis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/cynthia_lummis/412294
+- url: https://www.lummis.senate.gov
diff --git a/data/us/legislature/Dale-W-Strong-e54a4532-aa1e-5e2d-b630-4f35ef10a46f.yml b/data/us/legislature/Dale-W-Strong-e54a4532-aa1e-5e2d-b630-4f35ef10a46f.yml
index 56b99c368c..e433fe676c 100644
--- a/data/us/legislature/Dale-W-Strong-e54a4532-aa1e-5e2d-b630-4f35ef10a46f.yml
+++ b/data/us/legislature/Dale-W-Strong-e54a4532-aa1e-5e2d-b630-4f35ef10a46f.yml
@@ -1,27 +1,39 @@
 id: ocd-person/e54a4532-aa1e-5e2d-b630-4f35ef10a46f
-name: Dale W. Strong
+name: Dale Strong
 given_name: Dale
 family_name: Strong
-gender: M
 birth_date: 1970-05-08
+gender: Male
+email: https://strong.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001220.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-5
 offices:
 - classification: capitol
-  address: 1337 Longworth House Office Building Washington DC 20515-0105
+  address: 1337 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4801
+- classification: district
+  address: 2101 Clinton Ave. West Suite 302, Huntsville, AL 35805
+  voice: 256-551-0190
+  fax: 771-200-5717
+- classification: district
+  address: Morgan County Courthouse 302 Lee St. NE, Room 86, Decatur, AL 35601
+  voice: 256-355-9400
 links:
 - url: https://strong.house.gov
   note: website
+- url: https://strong.house.gov/
+other_names:
+- name: D. Strong
+- name: D.W. Strong
+- name: Dale W. Strong
+- name: Strong, D.
 other_identifiers:
 - scheme: bioguide
   identifier: S001220
@@ -39,3 +51,8 @@ other_identifiers:
   identifier: '81485'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dale_Strong
+- url: https://en.wikipedia.org/wiki/Dale_Strong
+- url: https://strong.house.gov
+- url: https://theunitedstates.io
+- url: https://www.dalestrongforcongress.com/about
diff --git a/data/us/legislature/Dan-Bishop-ff2f62f3-ccac-57d0-bcad-47a3bfeacb79.yml b/data/us/legislature/Dan-Bishop-ff2f62f3-ccac-57d0-bcad-47a3bfeacb79.yml
index 19ab198b06..19a55f5730 100644
--- a/data/us/legislature/Dan-Bishop-ff2f62f3-ccac-57d0-bcad-47a3bfeacb79.yml
+++ b/data/us/legislature/Dan-Bishop-ff2f62f3-ccac-57d0-bcad-47a3bfeacb79.yml
@@ -2,46 +2,50 @@ id: ocd-person/ff2f62f3-ccac-57d0-bcad-47a3bfeacb79
 name: Dan Bishop
 given_name: Dan
 family_name: Bishop
-gender: M
 birth_date: 1964-07-01
+gender: Male
+email: https://danbishop.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B001311.jpg
 party:
-- start_date: '2019-09-17'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-09-17'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NC-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NC-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-09-17
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NC-8
+  district: NC-9
 offices:
 - classification: capitol
-  address: 2459 Rayburn House Office Building Washington DC 20515-3308
+  address: 2459 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1976
 - classification: district
-  address: 300 N Main Street; Monroe, NC 28112
-  voice: 740-218-5300
+  address: 300 N. Main St., Monroe, NC 28112
+  voice: 704-218-5300
   fax: 844-273-1255
-  name: 'District Office #1'
+- classification: district
+  address: The Gateway Building 204 E. Innes St., Salisbury, NC 28144
 links:
 - url: https://danbishop.house.gov
   note: website
+- url: https://danbishop.house.gov/
+other_names:
+- name: Bishop (NC)
+- name: Bishop, D.
+- name: D. Bishop
+- name: J.D. Bishop
 ids:
   twitter: RepDanBishop
   facebook: repdanbishop
-other_names:
-- name: Bishop (NC)
 other_identifiers:
 - scheme: bioguide
   identifier: B001311
@@ -63,3 +67,12 @@ other_identifiers:
   identifier: '92423'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dan_Bishop
+- url: https://danbishop.house.gov
+- url: https://danbishop.house.gov/about
+- url: https://en.wikipedia.org/wiki/Dan_Bishop
+- url: https://justfacts.votesmart.org/candidate/biography/92423/dan-bishop
+- url: https://theunitedstates.io
+- url: https://votedanbishop.com/about
+- url: https://www.govtrack.us/congress/members/dan_bishop/412844
+- url: https://www.linkedin.com/in/jdanbishop
diff --git a/data/us/legislature/Dan-Crenshaw-6e2bcde3-a1f5-5296-9f9f-88c71885f3db.yml b/data/us/legislature/Dan-Crenshaw-6e2bcde3-a1f5-5296-9f9f-88c71885f3db.yml
index 2b8fb99bf9..c4c517ff0c 100644
--- a/data/us/legislature/Dan-Crenshaw-6e2bcde3-a1f5-5296-9f9f-88c71885f3db.yml
+++ b/data/us/legislature/Dan-Crenshaw-6e2bcde3-a1f5-5296-9f9f-88c71885f3db.yml
@@ -2,40 +2,46 @@ id: ocd-person/6e2bcde3-a1f5-5296-9f9f-88c71885f3db
 name: Dan Crenshaw
 given_name: Dan
 family_name: Crenshaw
-gender: M
 birth_date: 1984-03-14
+gender: Male
+email: https://crenshaw.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001120.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-2
 offices:
 - classification: capitol
-  address: 248 Cannon House Office Building Washington DC 20515-4302
+  address: 248 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6565
 - classification: district
-  address: 1801 Kingwood Dr Suite 240; Kingwood, TX 77339-3060
+  address: 1849 Kingwood Drive Suite 100, Kingwood, TX 77339
   voice: 713-860-1330
-  name: 'District Office #1'
+- classification: district
+  address: '2829 Technology Forest Suite #280, The Woodlands, TX 77381'
+  voice: 281-640-7720
 links:
 - url: https://crenshaw.house.gov
   note: website
+- url: https://crenshaw.house.gov/
+other_names:
+- name: Crenshaw, D.
+- name: D. Crenshaw
+- name: D.R. Crenshaw
 ids:
   twitter: RepDanCrenshaw
 other_identifiers:
@@ -61,3 +67,10 @@ other_identifiers:
   identifier: Daniel Crenshaw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Daniel_Crenshaw
+- url: https://crenshaw.house.gov
+- url: https://crenshaw.house.gov/about
+- url: https://en.wikipedia.org/wiki/Dan_Crenshaw
+- url: https://justfacts.votesmart.org/candidate/biography/177270/dan-crenshaw
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dan_crenshaw/412820
diff --git a/data/us/legislature/Dan-Newhouse-c2de8671-10f6-5eb3-8624-a9fd877464b5.yml b/data/us/legislature/Dan-Newhouse-c2de8671-10f6-5eb3-8624-a9fd877464b5.yml
index 17201d4f6a..f729bbdb7f 100644
--- a/data/us/legislature/Dan-Newhouse-c2de8671-10f6-5eb3-8624-a9fd877464b5.yml
+++ b/data/us/legislature/Dan-Newhouse-c2de8671-10f6-5eb3-8624-a9fd877464b5.yml
@@ -2,60 +2,62 @@ id: ocd-person/c2de8671-10f6-5eb3-8624-a9fd877464b5
 name: Dan Newhouse
 given_name: Dan
 family_name: Newhouse
-gender: M
 birth_date: 1955-07-10
+gender: Male
+email: https://newhouse.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/N000189.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-4
 offices:
 - classification: capitol
-  address: 504 Cannon House Office Building Washington DC 20515-4704
+  address: 504 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5816
+  fax: 202-225-3251
 - classification: district
-  address: '3100 George Washington Way #130; Richland, WA 99354'
+  address: 3100 George Washington Way Suite 130, Richland, WA 99354
   voice: 509-713-7374
   fax: 509-713-7377
-  name: 'District Office #1'
 - classification: district
-  address: PO Box 823; Twisp, WA 98856-0823
-  voice: 509-433-7760
-  name: 'District Office #2'
-- classification: district
-  address: 402 E Yakima Ave Suite 1000; Yakima, WA 98901
+  address: 402 E. Yakima Ave. Suite 1000, Yakima, WA 98901
   voice: 509-452-3243
   fax: 509-452-3438
-  name: 'District Office #3'
+- classification: district
+  address: P.O. Box 135, Grand Coulee, WA 99133
+  voice: 509-433-7760
 links:
 - url: https://newhouse.house.gov
   note: website
+- url: https://newhouse.house.gov/
+other_names:
+- name: D. Newhouse
+- name: D.M. Newhouse
+- name: Newhouse, D.
 ids:
   twitter: RepNewhouse
   youtube: UCllbsv_aoIaPS6W3aSonZlw
@@ -89,3 +91,9 @@ other_identifiers:
   identifier: Dan Newhouse
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dan_Newhouse
+- url: https://en.wikipedia.org/wiki/Dan_Newhouse
+- url: https://newhouse.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dan_newhouse/412660
+- url: https://www.linkedin.com/in/newhousedan
diff --git a/data/us/legislature/Dan-Sullivan-a6b5e853-563f-5b87-a14a-a1427f56b262.yml b/data/us/legislature/Dan-Sullivan-a6b5e853-563f-5b87-a14a-a1427f56b262.yml
index 41c0a34ded..2c7d5af36a 100644
--- a/data/us/legislature/Dan-Sullivan-a6b5e853-563f-5b87-a14a-a1427f56b262.yml
+++ b/data/us/legislature/Dan-Sullivan-a6b5e853-563f-5b87-a14a-a1427f56b262.yml
@@ -2,69 +2,67 @@ id: ocd-person/a6b5e853-563f-5b87-a14a-a1427f56b262
 name: Dan Sullivan
 given_name: Dan
 family_name: Sullivan
-gender: M
 birth_date: 1964-11-13
+gender: Male
+email: https://www.sullivan.senate.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/S001198.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
 offices:
 - classification: capitol
-  address: 302 Hart Senate Office Building Washington DC 20510
+  address: 302 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3004
+  fax: 202-224-6501
 - classification: district
-  address: 510 L St. Suite 750; Anchorage, AK 99501
-  voice: 907-271-5915
-  fax: 907-258-9305
-  name: 'District Office #1'
-- classification: district
-  address: 101 12th Ave. Suite 328; Fairbanks, AK 99701
-  voice: 907-456-0261
-  fax: 907-451-7290
-  name: 'District Office #2'
-- classification: district
-  address: 800 Glacier Ave. Suite 101; Juneau, AK 99801
-  voice: 907-586-7277
-  fax: 907-586-7201
-  name: 'District Office #3'
-- classification: district
-  address: 1900 First Ave. Suite 225; Ketchikan, AK 99901
+  address: 1900 1st Ave. Suite 225, Ketchikan, AK 99901
   voice: 907-225-6880
   fax: 907-225-0390
-  name: 'District Office #4'
 - classification: district
-  address: 44539 Sterling Highway Suite 204; Soldotna, AK 99669
+  address: 44539 Sterling Highway Suite 204, Soldotna, AK 99669
   voice: 907-262-4040
   fax: 907-262-4224
-  name: 'District Office #5'
 - classification: district
-  address: 851 E. Westpoint Dr. Suite 309; Wasilla, AK 99654
+  address: 510 L St. Suite 750, Anchorage, AK 99501
+  voice: 907-271-5915
+  fax: 202-228-4562
+- classification: district
+  address: 800 Glacier Ave. Suite 101, Juneau, AK 99801
+  voice: 907-586-7277
+  fax: 907-586-7201
+- classification: district
+  address: 851 E. Westpoint Drive Suite 309, Wasilla, AK 99654
   voice: 907-357-9956
   fax: 907-357-9964
-  name: 'District Office #6'
+- classification: district
+  address: Federal Building 101 12th Ave., Suite 328, Fairbanks, AK 99701
+  voice: 907-456-0261
+  fax: 907-451-7290
 links:
 - url: https://www.sullivan.senate.gov
   note: website
 - url: https://www.sullivan.senate.gov/contact/email
   note: contact form
+- url: https://www.sullivan.senate.gov/
+other_names:
+- name: D. Sullivan
+- name: D.S. Sullivan
+- name: Sullivan (R-AK)
+- name: Sullivan, D.
 ids:
   twitter: SenDanSullivan
   youtube: UC7tXCm8gKlAhTFo2kuf5ylw
   facebook: SenDanSullivan
-other_names:
-- name: Sullivan (R-AK)
 other_identifiers:
 - scheme: bioguide
   identifier: S001198
@@ -96,3 +94,9 @@ other_identifiers:
   identifier: Daniel S. Sullivan
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Daniel_S._Sullivan
+- url: https://en.wikipedia.org/wiki/Daniel_S._Sullivan
+- url: https://justfacts.votesmart.org/candidate/biography/114964/dan-sullivan
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dan_sullivan/412665
+- url: https://www.sullivan.senate.gov
diff --git a/data/us/legislature/Daniel-Meuser-df0edff1-f76c-5916-b28e-f70338b23a7a.yml b/data/us/legislature/Daniel-Meuser-df0edff1-f76c-5916-b28e-f70338b23a7a.yml
index 341f22272d..2ddddfbb6d 100644
--- a/data/us/legislature/Daniel-Meuser-df0edff1-f76c-5916-b28e-f70338b23a7a.yml
+++ b/data/us/legislature/Daniel-Meuser-df0edff1-f76c-5916-b28e-f70338b23a7a.yml
@@ -1,44 +1,57 @@
 id: ocd-person/df0edff1-f76c-5916-b28e-f70338b23a7a
-name: Daniel Meuser
-given_name: Daniel
+name: Dan Meuser
+given_name: Dan
 family_name: Meuser
-gender: M
 birth_date: 1964-02-10
+gender: Male
+email: https://meuser.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001204.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-9
 offices:
 - classification: capitol
-  address: 350 Cannon House Office Building Washington DC 20515-3809
+  address: 350 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6511
 - classification: district
-  address: 1044 E Main St; Palmyra, PA 17078-9501
-  name: 'District Office #1'
-- classification: district
-  address: 121 Progress Ave Suite 110; Pottsville, PA 17901-2968
+  address: 121 Progress Ave. Suite 110, Losch Plaza, Pottsville, PA 17901
   voice: 570-871-6370
-  name: 'District Office #2'
+- classification: district
+  address: 511 Mile Road, Tunkhannock, PA 18657
+  voice: 570-665-3083
+- classification: district
+  address: Executive Plaza 330 Pine St., Fourth Floor, Williamsport, PA 17701
+  voice: 570-202-0658
+- classification: district
+  address: Hamburg Municipal Center 61 N. 3rd St., Second Floor, Hamburg, PA 19526
+  voice: 610-428-0869
+- classification: district
+  address: Lebanon County Courthouse 400 S. 8th St., Lebanon, PA 17042
+  voice: 717-603-1459
 links:
 - url: https://meuser.house.gov
   note: website
+- url: https://meuser.house.gov/
+other_names:
+- name: D. Meuser
+- name: D.P. Meuser
+- name: Daniel Meuser
+- name: Meuser, D.
 ids:
   twitter: RepMeuser
 other_identifiers:
@@ -64,3 +77,9 @@ other_identifiers:
   identifier: Dan Meuser
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dan_Meuser
+- url: https://en.wikipedia.org/wiki/Dan_Meuser
+- url: https://justfacts.votesmart.org/candidate/biography/102438/dan-meuser
+- url: https://meuser.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/dan-meuser-90892311
diff --git a/data/us/legislature/Daniel-S-Goldman-4c77555b-f35d-53ca-8c7d-7950b90a1b60.yml b/data/us/legislature/Daniel-S-Goldman-4c77555b-f35d-53ca-8c7d-7950b90a1b60.yml
index 43b2e2c89b..f8d17a7c90 100644
--- a/data/us/legislature/Daniel-S-Goldman-4c77555b-f35d-53ca-8c7d-7950b90a1b60.yml
+++ b/data/us/legislature/Daniel-S-Goldman-4c77555b-f35d-53ca-8c7d-7950b90a1b60.yml
@@ -1,32 +1,41 @@
 id: ocd-person/4c77555b-f35d-53ca-8c7d-7950b90a1b60
-name: Daniel S. Goldman
+name: Dan Goldman
 given_name: Dan
 family_name: Goldman
-middle_name: Sachs
-gender: M
 birth_date: 1976-02-26
+gender: Male
+email: https://goldman.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000599.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-10
 offices:
 - classification: capitol
-  address: 245 Cannon House Office Building Washington DC 20515-3210
+  address: 245 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-7944
+- classification: district
+  address: 290 Broadway Suite 291, New York, NY 10007
+  voice: 212-822-7878
+- classification: district
+  address: 340A 9th St., Brooklyn, NY 11215
+  voice: 718-312-7575
 links:
 - url: https://goldman.house.gov
   note: website
-ids:
-  twitter: RepDanGoldman
+- url: https://goldman.house.gov/
 other_names:
+- name: D. Goldman
+- name: D.S. Goldman
+- name: Daniel S. Goldman
 - name: Goldman (NY)
+- name: Goldman, D.
+ids:
+  twitter: RepDanGoldman
 other_identifiers:
 - scheme: bioguide
   identifier: G000599
@@ -46,3 +55,9 @@ other_identifiers:
   identifier: '208627'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Daniel_Goldman
+- url: https://en.wikipedia.org/wiki/Dan_Goldman_(politician)
+- url: https://goldman.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dan_goldman/456923
+- url: https://www.linkedin.com/in/daniel-goldman-55619415b
diff --git a/data/us/legislature/Daniel-T-Kildee-ba55e5b8-ac4e-5ea8-b7a8-d180e10a3562.yml b/data/us/legislature/Daniel-T-Kildee-ba55e5b8-ac4e-5ea8-b7a8-d180e10a3562.yml
index 7820fb4498..ab5800961d 100644
--- a/data/us/legislature/Daniel-T-Kildee-ba55e5b8-ac4e-5ea8-b7a8-d180e10a3562.yml
+++ b/data/us/legislature/Daniel-T-Kildee-ba55e5b8-ac4e-5ea8-b7a8-d180e10a3562.yml
@@ -1,57 +1,66 @@
 id: ocd-person/ba55e5b8-ac4e-5ea8-b7a8-d180e10a3562
-name: Daniel T. Kildee
-given_name: Daniel
+name: Dan Kildee
+given_name: Dan
 family_name: Kildee
-middle_name: T.
-gender: M
 birth_date: 1958-08-11
+gender: Male
+email: https://dankildee.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000380.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: MI-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-8
+  district: MI-5
 offices:
 - classification: capitol
-  address: 200 Cannon House Office Building Washington DC 20515-2208
+  address: 200 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3611
+  fax: 202-225-6393
+- classification: district
+  address: 200 E. Main St. Suite 230, Midland, MI 48640
+  voice: 989-898-6060
+  fax: 810-238-8658
 - classification: district
-  address: 601 S Saginaw St Suite 403; Flint, MI 48502-1513
+  address: 601 S. Saginaw St., Suite 403, Flint, MI 48502
   voice: 810-238-8627
-  name: 'District Office #1'
+  fax: 810-238-8658
 links:
 - url: https://dankildee.house.gov
   note: website
+- url: https://dankildee.house.gov/
+other_names:
+- name: D. Kildee
+- name: D.T. Kildee
+- name: Daniel T. Kildee
+- name: Kildee, D.
 ids:
   twitter: RepDanKildee
   youtube: UC_KpQ-n3IT5dL5ul21XA9Yw
@@ -85,3 +94,10 @@ other_identifiers:
   identifier: kg:/m/0n4c3yt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dan_Kildee
+- url: https://dankildee.house.gov
+- url: https://en.wikipedia.org/wiki/Dan_Kildee
+- url: https://justfacts.votesmart.org/candidate/biography/136102/dan-kildee
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/daniel_kildee/412546
+- url: https://www.linkedin.com/in/dan-kildee-ba7aa5103
diff --git a/data/us/legislature/Daniel-Webster-04db1dc5-1903-5913-a439-fed236ff85a3.yml b/data/us/legislature/Daniel-Webster-04db1dc5-1903-5913-a439-fed236ff85a3.yml
index 2af9529bf2..1649fafe7a 100644
--- a/data/us/legislature/Daniel-Webster-04db1dc5-1903-5913-a439-fed236ff85a3.yml
+++ b/data/us/legislature/Daniel-Webster-04db1dc5-1903-5913-a439-fed236ff85a3.yml
@@ -2,82 +2,72 @@ id: ocd-person/04db1dc5-1903-5913-a439-fed236ff85a3
 name: Daniel Webster
 given_name: Daniel
 family_name: Webster
-gender: M
 birth_date: 1949-04-27
+gender: Male
+email: https://webster.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/W000806.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-11
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-10
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: FL-11
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: FL-11
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-11
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: FL-10
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-10
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
+  district: FL-8
 offices:
 - classification: capitol
-  address: 2184 Rayburn House Office Building Washington DC 20515-0911
+  address: 2184 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1002
 - classification: district
-  address: 15 N. Main Street Suite B; Brooksville, FL 34601
-  voice: 352-241-9230
-  fax: 352-241-9181
-  name: 'District Office #1'
-- classification: district
-  address: 212 W. Main St. Suite 208A; Inverness, FL 34450
-  voice: 352-241-9204
-  fax: 352-241-9181
-  name: 'District Office #2'
-- classification: district
-  address: '318 S 2nd St # A; Leesburg, FL 34748-5805'
+  address: 1200 Oakley Seaver Drive Suite 203, Clermont, FL 34711
   voice: 352-241-9220
-  fax: 352-241-9220
-  name: 'District Office #3'
 - classification: district
-  address: 8015 E County Rd 466 Suite B; The Villages, FL 32162
+  address: 8015 E. County Road 466 Suite B, The Villages, FL 32162
   voice: 352-383-3552
-  fax: 352-241-9181
-  name: 'District Office #4'
+  fax: 352-241-9220
 links:
 - url: https://webster.house.gov
   note: website
+- url: https://webster.house.gov/home
+other_names:
+- name: D. Webster
+- name: D.A. Webster
+- name: Webster (FL)
+- name: Webster, D.
 ids:
   twitter: RepWebster
   youtube: UCCoX4VdU7U11eGEA0lbRtLw
   facebook: RepWebster
-other_names:
-- name: Webster (FL)
 other_identifiers:
 - scheme: bioguide
   identifier: W000806
@@ -111,3 +101,11 @@ other_identifiers:
   identifier: kg:/m/03cg47l
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Daniel_Webster_(Florida)
+- url: https://en.wikipedia.org/wiki/Daniel_Webster_(Florida_politician)
+- url: https://justfacts.votesmart.org/candidate/24302/daniel-webster
+- url: https://theunitedstates.io
+- url: https://webster.house.gov/biography
+- url: https://webster.house.gov/home
+- url: https://www.electwebster.com/meet-daniel
+- url: https://www.govtrack.us/congress/members/daniel_webster/412410
diff --git a/data/us/legislature/Danny-K-Davis-a494987e-6674-5df8-a8b2-de4b5a99de86.yml b/data/us/legislature/Danny-K-Davis-a494987e-6674-5df8-a8b2-de4b5a99de86.yml
index 3b72a8f20c..401e3e5891 100644
--- a/data/us/legislature/Danny-K-Davis-a494987e-6674-5df8-a8b2-de4b5a99de86.yml
+++ b/data/us/legislature/Danny-K-Davis-a494987e-6674-5df8-a8b2-de4b5a99de86.yml
@@ -1,104 +1,107 @@
 id: ocd-person/a494987e-6674-5df8-a8b2-de4b5a99de86
-name: Danny K. Davis
+name: Danny Davis
 given_name: Danny
 family_name: Davis
-middle_name: K.
-gender: M
 birth_date: 1941-09-06
+gender: Male
+email: https://davisforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/D000096.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-7
 offices:
 - classification: capitol
-  address: 2159 Rayburn House Office Building Washington DC 20515-1307
+  address: 2159 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5006
+  fax: 202-225-5641
 - classification: district
-  address: 2813-15 W. Fifth Ave.; Chicago, IL 60612
+  address: 2815 W. 5th Ave., Chicago, IL 60612
   voice: 773-533-7520
-  fax: 773-533-7530
-  name: 'District Office #1'
+  fax: 844-274-0426
 links:
 - url: https://davis.house.gov
   note: website
+- url: https://davis.house.gov/
+other_names:
+- name: D. Davis
+- name: D.K. Davis
+- name: Danny K. Davis
+- name: Davis (IL)
+- name: Davis, D.
 ids:
   twitter: RepDannyDavis
   youtube: UCdhrT09_XMr31tuI8OcKsjQ
   facebook: CongressmanDKDavis
-other_names:
-- name: Davis (IL)
 other_identifiers:
 - scheme: bioguide
   identifier: D000096
@@ -130,3 +133,9 @@ other_identifiers:
   identifier: kg:/m/0256k7
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Danny_K._Davis
+- url: https://davis.house.gov
+- url: https://en.wikipedia.org/wiki/Danny_K._Davis
+- url: https://justfacts.votesmart.org/candidate/key-votes/233/danny-davis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/danny_davis/400093
diff --git a/data/us/legislature/Darin-LaHood-a7bc3999-648e-58ed-b606-f387e825427c.yml b/data/us/legislature/Darin-LaHood-a7bc3999-648e-58ed-b606-f387e825427c.yml
index cbd204fedf..40bb5878f0 100644
--- a/data/us/legislature/Darin-LaHood-a7bc3999-648e-58ed-b606-f387e825427c.yml
+++ b/data/us/legislature/Darin-LaHood-a7bc3999-648e-58ed-b606-f387e825427c.yml
@@ -2,65 +2,64 @@ id: ocd-person/a7bc3999-648e-58ed-b606-f387e825427c
 name: Darin LaHood
 given_name: Darin
 family_name: LaHood
-gender: M
 birth_date: 1968-07-05
+gender: Male
+email: https://lahood.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000585.jpg
 party:
-- start_date: '2015-09-17'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-09-17'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-18
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: IL-16
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-18
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-18
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-18
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-09-17
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-16
+  district: IL-18
 offices:
 - classification: capitol
-  address: 1424 Longworth House Office Building Washington DC 20515-1316
+  address: 1424 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6201
+  fax: 202-225-9249
 - classification: district
-  address: 3004 G.E. Rd. Suite 1B; Bloomington, IL 61704
-  voice: 309-205-9556
-  name: 'District Office #1'
-- classification: district
-  address: 201 W. Morgan St.; Jacksonville, IL 62650
-  voice: 217-245-1431
-  fax: 217-243-6852
-  name: 'District Office #2'
-- classification: district
-  address: 100 NE Monroe St. Room 100; Peoria, IL 61602
+  address: 100 NE Monroe St. Room 100, Peoria, IL 61602
   voice: 309-671-7027
   fax: 309-671-7309
-  name: 'District Office #3'
 - classification: district
-  address: 235 S. Sixth St.; Springfield, IL 62701
-  voice: 217-670-1653
-  fax: 217-670-1806
-  name: 'District Office #4'
+  address: 108 E. Beaufort St., Normal, IL 61761
+  voice: 309-445-8080
+- classification: district
+  address: 1715 N. Division St. Suite E, Morris, IL 60450
+- classification: district
+  address: 527 Colman Center Drive, Rockford, IL 61108
+  voice: 779-238-4785
 links:
 - url: https://lahood.house.gov
   note: website
+- url: https://ilga.gov/senate/Senator.asp?GA=99&MemberID=2199
+- url: https://lahood.house.gov/
+other_names:
+- name: D. LaHood
+- name: D.M. LaHood
+- name: LaHood, D.
 ids:
   twitter: RepLaHood
   youtube: UCVRbtFwaBGcixZIkygtalRw
@@ -96,3 +95,9 @@ other_identifiers:
   identifier: '21562'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Darin_LaHood
+- url: https://en.wikipedia.org/wiki/Darin_LaHood
+- url: https://ilga.gov/senate/Senator.asp?GA=99&MemberID=2199
+- url: https://lahood.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/darin_lahood/412674
diff --git a/data/us/legislature/Darrell-Issa-15e5e4c2-568f-55b4-9aa2-54797027c984.yml b/data/us/legislature/Darrell-Issa-15e5e4c2-568f-55b4-9aa2-54797027c984.yml
index 648dce6391..1df7e1c427 100644
--- a/data/us/legislature/Darrell-Issa-15e5e4c2-568f-55b4-9aa2-54797027c984.yml
+++ b/data/us/legislature/Darrell-Issa-15e5e4c2-568f-55b4-9aa2-54797027c984.yml
@@ -2,77 +2,86 @@ id: ocd-person/15e5e4c2-568f-55b4-9aa2-54797027c984
 name: Darrell Issa
 given_name: Darrell
 family_name: Issa
-middle_name: E.
-gender: M
 birth_date: 1953-11-01
+gender: Male
+email: https://issa.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/I000056.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-48
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-49
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-50
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-50
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-49
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-48
 offices:
 - classification: capitol
-  address: 2108 Rayburn House Office Building Washington DC 20515-0548
+  address: 2108 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5672
+- classification: district
+  address: '221 W. Crest St., #110, Escondido, CA 92025'
+  voice: 760-304-7575
+- classification: district
+  address: 41000 Main St., Temecula, CA 92590
+  voice: 760-304-7575
 links:
 - url: https://issa.house.gov
   note: website
+- url: https://issa.house.gov/
+other_names:
+- name: D. Issa
+- name: D.E. Issa
+- name: Issa, D.
 ids:
   twitter: repdarrellissa
 other_identifiers:
@@ -108,3 +117,11 @@ other_identifiers:
   identifier: kg:/m/01r7wc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Darrell_Issa
+- url: https://en.wikipedia.org/wiki/Darrell_Issa
+- url: https://issa.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/16553/darrell-issa
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/darrell_issa/400196
+- url: https://www.linkedin.com/in/darrell-issa-624257139
+- url: https://www.linkedin.com/in/darrell-issa-a30590124
diff --git a/data/us/legislature/Darren-Soto-ef44884b-f8bf-542b-b1ae-f36c7cf8e962.yml b/data/us/legislature/Darren-Soto-ef44884b-f8bf-542b-b1ae-f36c7cf8e962.yml
index db14f76c91..226aa72e14 100644
--- a/data/us/legislature/Darren-Soto-ef44884b-f8bf-542b-b1ae-f36c7cf8e962.yml
+++ b/data/us/legislature/Darren-Soto-ef44884b-f8bf-542b-b1ae-f36c7cf8e962.yml
@@ -2,62 +2,51 @@ id: ocd-person/ef44884b-f8bf-542b-b1ae-f36c7cf8e962
 name: Darren Soto
 given_name: Darren
 family_name: Soto
-gender: M
 birth_date: 1978-02-25
+gender: Male
+email: https://soto.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001200.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-9
 offices:
 - classification: capitol
-  address: 2353 Rayburn House Office Building Washington DC 20515-0909
+  address: 2353 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-9889
+  fax: 202-225-9742
 - classification: district
-  address: 804 Bryan St.; Kissimmee, FL 34741
-  voice: 407-452-1171
-  name: 'District Office #1'
-- classification: district
-  address: 620 E Main St.; Haines City, FL 33844
-  voice: 202-615-1308
-  name: 'District Office #2'
-- classification: district
-  address: 13800 Veterans Way s 1F806; Orlando, FL 32827-7401
-  voice: 202-322-4476
-  name: 'District Office #3'
+  address: 5800 S. Semoran Blvd. Suite B, Orlando, FL 32822
+  voice: 407-204-3370
 - classification: district
-  address: 201 W Central Avenue; Lake Wales, FL 33853
-  voice: 202-600-0843
-  fax: 202-615-1308
-  name: 'District Office #4'
-- classification: district
-  address: 451 3rd Street NW; Winter Haven, FL 33881
-  voice: 202-600-0843
-  name: 'District Office #5'
+  address: 804 Bryan St., Kissimmee, FL 34741
+  voice: 407-452-1171
 links:
 - url: https://soto.house.gov
   note: website
+other_names:
+- name: D. Soto
+- name: D.M. Soto
+- name: Soto, D.
 ids:
   twitter: RepDarrenSoto
   facebook: CongressmanDarrenSoto
@@ -88,3 +77,13 @@ other_identifiers:
   identifier: Darren Soto
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Darren_Soto
+- url: https://chci.org/staff-and-leadership/rep-darren-soto
+- url: https://en.wikipedia.org/wiki/Darren_Soto
+- url: https://justfacts.votesmart.org/candidate/biography/67618/darren-soto
+- url: https://soto.house.gov
+- url: https://soto.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.darrensoto.com/about
+- url: https://www.govtrack.us/congress/members/darren_soto/412695
+- url: https://www.linkedin.com/in/darren-soto-7b2a5b116
diff --git a/data/us/legislature/David-G-Valadao-cf552a34-e9e1-5de9-9270-b5b441dd89fe.yml b/data/us/legislature/David-G-Valadao-cf552a34-e9e1-5de9-9270-b5b441dd89fe.yml
index c0522631dc..7438fc77f6 100644
--- a/data/us/legislature/David-G-Valadao-cf552a34-e9e1-5de9-9270-b5b441dd89fe.yml
+++ b/data/us/legislature/David-G-Valadao-cf552a34-e9e1-5de9-9270-b5b441dd89fe.yml
@@ -1,48 +1,59 @@
 id: ocd-person/cf552a34-e9e1-5de9-9270-b5b441dd89fe
-name: David G. Valadao
+name: David Valadao
 given_name: David
 family_name: Valadao
-middle_name: G.
-gender: M
 birth_date: 1977-04-14
+gender: Male
+email: https://valadao.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/V000129.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-21
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-22
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-21
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-21
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-21
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-22
+  district: CA-21
 offices:
 - classification: capitol
-  address: 2465 Rayburn House Office Building Washington DC 20515-0522
+  address: 2465 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4695
+- classification: district
+  address: 107 S. Douty St., Hanford, CA 93230
+  voice: 559-460-6070
+  fax: 559-584-3564
+- classification: district
+  address: 2700 M St. Suite 250B, Bakersfield, CA 93301
+  voice: 661-864-7736
+  fax: 833-284-9090
 links:
 - url: https://valadao.house.gov
   note: website
+other_names:
+- name: D. Valadao
+- name: D.G. Valadao
+- name: David G. Valadao
+- name: Valadao, D.
 ids:
   twitter: RepDavidValadao
 other_identifiers:
@@ -74,3 +85,10 @@ other_identifiers:
   identifier: kg:/m/0g55rlx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_G._Valadao
+- url: https://en.wikipedia.org/wiki/David_Valadao
+- url: https://justfacts.votesmart.org/candidate/biography/120200/david-valadao
+- url: https://theunitedstates.io
+- url: https://valadao.house.gov
+- url: https://www.govtrack.us/congress/members/david_valadao/412515
+- url: https://www.linkedin.com/in/david-valadao-7142b2180
diff --git a/data/us/legislature/David-J-Trone-e23c900b-5d24-55cb-a1d1-73ac69e597ef.yml b/data/us/legislature/David-J-Trone-e23c900b-5d24-55cb-a1d1-73ac69e597ef.yml
index 8f5b0c93f3..c4f233e4f8 100644
--- a/data/us/legislature/David-J-Trone-e23c900b-5d24-55cb-a1d1-73ac69e597ef.yml
+++ b/data/us/legislature/David-J-Trone-e23c900b-5d24-55cb-a1d1-73ac69e597ef.yml
@@ -1,42 +1,45 @@
 id: ocd-person/e23c900b-5d24-55cb-a1d1-73ac69e597ef
-name: David J. Trone
+name: David Trone
 given_name: David
 family_name: Trone
-middle_name: J.
-gender: M
 birth_date: 1955-09-21
+gender: Male
+email: https://trone.house.gov/contact/email-me/
 image: https://theunitedstates.io/images/congress/450x550/T000483.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-6
 offices:
 - classification: capitol
-  address: 2404 Rayburn House Office Building Washington DC 20515-2006
+  address: 2404 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2721
 - classification: district
-  address: 9801 Washingtonian Blvd Suite 330; Gaithersburg, MD 20878-5355
+  address: 30 W. Patrick St. Suite 505, Frederick, MD 21701
   voice: 301-926-0300
-  name: 'District Office #1'
 links:
 - url: https://trone.house.gov
   note: website
+- url: https://trone.house.gov/
+other_names:
+- name: D. Trone
+- name: D.J. Trone
+- name: David J. Trone
+- name: Trone, D.
 ids:
   twitter: RepDavidTrone
 other_identifiers:
@@ -62,3 +65,10 @@ other_identifiers:
   identifier: kg:/g/11dxnzbmvl
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Trone
+- url: https://en.wikipedia.org/wiki/David_Trone
+- url: https://justfacts.votesmart.org/candidate/167336/david-trone
+- url: https://theunitedstates.io
+- url: https://trone.house.gov
+- url: https://www.govtrack.us/congress/members/david_trone/412783
+- url: https://www.linkedin.com/in/david-trone-a4b523147
diff --git a/data/us/legislature/David-Kustoff-5beaa710-fc70-563c-9842-f885e13d9aea.yml b/data/us/legislature/David-Kustoff-5beaa710-fc70-563c-9842-f885e13d9aea.yml
index 55684f359d..a35fb111ad 100644
--- a/data/us/legislature/David-Kustoff-5beaa710-fc70-563c-9842-f885e13d9aea.yml
+++ b/data/us/legislature/David-Kustoff-5beaa710-fc70-563c-9842-f885e13d9aea.yml
@@ -2,55 +2,60 @@ id: ocd-person/5beaa710-fc70-563c-9842-f885e13d9aea
 name: David Kustoff
 given_name: David
 family_name: Kustoff
-gender: M
 birth_date: 1966-10-08
+gender: Male
+email: https://kustoff.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/K000392.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-8
 offices:
 - classification: capitol
-  address: 560 Cannon House Office Building Washington DC 20515-4208
+  address: 560 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4714
 - classification: district
-  address: 425 W Court St; Dyersburg, TN 38024-4616
+  address: 242 S. Lindell St., Martin, TN 38237
+  voice: 731-412-1043
+- classification: district
+  address: 425 W. Court St., Dyersburg, TN 38024
   voice: 731-412-1037
-  name: 'District Office #1'
 - classification: district
-  address: 5900 Poplar Ave. Suite 202; Memphis, TN 38119
+  address: 5900 Poplar Ave. Suite 202, Memphis, TN 38119
   voice: 901-682-4422
   fax: 901-682-8973
-  name: 'District Office #2'
 - classification: district
-  address: 117 North Liberty Street; Jackson, TN 38301
+  address: Ed Jones Federal Building 109 S. Highland Ave., Suite B-7, Jackson, TN
+    38301
   voice: 731-423-4848
   fax: 731-427-1537
-  name: 'District Office #3'
 links:
 - url: https://kustoff.house.gov
   note: website
+- url: https://kustoff.house.gov/
+other_names:
+- name: D. Kustoff
+- name: D.F. Kustoff
+- name: Kustoff, D.
 ids:
   twitter: RepDavidKustoff
   youtube: UCK6U4plOKKMrCjv_h59spGQ
@@ -82,3 +87,12 @@ other_identifiers:
   identifier: David Kustoff
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Kustoff
+- url: https://en.wikipedia.org/wiki/David_Kustoff
+- url: https://justfacts.votesmart.org/candidate/biography/48997/david-kustoff
+- url: https://kustoff.house.gov
+- url: https://kustoff.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/david_kustoff/412724
+- url: https://www.kustoffforcongress.com/about
+- url: https://www.linkedin.com/in/david-kustoff-ba7b1a20
diff --git a/data/us/legislature/David-P-Joyce-b7ff0450-1acd-5127-b3f5-7246374119a9.yml b/data/us/legislature/David-P-Joyce-b7ff0450-1acd-5127-b3f5-7246374119a9.yml
index d7d21d4e45..eecf3ea831 100644
--- a/data/us/legislature/David-P-Joyce-b7ff0450-1acd-5127-b3f5-7246374119a9.yml
+++ b/data/us/legislature/David-P-Joyce-b7ff0450-1acd-5127-b3f5-7246374119a9.yml
@@ -1,69 +1,70 @@
 id: ocd-person/b7ff0450-1acd-5127-b3f5-7246374119a9
-name: David P. Joyce
-given_name: David
+name: Dave Joyce
+given_name: Dave
 family_name: Joyce
-middle_name: P.
-gender: M
 birth_date: 1957-03-17
+gender: Male
+email: https://joyce.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/J000295.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-14
 offices:
 - classification: capitol
-  address: 2065 Rayburn House Office Building Washington DC 20515-3514
+  address: 2065 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5731
+  fax: 202-225-3307
 - classification: district
-  address: 8500 Station St Suite 390; Mentor, OH 44060
+  address: 125 W. Market St. Room 204, Warren, OH 44481
+  voice: 330-752-7673
+- classification: district
+  address: 8500 Station St. Suite 390, Mentor, OH 44060
   voice: 440-352-3939
   fax: 440-266-9004
-  name: 'District Office #1'
-- classification: district
-  address: 10075 Ravenna Road; Twinsburg, OH 44087
-  voice: 330-357-4139
-  fax: 330-425-7071
-  name: 'District Office #2'
 links:
 - url: https://joyce.house.gov
   note: website
+- url: https://joyce.house.gov/
+other_names:
+- name: D. Joyce
+- name: D.P. Joyce
+- name: David P. Joyce
+- name: Joyce (OH)
+- name: Joyce, D.
 ids:
   twitter: RepDaveJoyce
   youtube: UCTu9xz2VYk-jtQv0TVsLyYA
   facebook: RepDaveJoyce
-other_names:
-- name: Joyce (OH)
 other_identifiers:
 - scheme: govtrack
   identifier: '412566'
@@ -93,3 +94,8 @@ other_identifiers:
   identifier: kg:/m/0ktwnp_
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Joyce
+- url: https://en.wikipedia.org/wiki/David_Joyce_(politician)
+- url: https://joyce.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/david_joyce/412566
diff --git a/data/us/legislature/David-Rouzer-5e9726e3-2aae-5708-9227-0e95ac43c203.yml b/data/us/legislature/David-Rouzer-5e9726e3-2aae-5708-9227-0e95ac43c203.yml
index edd41b2fcd..7d1dfd1068 100644
--- a/data/us/legislature/David-Rouzer-5e9726e3-2aae-5708-9227-0e95ac43c203.yml
+++ b/data/us/legislature/David-Rouzer-5e9726e3-2aae-5708-9227-0e95ac43c203.yml
@@ -2,61 +2,67 @@ id: ocd-person/5e9726e3-2aae-5708-9227-0e95ac43c203
 name: David Rouzer
 given_name: David
 family_name: Rouzer
-gender: M
 birth_date: 1972-02-16
+gender: Male
+email: https://rouzerforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/R000603.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-7
 offices:
 - classification: capitol
-  address: 2333 Rayburn House Office Building Washington DC 20515-3307
+  address: 2333 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2731
+  fax: 202-225-5773
 - classification: district
-  address: 310 Government Center Dr. Unit 1; Bolivia, NC 28422
-  voice: 910-253-6111
-  fax: 910-253-6114
-  name: 'District Office #1'
+  address: 225 Green St. Suite 202, Fayetteville, NC 28301
+  voice: 910-500-4880
+  fax: 771-200-5605
 - classification: district
-  address: 4001 US Hwy. 301 South Suite 106; Four Oaks, NC 27524
-  voice: 919-938-3040
-  fax: 919-938-3540
-  name: 'District Office #2'
-- classification: district
-  address: 230 Government Center Dr. Suite 113; Wilmington, NC 28403
+  address: 2520 Independence Blvd. Suite 201, Wilmington, NC 28412
   voice: 910-395-0202
-  fax: 910-395-0209
-  name: 'District Office #3'
+  fax: 771-200-5605
+- classification: district
+  address: 310 Government Center Drive, Unit 1, Bolivia, NC 28422
+  voice: 910-253-6111
+  fax: 771-200-5605
+- classification: district
+  address: 550 N. Chestnut St. Suite 152, Lumberton, NC 28358
+  voice: 910-702-6140
+  fax: 910-253-6114
 links:
 - url: https://rouzer.house.gov
   note: website
+- url: https://rouzer.house.gov/
+other_names:
+- name: D. Rouzer
+- name: D.C. Rouzer
+- name: Rouzer, D.
 ids:
   twitter: RepDavidRouzer
   youtube: UCBvOxpqoGi1HlHjX9v_gHZw
@@ -90,3 +96,10 @@ other_identifiers:
   identifier: David Rouzer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Rouzer
+- url: https://en.wikipedia.org/wiki/David_Rouzer
+- url: https://justfacts.votesmart.org/candidate/biography/102964/david-rouzer
+- url: https://rouzer.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/david_rouzer/412641
+- url: https://www.linkedin.com/in/david-rouzer-3a568910
diff --git a/data/us/legislature/David-Schweikert-100d00e0-275c-5bd0-960e-c24c3b50a8e5.yml b/data/us/legislature/David-Schweikert-100d00e0-275c-5bd0-960e-c24c3b50a8e5.yml
index 0ec37de711..c51a46eee3 100644
--- a/data/us/legislature/David-Schweikert-100d00e0-275c-5bd0-960e-c24c3b50a8e5.yml
+++ b/data/us/legislature/David-Schweikert-100d00e0-275c-5bd0-960e-c24c3b50a8e5.yml
@@ -2,61 +2,65 @@ id: ocd-person/100d00e0-275c-5bd0-960e-c24c3b50a8e5
 name: David Schweikert
 given_name: David
 family_name: Schweikert
-gender: M
 birth_date: 1962-03-03
+gender: Male
+email: https://schweikert.house.gov/email/
 image: https://theunitedstates.io/images/congress/450x550/S001183.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: AZ-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-1
+  district: AZ-5
 offices:
 - classification: capitol
-  address: 460 Cannon House Office Building Washington DC 20515-0301
+  address: 460 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2190
+  fax: 202-225-0096
 - classification: district
-  address: 14500 N Northsight Blvd Suite 221; Scottsdale, AZ 85260-3658
+  address: 14500 N. Northsight Blvd. Suite 221, Scottsdale, AZ 85260
   voice: 480-946-2411
   fax: 480-946-2446
-  name: 'District Office #1'
 links:
 - url: https://schweikert.house.gov
   note: website
+- url: https://schweikert.house.gov/
+other_names:
+- name: D. Schweikert
+- name: D.S. Schweikert
+- name: Schweikert, D.
 ids:
   twitter: RepDavid
   youtube: UCVvuNVzkOUp7p_Pzkc6Zuvw
@@ -94,3 +98,12 @@ other_identifiers:
   identifier: kg:/m/03wbpxj
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Schweikert
+- url: https://davidschweikert.com/meet-david
+- url: https://en.wikipedia.org/wiki/David_Schweikert
+- url: https://justfacts.votesmart.org/candidate/106387/david-schweikert
+- url: https://schweikert.house.gov
+- url: https://schweikert.house.gov/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/david_schweikert/412399
+- url: https://www.linkedin.com/in/david-schweikert-54ab0218
diff --git a/data/us/legislature/David-Scott-e6650822-1063-5485-b062-d169ea173ec2.yml b/data/us/legislature/David-Scott-e6650822-1063-5485-b062-d169ea173ec2.yml
index e8b71088b6..3002c188b7 100644
--- a/data/us/legislature/David-Scott-e6650822-1063-5485-b062-d169ea173ec2.yml
+++ b/data/us/legislature/David-Scott-e6650822-1063-5485-b062-d169ea173ec2.yml
@@ -2,92 +2,90 @@ id: ocd-person/e6650822-1063-5485-b062-d169ea173ec2
 name: David Scott
 given_name: David
 family_name: Scott
-gender: M
 birth_date: 1945-06-27
+gender: Male
+email: https://davidscott.house.gov/contact/contactform.htm
 image: https://theunitedstates.io/images/congress/450x550/S001157.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-13
 offices:
 - classification: capitol
-  address: 468 Cannon House Office Building Washington DC 20515-1013
+  address: 468 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2939
+  fax: 202-225-4628
 - classification: district
-  address: 173 N. Main St.; Jonesboro, GA 30236
+  address: 81 Upper Riverdale Road SW Suite 230, Riverdale, GA 30274
   voice: 770-210-5073
-  fax: 770-210-5673
-  name: 'District Office #1'
-- classification: district
-  address: 888 Concord Rd. Suite 100; Smyrna, GA 30080
-  voice: 770-432-5405
-  fax: 770-432-5813
-  name: 'District Office #2'
+  fax: 770-991-9797
 links:
 - url: https://davidscott.house.gov
   note: website
+- url: https://davidscott.house.gov/
+other_names:
+- name: D. Scott
+- name: D.A. Scott
+- name: Scott, D.
+- name: Scott, David
 ids:
   twitter: RepDavidScott
   youtube: UCgf28zRkLSqAUiPuJhGdF0w
   facebook: '113303673339'
-other_names:
-- name: Scott, David
 other_identifiers:
 - scheme: bioguide
   identifier: S001157
@@ -119,3 +117,10 @@ other_identifiers:
   identifier: kg:/m/0255r4
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/David_Scott_(Georgia)
+- url: https://davidscott.house.gov
+- url: https://en.wikipedia.org/wiki/David_Scott_%28Georgia%29
+- url: https://justfacts.votesmart.org/candidate/7826/david-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/david_scott/400363
+- url: https://www.linkedin.com/in/congressmandavidscott
diff --git a/data/us/legislature/Dean-Phillips-501837d6-d9cc-5b1e-a2e3-e53f047192a5.yml b/data/us/legislature/Dean-Phillips-501837d6-d9cc-5b1e-a2e3-e53f047192a5.yml
index 68cd760ab3..27b0367583 100644
--- a/data/us/legislature/Dean-Phillips-501837d6-d9cc-5b1e-a2e3-e53f047192a5.yml
+++ b/data/us/legislature/Dean-Phillips-501837d6-d9cc-5b1e-a2e3-e53f047192a5.yml
@@ -2,40 +2,43 @@ id: ocd-person/501837d6-d9cc-5b1e-a2e3-e53f047192a5
 name: Dean Phillips
 given_name: Dean
 family_name: Phillips
-gender: M
 birth_date: 1969-01-20
+gender: Male
+email: https://phillips.house.gov/contact/contactform.htm
 image: https://theunitedstates.io/images/congress/450x550/P000616.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-3
 offices:
 - classification: capitol
-  address: 2452 Rayburn House Office Building Washington DC 20515-2303
+  address: 2452 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2871
 - classification: district
-  address: 1800 W Old Shakopee Rd Second Floor; Bloomington, MN 55431-3071
-  voice: 952-563-4593
-  name: 'District Office #1'
+  address: 13911 Ridgedale Drive, Suite 200, Minnetonka, MN 55305
+  voice: 952-656-5176
 links:
 - url: https://phillips.house.gov
   note: website
+- url: https://phillips.house.gov/
+other_names:
+- name: D. Phillips
+- name: D.B. Phillips
+- name: Phillips, D.
 ids:
   twitter: RepDeanPhillips
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: kg:/g/11fg48_c9t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dean_Phillips
+- url: https://en.wikipedia.org/wiki/Dean_Phillips
+- url: https://justfacts.votesmart.org/candidate/key-votes/181357/dean-phillips
+- url: https://phillips.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dean_phillips/412790
+- url: https://www.linkedin.com/in/deanbphillips
diff --git a/data/us/legislature/Deb-Fischer-1e87267c-1e9f-5e46-a266-b1d557a8571b.yml b/data/us/legislature/Deb-Fischer-1e87267c-1e9f-5e46-a266-b1d557a8571b.yml
index 24d713bbd3..af3ccb74a0 100644
--- a/data/us/legislature/Deb-Fischer-1e87267c-1e9f-5e46-a266-b1d557a8571b.yml
+++ b/data/us/legislature/Deb-Fischer-1e87267c-1e9f-5e46-a266-b1d557a8571b.yml
@@ -2,59 +2,59 @@ id: ocd-person/1e87267c-1e9f-5e46-a266-b1d557a8571b
 name: Deb Fischer
 given_name: Deb
 family_name: Fischer
-gender: F
 birth_date: 1951-03-01
+gender: Female
+email: https://www.fischer.senate.gov/public/?p=email-deb
 image: https://theunitedstates.io/images/congress/450x550/F000463.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nebraska
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nebraska
 offices:
 - classification: capitol
-  address: 448 Russell Senate Office Building Washington DC 20510
+  address: 448 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6551
+  fax: 202-228-1325
 - classification: district
-  address: 20 W. 23rd St.; Kearney, NE 68847
-  voice: 308-234-2361
-  fax: 308-234-3684
-  name: 'District Office #1'
-- classification: district
-  address: 440 N. 8th St. Suite 120; Lincoln, NE 68508
-  voice: 402-441-4600
-  fax: 402-476-8753
-  name: 'District Office #2'
-- classification: district
-  address: 11819 Miracle Hills Drive Suite 205; Omaha, NE 68154
+  address: 11819 Miracle Hills Drive Suite 205, Omaha, NE 68154
   voice: 402-391-3411
   fax: 402-391-4725
-  name: 'District Office #3'
 - classification: district
-  address: 120 East 16th St. Suite 203; Scottsbluff, NE 69361
+  address: 120 E. 16th St. Suite 203, Scottsbluff, NE 69361
   voice: 308-630-2329
   fax: 308-630-2321
-  name: 'District Office #4'
+- classification: district
+  address: 20 W. 23rd St., Kearney, NE 68847
+  voice: 308-234-2361
+  fax: 308-234-3684
+- classification: district
+  address: Wells Fargo Center 1248 O St., Suite 1111, Lincoln, NE 68508
+  voice: 402-441-4600
+  fax: 402-476-8753
 links:
 - url: https://www.fischer.senate.gov
   note: website
 - url: https://www.fischer.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.fischer.senate.gov/
+other_names:
+- name: D. Fischer
+- name: D.S. Fischer
+- name: Fischer (R-NE)
+- name: Fischer, D.
 ids:
   twitter: SenatorFischer
   youtube: UCrbEfZaG_WhB0PBHI1hefPQ
   facebook: senatordebfischer
-other_names:
-- name: Fischer (R-NE)
 other_identifiers:
 - scheme: bioguide
   identifier: F000463
@@ -88,3 +88,9 @@ other_identifiers:
   identifier: kg:/m/0c4cp0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Deb_Fischer
+- url: https://en.wikipedia.org/wiki/Deb_Fischer
+- url: https://justfacts.votesmart.org/candidate/biography/41963/deb-fischer
+- url: https://theunitedstates.io
+- url: https://www.fischer.senate.gov
+- url: https://www.govtrack.us/congress/members/deb_fischer/412556
diff --git a/data/us/legislature/Debbie-Dingell-b48d0289-7d22-5bb4-bd17-b351aa3ec4a2.yml b/data/us/legislature/Debbie-Dingell-b48d0289-7d22-5bb4-bd17-b351aa3ec4a2.yml
index ec9bb1e080..e2b41e4ba3 100644
--- a/data/us/legislature/Debbie-Dingell-b48d0289-7d22-5bb4-bd17-b351aa3ec4a2.yml
+++ b/data/us/legislature/Debbie-Dingell-b48d0289-7d22-5bb4-bd17-b351aa3ec4a2.yml
@@ -2,54 +2,58 @@ id: ocd-person/b48d0289-7d22-5bb4-bd17-b351aa3ec4a2
 name: Debbie Dingell
 given_name: Debbie
 family_name: Dingell
-gender: F
 birth_date: 1953-11-23
+gender: Female
+email: https://debbiedingell.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/D000624.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: MI-6
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-6
+  district: MI-12
 offices:
 - classification: capitol
-  address: 102 Cannon House Office Building Washington DC 20515-2206
+  address: 102 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4071
 - classification: district
-  address: 19855 West Outer Drive Suite 103-E; Dearborn, MI 48124
-  voice: 313-278-2936
-  name: 'District Office #1'
-- classification: district
-  address: 301 W. Michigan Ave. Suite 400; Ypsilanti, MI 48197
+  address: 2006 Hogback Road Suite 7, Ann Arbor, MI 48105
   voice: 734-481-1100
-  name: 'District Office #2'
+  fax: 771-200-5839
+- classification: district
+  address: Woodhaven City Hall 21869 West Road, Woodhaven, MI 48183
+  voice: 313-278-2936
+  fax: 771-200-5839
 links:
 - url: https://debbiedingell.house.gov
   note: website
+- url: https://debbiedingell.house.gov/
+other_names:
+- name: D. Dingell
+- name: D.A. Dingell
+- name: Dingell, D.
 ids:
   twitter: RepDebDingell
   youtube: UCnoP3KLT-HOvzDfC1-I-9lQ
@@ -85,3 +89,10 @@ other_identifiers:
   identifier: Debbie Dingell
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Debbie_Dingell
+- url: https://debbiedingell.house.gov
+- url: https://en.wikipedia.org/wiki/Deborah_Dingell
+- url: https://justfacts.votesmart.org/candidate/biography/152482/debbie-dingell
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/debbie_dingell/412637
+- url: https://www.linkedin.com/in/debbie-dingell-8b13837a
diff --git a/data/us/legislature/Debbie-Lesko-ce00d736-9c65-52f1-9cdf-aff115c2b7b4.yml b/data/us/legislature/Debbie-Lesko-ce00d736-9c65-52f1-9cdf-aff115c2b7b4.yml
index 1596c7dcb7..eac7299634 100644
--- a/data/us/legislature/Debbie-Lesko-ce00d736-9c65-52f1-9cdf-aff115c2b7b4.yml
+++ b/data/us/legislature/Debbie-Lesko-ce00d736-9c65-52f1-9cdf-aff115c2b7b4.yml
@@ -2,46 +2,49 @@ id: ocd-person/ce00d736-9c65-52f1-9cdf-aff115c2b7b4
 name: Debbie Lesko
 given_name: Debbie
 family_name: Lesko
-gender: F
 birth_date: 1958-11-14
+gender: Female
+email: https://lesko.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/L000589.jpg
 party:
-- start_date: '2018-05-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2018-05-07'
-  end_date: '2019-01-03'
+- start_date: 2018-05-07
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-05-07
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-8
 offices:
 - classification: capitol
-  address: 1214 Longworth House Office Building Washington DC 20515-0308
+  address: 1214 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4576
 - classification: district
-  address: '7121 W Bell Rd #200; Glendale, AZ 85308'
+  address: 12515 W. Bell Road Suite 104, Surprise, AZ 85378
   voice: 623-776-7911
   fax: 623-776-7832
-  name: 'District Office #1'
 links:
 - url: https://lesko.house.gov
   note: website
+- url: https://lesko.house.gov/
+other_names:
+- name: D. Lesko
+- name: D.K. Lesko
+- name: Lesko, D.
 ids:
   twitter: RepDLesko
   facebook: RepDebbieLesko
@@ -68,3 +71,9 @@ other_identifiers:
   identifier: '21757'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Debbie_Lesko
+- url: https://en.wikipedia.org/wiki/Debbie_Lesko
+- url: https://lesko.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/debbie_lesko/412745
+- url: https://www.linkedin.com/in/debbie-lesko-7b777235
diff --git a/data/us/legislature/Debbie-Stabenow-a18130ac-79f6-54ad-a80d-14b143f0742f.yml b/data/us/legislature/Debbie-Stabenow-a18130ac-79f6-54ad-a80d-14b143f0742f.yml
index 763d5d21f3..b79f468d01 100644
--- a/data/us/legislature/Debbie-Stabenow-a18130ac-79f6-54ad-a80d-14b143f0742f.yml
+++ b/data/us/legislature/Debbie-Stabenow-a18130ac-79f6-54ad-a80d-14b143f0742f.yml
@@ -2,84 +2,86 @@ id: ocd-person/a18130ac-79f6-54ad-a80d-14b143f0742f
 name: Debbie Stabenow
 given_name: Debbie
 family_name: Stabenow
-middle_name: Ann
-gender: F
 birth_date: 1950-04-29
+gender: Female
+email: https://www.stabenow.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/S000770.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-8
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-8
-- start_date: '2001-01-03'
-  end_date: '2007-01-03'
+- start_date: 2001-01-03
+  end_date: 2025-01-02
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Michigan
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Michigan
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Michigan
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-01-03
+  end_date: 2007-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Michigan
+- start_date: 1999-01-06
+  end_date: 2001-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: MI-8
+- start_date: 1997-01-07
+  end_date: 1999-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: MI-8
 offices:
 - classification: capitol
-  address: 731 Hart Senate Office Building Washington DC 20510
+  address: 731 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4822
 - classification: district
-  address: 719 Griswold St. Suite 700; Detroit, MI 48226
-  voice: 313-961-4330
-  name: 'District Office #1'
-- classification: district
-  address: 221 W. Lake Lansing Rd. Suite 100; East Lansing, MI 48823
-  voice: 517-203-1760
-  name: 'District Office #2'
-- classification: district
-  address: 432 N. Saginaw St. Suite 301; Flint, MI 48502
-  voice: 810-720-4172
-  name: 'District Office #3'
-- classification: district
-  address: 3280 E. Beltline Ct. NE Suite 400; Grand Rapids, MI 49525
+  address: 1025 Spaulding Ave. SE Suite C, Grand Rapids, MI 49525
   voice: 616-975-0052
-  name: 'District Office #4'
+  fax: 616-975-5764
 - classification: district
-  address: 1901 W. Ridge Suite 7; Marquette, MI 49855
+  address: 1901 W. Ridge St. Suite 7, Marquette, MI 49855
   voice: 906-228-8756
-  name: 'District Office #5'
+  fax: 906-228-9162
 - classification: district
-  address: 3335 S. Airport Road West Suite 6B; Traverse City, MI 49684
+  address: 221 W. Lake Lansing Road Suite 100, East Lansing, MI 48823
+  voice: 517-203-1760
+  fax: 517-203-1778
+- classification: district
+  address: 3335 S. Airport Road West Suite 6B, Traverse City, MI 49684
   voice: 231-929-1031
-  name: 'District Office #6'
+  fax: 231-929-1250
+- classification: district
+  address: 432 N. Saginaw St. Suite 301, Flint, MI 48502
+  voice: 810-720-4172
+  fax: 810-720-4178
+- classification: district
+  address: 719 Griswold St. Suite 700, Detroit, MI 48226
+  voice: 313-961-4330
+  fax: 313-961-7566
 links:
 - url: https://www.stabenow.senate.gov
   note: website
 - url: https://www.stabenow.senate.gov/contact
   note: contact form
+- url: https://www.stabenow.senate.gov/
+other_names:
+- name: D. Stabenow
+- name: D.A.G. Stabenow
+- name: Stabenow (D-MI)
+- name: Stabenow, D.
 ids:
   twitter: SenStabenow
   youtube: UCFoDKCvxSwCUfDv-4Eg4K5A
   facebook: SenatorStabenow
-other_names:
-- name: Stabenow (D-MI)
 other_identifiers:
 - scheme: bioguide
   identifier: S000770
@@ -115,3 +117,11 @@ other_identifiers:
   identifier: kg:/m/01xh64
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Debbie_Stabenow
+- url: https://debbiestabenow.com/meet-debbie
+- url: https://en.wikipedia.org/wiki/Debbie_Stabenow
+- url: https://justfacts.votesmart.org/candidate/biography/515/debbie-stabenow
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/debbie_stabenow/300093
+- url: https://www.stabenow.senate.gov
+- url: https://www.stabenow.senate.gov/about/biography
diff --git a/data/us/legislature/Debbie-Wasserman-Schultz-7bacff4a-1d4a-5c4f-a59c-311206c181d2.yml b/data/us/legislature/Debbie-Wasserman-Schultz-7bacff4a-1d4a-5c4f-a59c-311206c181d2.yml
index cc0a814255..f35ca74404 100644
--- a/data/us/legislature/Debbie-Wasserman-Schultz-7bacff4a-1d4a-5c4f-a59c-311206c181d2.yml
+++ b/data/us/legislature/Debbie-Wasserman-Schultz-7bacff4a-1d4a-5c4f-a59c-311206c181d2.yml
@@ -2,81 +2,83 @@ id: ocd-person/7bacff4a-1d4a-5c4f-a59c-311206c181d2
 name: Debbie Wasserman Schultz
 given_name: Debbie
 family_name: Wasserman Schultz
-gender: F
 birth_date: 1966-09-27
+gender: Female
+email: https://wassermanschultz.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000797.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-20
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: FL-25
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-20
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: FL-23
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-20
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: FL-23
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-20
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-23
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-23
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-23
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-23
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: FL-20
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-23
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: FL-20
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-23
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-20
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-25
+  district: FL-20
 offices:
 - classification: capitol
-  address: 270 Cannon House Office Building Washington DC 20515-0925
+  address: 270 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-7931
+  fax: 202-226-2052
 - classification: district
-  address: 19200 West Country Club Drive; Aventura, FL 33180
-  voice: 305-936-5724
-  fax: 305-932-9664
-  name: 'District Office #1'
+  address: 2600 Hollywood Blvd., Hollywood, FL 33020
+  voice: 954-845-1179
+  fax: 954-845-0396
 - classification: district
-  address: 777 Sawgrass Corporate Parkway; Sunrise, FL 33325
+  address: 777 Sawgrass Corporate Parkway, Sunrise, FL 33325
   voice: 954-845-1179
   fax: 954-845-0396
-  name: 'District Office #2'
 links:
 - url: https://wassermanschultz.house.gov
   note: website
+- url: https://wassermanschultz.house.gov/
+other_names:
+- name: D. Wasserman Schultz
+- name: Wasserman Schultz, D.
 ids:
   twitter: RepDWStweets
   youtube: UCfHQiJVvMlYbVAxrMSLdO4w
@@ -112,3 +114,9 @@ other_identifiers:
   identifier: kg:/m/04cmyw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Debbie_Wasserman_Schultz
+- url: https://en.wikipedia.org/wiki/Debbie_Wasserman_Schultz
+- url: https://justfacts.votesmart.org/candidate/24301/debbie-wasserman-schultz
+- url: https://theunitedstates.io
+- url: https://wassermanschultz.house.gov
+- url: https://www.govtrack.us/congress/members/debbie_wasserman_schultz/400623
diff --git a/data/us/legislature/Deborah-K-Ross-ea21df34-9ef4-5746-b83a-700bdc2d1918.yml b/data/us/legislature/Deborah-K-Ross-ea21df34-9ef4-5746-b83a-700bdc2d1918.yml
index 93901ab8d7..8c06d0a01f 100644
--- a/data/us/legislature/Deborah-K-Ross-ea21df34-9ef4-5746-b83a-700bdc2d1918.yml
+++ b/data/us/legislature/Deborah-K-Ross-ea21df34-9ef4-5746-b83a-700bdc2d1918.yml
@@ -1,33 +1,42 @@
 id: ocd-person/ea21df34-9ef4-5746-b83a-700bdc2d1918
-name: Deborah K. Ross
+name: Deborah Ross
 given_name: Deborah
 family_name: Ross
-middle_name: Koff
-gender: F
 birth_date: 1963-06-20
+gender: Female
+email: https://rossforms.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/R000305.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-2
 offices:
 - classification: capitol
-  address: 1221 Longworth House Office Building Washington DC 20515-3302
+  address: 1221 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3032
+  fax: 202-225-0181
+- classification: district
+  address: P.O. Box 1548 300 Fayetteville St., Raleigh, NC 27602
+  voice: 919-334-0840
+  fax: 919-828-1179
 links:
 - url: https://ross.house.gov
   note: website
+- url: https://ross.house.gov/
+other_names:
+- name: D. Ross
+- name: D.K. Ross
+- name: Deborah K. Ross
+- name: Ross, D.
 ids:
   twitter: RepDeborahRoss
 other_identifiers:
@@ -49,3 +58,11 @@ other_identifiers:
   identifier: Deborah Ross
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Deborah_Ross
+- url: https://deborahross.com/meet-deborah-ross
+- url: https://en.wikipedia.org/wiki/Deborah_K._Ross
+- url: https://justfacts.votesmart.org/candidate/biography/41560/deborah-ross
+- url: https://ross.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/deborah_ross/456831
+- url: https://www.linkedin.com/in/deborah-ross-43b86955
diff --git a/data/us/legislature/Delia-C-Ramirez-34d76857-187b-5f62-a2d1-ddfcd13494cf.yml b/data/us/legislature/Delia-C-Ramirez-34d76857-187b-5f62-a2d1-ddfcd13494cf.yml
index ed32876b45..50f48be7c7 100644
--- a/data/us/legislature/Delia-C-Ramirez-34d76857-187b-5f62-a2d1-ddfcd13494cf.yml
+++ b/data/us/legislature/Delia-C-Ramirez-34d76857-187b-5f62-a2d1-ddfcd13494cf.yml
@@ -1,28 +1,38 @@
 id: ocd-person/34d76857-187b-5f62-a2d1-ddfcd13494cf
-name: Delia C. Ramirez
+name: Delia Ramirez
 given_name: Delia
 family_name: Ramirez
-middle_name: Catalina
-gender: F
 birth_date: 1983-06-02
+gender: Female
+email: https://ramirez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/R000617.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-3
 offices:
 - classification: capitol
-  address: 1523 Longworth House Office Building Washington DC 20515-1303
+  address: 1523 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5701
+- classification: district
+  address: 5624 W. Diversey Ave., Chicago, IL 60639
+  voice: 773-799-8219
+- classification: district
+  address: 946 N. Neltnor Blvd. Suite 104, West Chicago, IL 60185
+  voice: 630-520-9494
 links:
 - url: https://ramirez.house.gov
   note: website
+- url: https://ramirez.house.gov/
+other_names:
+- name: D. Ramirez
+- name: D.C. Ramirez
+- name: Delia C. Ramirez
+- name: Ramirez, D.
 other_identifiers:
 - scheme: bioguide
   identifier: R000617
@@ -42,3 +52,11 @@ other_identifiers:
   identifier: '177128'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Delia_Ramirez
+- url: https://en.wikipedia.org/wiki/Delia_Ramirez
+- url: https://justfacts.votesmart.org/candidate/biography/177128/delia-ramirez
+- url: https://ramirez.house.gov
+- url: https://ramirez.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.deliaforcongress.com/meet-delia
+- url: https://www.linkedin.com/in/delia-catalina-ramirez-ab91bb70
diff --git a/data/us/legislature/Derek-Kilmer-0a7f80ad-caf7-5d0b-b50b-441764153649.yml b/data/us/legislature/Derek-Kilmer-0a7f80ad-caf7-5d0b-b50b-441764153649.yml
index e10d113707..c1208b4712 100644
--- a/data/us/legislature/Derek-Kilmer-0a7f80ad-caf7-5d0b-b50b-441764153649.yml
+++ b/data/us/legislature/Derek-Kilmer-0a7f80ad-caf7-5d0b-b50b-441764153649.yml
@@ -2,63 +2,64 @@ id: ocd-person/0a7f80ad-caf7-5d0b-b50b-441764153649
 name: Derek Kilmer
 given_name: Derek
 family_name: Kilmer
-gender: M
 birth_date: 1974-01-01
+gender: Male
+email: https://kilmer.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/K000381.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-6
 offices:
 - classification: capitol
-  address: 1226 Longworth House Office Building Washington DC 20515-4706
+  address: 1226 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5916
 - classification: district
-  address: 345 6th St. Suite 500; Bremerton, WA 98337
-  voice: 360-373-9725
-  name: 'District Office #1'
-- classification: district
-  address: 332 E. 5th St.; Port Angeles, WA 98362
+  address: 332 E. 5th St., Port Angeles, WA 98362
   voice: 360-797-3623
-  name: 'District Office #2'
 - classification: district
-  address: 950 Pacific Ave. Suite 1230; Tacoma, WA 98402
+  address: 345 6th St. Suite 500, Bremerton, WA 98337
+  voice: 360-373-9725
+- classification: district
+  address: 950 Pacific Ave. Suite 1230, Tacoma, WA 98402
   voice: 253-272-3515
-  name: 'District Office #3'
 links:
 - url: https://kilmer.house.gov
   note: website
+- url: https://kilmer.house.gov/
+other_names:
+- name: D. Kilmer
+- name: D.C. Kilmer
+- name: Kilmer, D.
 ids:
   twitter: RepDerekKilmer
   facebook: derek.kilmer
@@ -91,3 +92,9 @@ other_identifiers:
   identifier: kg:/m/03w9yd6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Derek_Kilmer
+- url: https://en.wikipedia.org/wiki/Derek_Kilmer
+- url: https://kilmer.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/derek_kilmer/412583
+- url: https://www.linkedin.com/in/derek-kilmer-646a115
diff --git a/data/us/legislature/Derrick-Van-Orden-b96b406a-d60a-57fe-96d1-c1dd5b189ab1.yml b/data/us/legislature/Derrick-Van-Orden-b96b406a-d60a-57fe-96d1-c1dd5b189ab1.yml
index bf070e42e0..74cf17937c 100644
--- a/data/us/legislature/Derrick-Van-Orden-b96b406a-d60a-57fe-96d1-c1dd5b189ab1.yml
+++ b/data/us/legislature/Derrick-Van-Orden-b96b406a-d60a-57fe-96d1-c1dd5b189ab1.yml
@@ -2,27 +2,36 @@ id: ocd-person/b96b406a-d60a-57fe-96d1-c1dd5b189ab1
 name: Derrick Van Orden
 given_name: Derrick
 family_name: Van Orden
-middle_name: Francis
-gender: M
 birth_date: 1969-09-15
+gender: Male
+email: https://vanorden.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/V000135.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-3
 offices:
 - classification: capitol
-  address: 1513 Longworth House Office Building Washington DC 20515-4903
+  address: 1513 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5506
+- classification: district
+  address: 210 7th St. South Suite 204, La Crosse, WI 54601
+  voice: 608-782-2558
+- classification: district
+  address: 404 S. Barstow St. Suite 2, Eau Claire, WI 54701
+  voice: 715-831-9214
 links:
 - url: https://vanorden.house.gov
   note: website
+- url: https://vanorden.house.gov/
+other_names:
+- name: D. Van Orden
+- name: D.F. Van Orden
+- name: Van Orden, D.
 ids:
   twitter: RepVanOrden
 other_identifiers:
@@ -46,3 +55,11 @@ other_identifiers:
   identifier: '192343'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Derrick_Van_Orden
+- url: https://en.wikipedia.org/wiki/Derrick_Van_Orden
+- url: https://justfacts.votesmart.org/candidate/192343/derrick-van-orden
+- url: https://justfacts.votesmart.org/candidate/biography/192343/derrick-van-orden
+- url: https://theunitedstates.io
+- url: https://vanorden.house.gov
+- url: https://www.govtrack.us/congress/members/derrick_van_orden/456950
+- url: https://www.linkedin.com/in/derrick-van-orden-1a637a105
diff --git a/data/us/legislature/Diana-DeGette-241df76f-7089-5821-ab7f-bb54d92ee9d7.yml b/data/us/legislature/Diana-DeGette-241df76f-7089-5821-ab7f-bb54d92ee9d7.yml
index 136feb9e23..ac61281e6b 100644
--- a/data/us/legislature/Diana-DeGette-241df76f-7089-5821-ab7f-bb54d92ee9d7.yml
+++ b/data/us/legislature/Diana-DeGette-241df76f-7089-5821-ab7f-bb54d92ee9d7.yml
@@ -2,97 +2,100 @@ id: ocd-person/241df76f-7089-5821-ab7f-bb54d92ee9d7
 name: Diana DeGette
 given_name: Diana
 family_name: DeGette
-middle_name: L.
-gender: F
 birth_date: 1957-07-29
+gender: Female
+email: https://degette.house.gov/address_authentication?form=/contact/send-me-an-email/email-me
 image: https://theunitedstates.io/images/congress/450x550/D000197.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-1
 offices:
 - classification: capitol
-  address: 2111 Rayburn House Office Building Washington DC 20515-0601
+  address: 2111 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4431
+  fax: 202-225-5657
 - classification: district
-  address: 600 Grant St. Suite 202; Denver, CO 80203
+  address: 600 Grant St. Suite 850, Denver, CO 80203
   voice: 303-844-4988
   fax: 303-844-4996
-  name: 'District Office #1'
 links:
 - url: https://degette.house.gov
   note: website
+- url: https://degette.house.gov/
+other_names:
+- name: D. DeGette
+- name: D.L. DeGette
+- name: DeGette, D.
 ids:
   twitter: RepDianaDeGette
   youtube: UCWFQCRTHwsHg9P1Hf-EQtew
@@ -128,3 +131,11 @@ other_identifiers:
   identifier: kg:/m/024z95
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Diana_DeGette
+- url: https://degette.com/about-diana
+- url: https://degette.house.gov
+- url: https://degette.house.gov/biography
+- url: https://en.wikipedia.org/wiki/Diana_DeGette
+- url: https://justfacts.votesmart.org/candidate/biography/561/diana-degette
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/diana_degette/400101
diff --git a/data/us/legislature/Diana-Harshbarger-b090c59e-4d88-5d35-99ba-ec3798f88978.yml b/data/us/legislature/Diana-Harshbarger-b090c59e-4d88-5d35-99ba-ec3798f88978.yml
index 419f2730c9..a492eab032 100644
--- a/data/us/legislature/Diana-Harshbarger-b090c59e-4d88-5d35-99ba-ec3798f88978.yml
+++ b/data/us/legislature/Diana-Harshbarger-b090c59e-4d88-5d35-99ba-ec3798f88978.yml
@@ -2,31 +2,43 @@ id: ocd-person/b090c59e-4d88-5d35-99ba-ec3798f88978
 name: Diana Harshbarger
 given_name: Diana
 family_name: Harshbarger
-gender: F
 birth_date: 1960-01-01
+gender: Female
+email: https://harshbarger.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001086.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-1
 offices:
 - classification: capitol
-  address: 167 Cannon House Office Building Washington DC 20515-4201
+  address: 167 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6356
+- classification: district
+  address: 1501 E. Morris Blvd. Suite 12, Morristown, TN 37813
+  voice: 423-254-1400
+  fax: 423-254-1403
+- classification: district
+  address: 205 Revere St., Kingsport, TN 37660
+  voice: 423-398-5186
+  fax: 423-398-5312
 links:
 - url: https://harshbarger.house.gov
   note: website
+- url: https://harshbarger.house.gov/
+other_names:
+- name: D. Harshbarger
+- name: D.L. Harshbarger
+- name: Harshbarger, D.
 ids:
   twitter: RepHarshbarger
 other_identifiers:
@@ -46,3 +58,11 @@ other_identifiers:
   identifier: kg:/g/11f67z977k
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Diana_Harshbarger
+- url: https://en.wikipedia.org/wiki/Diana_Harshbarger
+- url: https://harshbarger.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/190524/diana-harshbarger
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/diana_harshbarger/456844
+- url: https://www.linkedin.com/in/diana-harshbarger-40386763
+- url: https://www.linkedin.com/in/harshbarger-diana-b167b327
diff --git a/data/us/legislature/Dina-Titus-51152aac-2c93-5445-99ed-026df5b6ad37.yml b/data/us/legislature/Dina-Titus-51152aac-2c93-5445-99ed-026df5b6ad37.yml
index a784cc598f..27a5868fad 100644
--- a/data/us/legislature/Dina-Titus-51152aac-2c93-5445-99ed-026df5b6ad37.yml
+++ b/data/us/legislature/Dina-Titus-51152aac-2c93-5445-99ed-026df5b6ad37.yml
@@ -2,61 +2,65 @@ id: ocd-person/51152aac-2c93-5445-99ed-026df5b6ad37
 name: Dina Titus
 given_name: Dina
 family_name: Titus
-gender: F
 birth_date: 1950-05-23
+gender: Female
+email: https://titus.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/T000468.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NV-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: NV-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NV-1
+  district: NV-3
 offices:
 - classification: capitol
-  address: 2464 Rayburn House Office Building Washington DC 20515-2801
+  address: 2464 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5965
+  fax: 202-225-3119
 - classification: district
-  address: 495 South Main St. 3rd Floor; Las Vegas, NV 89101
+  address: 495 S. Main St., 3rd Floor, Las Vegas, NV 89101
   voice: 702-220-9823
   fax: 702-220-9841
-  name: 'District Office #1'
 links:
 - url: https://titus.house.gov
   note: website
+- url: https://titus.house.gov/
+other_names:
+- name: A.C. Titus
+- name: D. Titus
+- name: Titus, D.
 ids:
   twitter: RepDinaTitus
   youtube: UC_US4jNqECuMSNrB7yVCbbw
@@ -92,3 +96,10 @@ other_identifiers:
   identifier: kg:/m/07hwl2
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dina_Titus
+- url: https://en.wikipedia.org/wiki/Dina_Titus
+- url: https://justfacts.votesmart.org/candidate/biography/2629/dina-titus
+- url: https://theunitedstates.io
+- url: https://titus.house.gov
+- url: https://titus.house.gov/about/about-dina-titus.htm
+- url: https://www.govtrack.us/congress/members/dina_titus/412318
diff --git a/data/us/legislature/Don-Bacon-d409840c-63c1-53e4-9ff6-e5677cef9fe6.yml b/data/us/legislature/Don-Bacon-d409840c-63c1-53e4-9ff6-e5677cef9fe6.yml
index f2d6da6b37..c0d55dc705 100644
--- a/data/us/legislature/Don-Bacon-d409840c-63c1-53e4-9ff6-e5677cef9fe6.yml
+++ b/data/us/legislature/Don-Bacon-d409840c-63c1-53e4-9ff6-e5677cef9fe6.yml
@@ -2,46 +2,52 @@ id: ocd-person/d409840c-63c1-53e4-9ff6-e5677cef9fe6
 name: Don Bacon
 given_name: Don
 family_name: Bacon
-gender: M
 birth_date: 1963-08-16
+gender: Male
+email: https://bacon.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001298.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-2
 offices:
 - classification: capitol
-  address: 2104 Rayburn House Office Building Washington DC 20515-2702
+  address: 2104 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4155
 - classification: district
-  address: 13906 Gold Circle Suite 101; Omaha, NE 68144
+  address: 13906 Gold Circle Suite 101, Omaha, NE 68144
   voice: 402-938-0300
   fax: 402-763-4947
-  name: 'District Office #1'
+- classification: district
+  address: 543 N. Linden St., Wahoo, NE 68066
+  voice: 402-607-0077
 links:
 - url: https://bacon.house.gov
   note: website
+- url: https://bacon.house.gov/
+other_names:
+- name: Bacon, D.
+- name: D. Bacon
+- name: D.J. Bacon
 ids:
   twitter: RepDonBacon
   youtube: UCR9abI1lZzAZ6HwQXc-dLFQ
@@ -73,3 +79,10 @@ other_identifiers:
   identifier: Don Bacon
 sources:
 - url: https://theunitedstates.io/
+- url: https://bacon.house.gov
+- url: https://ballotpedia.org/Don_Bacon
+- url: https://en.wikipedia.org/wiki/Don_Bacon
+- url: https://justfacts.votesmart.org/candidate/biography/166299/donald-bacon
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/don_bacon/412713
+- url: https://www.linkedin.com/in/donbacon
diff --git a/data/us/legislature/Donald-G-Davis-33867761-33c6-5036-b3da-43fb485b65c9.yml b/data/us/legislature/Donald-G-Davis-33867761-33c6-5036-b3da-43fb485b65c9.yml
index c1abd80535..c0408b464f 100644
--- a/data/us/legislature/Donald-G-Davis-33867761-33c6-5036-b3da-43fb485b65c9.yml
+++ b/data/us/legislature/Donald-G-Davis-33867761-33c6-5036-b3da-43fb485b65c9.yml
@@ -1,30 +1,36 @@
 id: ocd-person/33867761-33c6-5036-b3da-43fb485b65c9
-name: Donald G. Davis
-given_name: Donald
+name: Don Davis
+given_name: Don
 family_name: Davis
-middle_name: Gene
-gender: M
 birth_date: 1971-08-29
+gender: Male
+email: https://dondavis.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/D000230.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-1
 offices:
 - classification: capitol
-  address: 1123 Longworth House Office Building Washington DC 20515-3301
+  address: 1123 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3101
+- classification: district
+  address: 1710 E. Arlington Blvd. Suite A, Greenville, NC 27858
+  voice: 252-999-7600
 links:
 - url: https://dondavis.house.gov
   note: website
+- url: https://dondavis.house.gov/
 other_names:
+- name: D. Davis
+- name: D.G. Davis
 - name: Davis (NC)
+- name: Davis, D.
+- name: Donald G. Davis
 other_identifiers:
 - scheme: bioguide
   identifier: D000230
@@ -42,3 +48,10 @@ other_identifiers:
   identifier: '102950'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Donald_Davis
+- url: https://dondavis.house.gov
+- url: https://en.wikipedia.org/wiki/Donald_G._Davis
+- url: https://justfacts.votesmart.org/candidate/biography/102950/don-davis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/donald_davis/456912
+- url: https://www.linkedin.com/in/votedondavis
diff --git a/data/us/legislature/Donald-Norcross-b0e4bf70-7945-5f39-bb1b-f993a59367b4.yml b/data/us/legislature/Donald-Norcross-b0e4bf70-7945-5f39-bb1b-f993a59367b4.yml
index 59908a0e92..85e60771c0 100644
--- a/data/us/legislature/Donald-Norcross-b0e4bf70-7945-5f39-bb1b-f993a59367b4.yml
+++ b/data/us/legislature/Donald-Norcross-b0e4bf70-7945-5f39-bb1b-f993a59367b4.yml
@@ -2,57 +2,64 @@ id: ocd-person/b0e4bf70-7945-5f39-bb1b-f993a59367b4
 name: Donald Norcross
 given_name: Donald
 family_name: Norcross
-middle_name: W.
-gender: M
 birth_date: 1958-12-13
+gender: Male
+email: https://norcross.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/N000188.jpg
 party:
-- start_date: '2014-11-12'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2014-11-12'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2014-11-12
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-1
 offices:
 - classification: capitol
-  address: 2427 Rayburn House Office Building Washington DC 20515-3001
+  address: 2427 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6501
+  fax: 202-225-6583
 - classification: district
-  address: 10 Melrose Ave. Suite 210; Cherry Hill, NJ 08003
+  address: 10 Melrose Ave. Suite 210, Cherry Hill, NJ 08003
   voice: 856-427-7000
-  fax: 856-427-4109
-  name: 'District Office #1'
+  fax: 856-427-7000
+- classification: district
+  address: 200 Federal St. 5th Floor, Camden, NJ 08103
+  voice: 856-427-7000
+  fax: 856-427-7000
 links:
 - url: https://norcross.house.gov
   note: website
+- url: https://norcross.house.gov/
+other_names:
+- name: D. Norcross
+- name: D.W. Norcross
+- name: Norcross, D.
 ids:
   twitter: DonaldNorcross
   youtube: UC7kXK_PyDiOT8YrdP0jYZHw
@@ -88,3 +95,11 @@ other_identifiers:
   identifier: '21536'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Donald_Norcross
+- url: https://en.wikipedia.org/wiki/Donald_Norcross
+- url: https://justfacts.votesmart.org/candidate/biography/116277/donald-norcross
+- url: https://norcross.house.gov
+- url: https://norcross.house.gov/full-biography
+- url: https://theunitedstates.io
+- url: https://www.donaldnorcrossforcongress.com/about
+- url: https://www.govtrack.us/congress/members/donald_norcross/412606
diff --git a/data/us/legislature/Donald-S-Beyer-Jr-63d110f3-ccdb-5783-9d6a-4a7103f30c01.yml b/data/us/legislature/Donald-S-Beyer-Jr-63d110f3-ccdb-5783-9d6a-4a7103f30c01.yml
index 384dcc969b..58d1a73af5 100644
--- a/data/us/legislature/Donald-S-Beyer-Jr-63d110f3-ccdb-5783-9d6a-4a7103f30c01.yml
+++ b/data/us/legislature/Donald-S-Beyer-Jr-63d110f3-ccdb-5783-9d6a-4a7103f30c01.yml
@@ -1,59 +1,62 @@
 id: ocd-person/63d110f3-ccdb-5783-9d6a-4a7103f30c01
-name: Donald S. Beyer, Jr.
-given_name: Donald
+name: Don Beyer
+given_name: Don
 family_name: Beyer
-middle_name: S.
-gender: M
 birth_date: 1950-06-20
+gender: Male
+email: https://beyer.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001292.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-8
 offices:
 - classification: capitol
-  address: 1119 Longworth House Office Building Washington DC 20515-4608
+  address: 1119 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4376
+  fax: 202-225-0017
 - classification: district
-  address: 1901 N Moore St Suite 1108; Arlington, VA 22209-1728
+  address: 1901 N. Fort Myer Drive Suite 900, Arlington, VA 22209
   voice: 703-658-5403
   fax: 703-658-5408
-  name: 'District Office #1'
 links:
 - url: https://beyer.house.gov
   note: website
+- url: https://beyer.house.gov/
+other_names:
+- name: Beyer, D.
+- name: D. Beyer
+- name: D.S. Beyer
+- name: Donald S. Beyer
+- name: Donald S. Beyer, Jr.
 ids:
   twitter: RepDonBeyer
   youtube: UCPJGVbOVcAVGiBwq8qr_T9w
   facebook: RepDonBeyer
-other_names:
-- name: Donald S. Beyer
 other_identifiers:
 - scheme: bioguide
   identifier: B001292
@@ -83,3 +86,10 @@ other_identifiers:
   identifier: Don Beyer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Don_Beyer
+- url: https://beyer.house.gov
+- url: https://en.wikipedia.org/wiki/Don_Beyer
+- url: https://justfacts.votesmart.org/candidate/1707/don-beyer-jr
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/donald_beyer/412657
+- url: https://www.linkedin.com/in/don-beyer-6b444b4
diff --git a/data/us/legislature/Doris-O-Matsui-5262c34c-a015-5290-9ca4-3b6ec86f4b1d.yml b/data/us/legislature/Doris-O-Matsui-5262c34c-a015-5290-9ca4-3b6ec86f4b1d.yml
index 1a5b7738ab..71eade5a43 100644
--- a/data/us/legislature/Doris-O-Matsui-5262c34c-a015-5290-9ca4-3b6ec86f4b1d.yml
+++ b/data/us/legislature/Doris-O-Matsui-5262c34c-a015-5290-9ca4-3b6ec86f4b1d.yml
@@ -1,78 +1,82 @@
 id: ocd-person/5262c34c-a015-5290-9ca4-3b6ec86f4b1d
-name: Doris O. Matsui
+name: Doris Matsui
 given_name: Doris
 family_name: Matsui
-middle_name: O.
-gender: F
 birth_date: 1944-09-25
+gender: Female
+email: https://matsuiforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001163.jpg
 party:
-- start_date: '2005-03-10'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-03-10'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-7
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-6
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-6
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-6
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-5
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-5
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-5
+- start_date: 2005-03-10
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-7
+  district: CA-5
 offices:
 - classification: capitol
-  address: 2311 Rayburn House Office Building Washington DC 20515-0507
+  address: 2311 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-7163
+  fax: 202-225-0566
 - classification: district
-  address: 501 I St. Suite 12-600; Sacramento, CA 95814
+  address: Robert T. Matsui U.S. Courthouse 501 I St., Suite 12-600, Sacramento, CA
+    95814
   voice: 916-498-5600
-  fax: 916-444-6117
-  name: 'District Office #1'
 links:
 - url: https://matsui.house.gov
   note: website
+- url: https://matsui.house.gov/
+other_names:
+- name: D. Matsui
+- name: D.O. Matsui
+- name: Doris O. Matsui
+- name: Matsui, D.
 ids:
   twitter: DorisMatsui
   youtube: UCSqqxVkvskHq3cY2MCbTZsw
@@ -108,3 +112,12 @@ other_identifiers:
   identifier: Doris Matsui
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Doris_Matsui
+- url: https://en.wikipedia.org/wiki/Doris_Matsui
+- url: https://justfacts.votesmart.org/candidate/biography/28593/doris-matsui
+- url: https://matsui.house.gov
+- url: https://matsui.house.gov/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/doris_matsui/400663
+- url: https://www.linkedin.com/in/dorismatsui
+- url: https://www.matsuiforcongress.com/about-doris
diff --git a/data/us/legislature/Doug-LaMalfa-4e34a7cb-7c10-5e5d-8086-a33ef00207bd.yml b/data/us/legislature/Doug-LaMalfa-4e34a7cb-7c10-5e5d-8086-a33ef00207bd.yml
index fe9ff7578d..8b15e74c00 100644
--- a/data/us/legislature/Doug-LaMalfa-4e34a7cb-7c10-5e5d-8086-a33ef00207bd.yml
+++ b/data/us/legislature/Doug-LaMalfa-4e34a7cb-7c10-5e5d-8086-a33ef00207bd.yml
@@ -2,63 +2,64 @@ id: ocd-person/4e34a7cb-7c10-5e5d-8086-a33ef00207bd
 name: Doug LaMalfa
 given_name: Doug
 family_name: LaMalfa
-gender: M
 birth_date: 1960-07-02
+gender: Male
+email: https://lamalfa.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000578.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
 offices:
 - classification: capitol
-  address: 408 Cannon House Office Building Washington DC 20515-0501
+  address: 408 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3076
 - classification: district
-  address: 2399 Rickenbacker Way; Auburn, CA 95602
-  voice: 530-878-5035
-  name: 'District Office #1'
-- classification: district
-  address: 120 Independence Cir B; Chico, CA 95973-4925
+  address: 120 Independence Circle Suite B, Chico, CA 95973
   voice: 530-343-1000
-  name: 'District Office #2'
 - classification: district
-  address: 2885 Churn Creek Rd. Suite C; Redding, CA 96002
+  address: 1585 Butte House Road Suite D, Yuba City, CA 95993
+  voice: 530-645-6225
+- classification: district
+  address: 2885 Churn Creek Road Suite C, Redding, CA 96002
   voice: 530-223-5898
-  name: 'District Office #3'
 links:
 - url: https://lamalfa.house.gov
   note: website
+- url: https://lamalfa.house.gov/
+other_names:
+- name: D. LaMalfa
+- name: D.L. LaMalfa
+- name: LaMalfa, D.
 ids:
   twitter: RepLaMalfa
   youtube: UCUzz1XDn862fxirervSB2Yw
@@ -94,3 +95,12 @@ other_identifiers:
   identifier: kg:/m/0288tnx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Doug_La_Malfa
+- url: https://douglamalfa.com/about
+- url: https://en.wikipedia.org/wiki/Doug_LaMalfa
+- url: https://justfacts.votesmart.org/candidate/biography/29713/doug-lamalfa
+- url: https://lamalfa.house.gov
+- url: https://lamalfa.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/doug_lamalfa/412510
+- url: https://www.linkedin.com/in/lamalfa-doug-4b032bb
diff --git a/data/us/legislature/Doug-Lamborn-c4154717-8bdf-5a5e-ac05-24c35f195a78.yml b/data/us/legislature/Doug-Lamborn-c4154717-8bdf-5a5e-ac05-24c35f195a78.yml
index 80316b057b..49c9367116 100644
--- a/data/us/legislature/Doug-Lamborn-c4154717-8bdf-5a5e-ac05-24c35f195a78.yml
+++ b/data/us/legislature/Doug-Lamborn-c4154717-8bdf-5a5e-ac05-24c35f195a78.yml
@@ -2,76 +2,75 @@ id: ocd-person/c4154717-8bdf-5a5e-ac05-24c35f195a78
 name: Doug Lamborn
 given_name: Doug
 family_name: Lamborn
-gender: M
 birth_date: 1954-05-24
+gender: Male
+email: https://lamborn.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000564.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-5
 offices:
 - classification: capitol
-  address: 2371 Rayburn House Office Building Washington DC 20515-0605
+  address: 2371 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4422
+  fax: 202-226-2638
 - classification: district
-  address: 1125 Kelly Johnson Blvd. Suite 330; Colorado Springs, CO 80920
+  address: 1125 Kelly Johnson Blvd. Suite 330, Colorado Springs, CO 80920
   voice: 719-520-0055
   fax: 719-520-0840
-  name: 'District Office #1'
-- classification: district
-  address: 415 Main St.; Buena Vista, CO 81211
-  voice: 719-520-0055
-  fax: 719-520-0840
-  name: 'District Office #2'
 links:
 - url: https://lamborn.house.gov
   note: website
+- url: https://lamborn.house.gov/
+other_names:
+- name: D. Lamborn
+- name: D.L. Lamborn
+- name: Lamborn, D.
 ids:
   twitter: RepDLamborn
   youtube: UCaYsGYMniq4nwBBMKFIwsow
@@ -107,3 +106,10 @@ other_identifiers:
   identifier: kg:/m/0fsgdd
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Doug_Lamborn
+- url: https://en.wikipedia.org/wiki/Doug_Lamborn
+- url: https://justfacts.votesmart.org/candidate/2698/doug-lamborn
+- url: https://lamborn.house.gov
+- url: https://lamborn.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/doug_lamborn/412191
diff --git a/data/us/legislature/Dusty-Johnson-1bc146c5-42d6-5bf7-a862-34747a4b8ed7.yml b/data/us/legislature/Dusty-Johnson-1bc146c5-42d6-5bf7-a862-34747a4b8ed7.yml
index ee8dc3eebc..9eb92860b4 100644
--- a/data/us/legislature/Dusty-Johnson-1bc146c5-42d6-5bf7-a862-34747a4b8ed7.yml
+++ b/data/us/legislature/Dusty-Johnson-1bc146c5-42d6-5bf7-a862-34747a4b8ed7.yml
@@ -2,53 +2,52 @@ id: ocd-person/1bc146c5-42d6-5bf7-a862-34747a4b8ed7
 name: Dusty Johnson
 given_name: Dusty
 family_name: Johnson
-gender: M
 birth_date: 1976-09-30
+gender: Male
+email: https://dustyjohnson.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/J000301.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SD-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SD-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SD-AL
 offices:
 - classification: capitol
-  address: 1714 Longworth House Office Building Washington DC 20515-4100
+  address: 1714 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2801
 - classification: district
-  address: 304 6th Ave SE; Aberdeen, SD 57401-6102
+  address: 115 4th Ave. SE Suite 107A, Aberdeen, SD 57401
   voice: 605-622-1060
-  fax: 605-262-0150
-  name: 'District Office #1'
 - classification: district
-  address: 2525 W Main St Suite 310; Rapid City, SD 57702-0901
-  voice: 605-646-6454
-  name: 'District Office #2'
-- classification: district
-  address: 300 N Dakota Ave Suite 314; Sioux Falls, SD 57104-6037
+  address: 230 S. Philips Ave. Suite 307, Sioux Falls, SD 57104
   voice: 605-275-2868
-  name: 'District Office #3'
+- classification: district
+  address: 2525 W. Main St. Suite 310, Rapid City, SD 57702
+  voice: 605-646-6454
 links:
 - url: https://dustyjohnson.house.gov
   note: website
-ids:
-  twitter: RepDustyJohnson
+- url: https://dustyjohnson.house.gov/
 other_names:
+- name: D. Johnson
+- name: D.M. Johnson
 - name: Johnson (SD)
+- name: Johnson, D.
+ids:
+  twitter: RepDustyJohnson
 other_identifiers:
 - scheme: bioguide
   identifier: J000301
@@ -72,3 +71,9 @@ other_identifiers:
   identifier: kg:/g/11dyzlcnbr
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dusty_Johnson
+- url: https://dustyjohnson.house.gov
+- url: https://en.wikipedia.org/wiki/Dusty_Johnson
+- url: https://justfacts.votesmart.org/candidate/biography/48307/dusty-johnson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/dusty_johnson/412816
diff --git a/data/us/legislature/Dwight-Evans-c9d5abc5-4c4a-5ff5-a132-8885eb020e6e.yml b/data/us/legislature/Dwight-Evans-c9d5abc5-4c4a-5ff5-a132-8885eb020e6e.yml
index 7ca24fcfbb..d8cbf63f87 100644
--- a/data/us/legislature/Dwight-Evans-c9d5abc5-4c4a-5ff5-a132-8885eb020e6e.yml
+++ b/data/us/legislature/Dwight-Evans-c9d5abc5-4c4a-5ff5-a132-8885eb020e6e.yml
@@ -2,51 +2,59 @@ id: ocd-person/c9d5abc5-4c4a-5ff5-a132-8885eb020e6e
 name: Dwight Evans
 given_name: Dwight
 family_name: Evans
-gender: M
 birth_date: 1954-05-16
+gender: Male
+email: https://evans.house.gov/zip_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/E000296.jpg
 party:
-- start_date: '2016-11-14'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2016-11-14'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: PA-3
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-3
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-2
+- start_date: 2016-11-14
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-3
+  district: PA-2
 offices:
 - classification: capitol
-  address: 1105 Longworth House Office Building Washington DC 20515-3803
+  address: 1105 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4001
+  fax: 202-225-5392
 - classification: district
-  address: 7174 Ogontz Ave.; Philadelphia, PA 19138
+  address: 1310 Point Breeze Ave., Philadelphia, PA 19146
+  voice: 215-254-3400
+  fax: 771-200-5094
+- classification: district
+  address: 7174 Ogontz Ave., Philadelphia, PA 19138
   voice: 215-276-0340
-  fax: 215-276-2939
-  name: 'District Office #1'
+  fax: 771-200-5094
 links:
 - url: https://evans.house.gov
   note: website
+- url: https://evans.house.gov/
+other_names:
+- name: D. Evans
+- name: D.E. Evans
+- name: Evans, D.
 ids:
   twitter: RepDwightEvans
   facebook: RepDwightEvans
@@ -77,3 +85,11 @@ other_identifiers:
   identifier: '21566'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dwight_Evans
+- url: https://en.wikipedia.org/wiki/Dwight_E._Evans
+- url: https://evans.house.gov
+- url: https://evans.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/biography/9128/dwight-evans
+- url: https://theunitedstates.io
+- url: https://www.dwightevans.com/meet-dwight
+- url: https://www.govtrack.us/congress/members/dwight_evans/412677
diff --git a/data/us/legislature/Earl-Blumenauer-acd197d4-7996-5b4c-b01d-a61702d99385.yml b/data/us/legislature/Earl-Blumenauer-acd197d4-7996-5b4c-b01d-a61702d99385.yml
index b4f8a3af85..5999dcb5e7 100644
--- a/data/us/legislature/Earl-Blumenauer-acd197d4-7996-5b4c-b01d-a61702d99385.yml
+++ b/data/us/legislature/Earl-Blumenauer-acd197d4-7996-5b4c-b01d-a61702d99385.yml
@@ -2,101 +2,104 @@ id: ocd-person/acd197d4-7996-5b4c-b01d-a61702d99385
 name: Earl Blumenauer
 given_name: Earl
 family_name: Blumenauer
-gender: M
 birth_date: 1948-08-16
+gender: Male
+email: https://blumenauerforms.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/B000574.jpg
 party:
-- start_date: '1996-05-21'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1996-05-21'
-  end_date: '1997-01-03'
+- start_date: 1996-05-21
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1996-05-21
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
 offices:
 - classification: capitol
-  address: 1111 Longworth House Office Building Washington DC 20515-3703
+  address: 1111 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4811
+  fax: 202-225-8941
 - classification: district
-  address: 911 N.E. 11th Ave. Suite 200; Portland, OR 97232
+  address: 911 NE 11th Ave. Suite 200, Portland, OR 97232
   voice: 503-231-2300
-  fax: 503-230-5413
-  name: 'District Office #1'
 links:
 - url: https://blumenauer.house.gov
   note: website
+- url: https://blumenauer.house.gov/
+other_names:
+- name: Blumenauer, E.
+- name: E. Blumenauer
+- name: E.F. Blumenauer
 ids:
   twitter: BlumenauerMedia
   youtube: UCuziVoKuGn7feNA5VrpxsBQ
@@ -131,3 +134,10 @@ other_identifiers:
   identifier: kg:/m/033tw8
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Earl_Blumenauer
+- url: https://blumenauer.house.gov
+- url: https://earlblumenauer.com/about
+- url: https://en.wikipedia.org/wiki/Earl_Blumenauer
+- url: https://justfacts.votesmart.org/candidate/367/earl-blumenauer
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/earl_blumenauer/400033
diff --git a/data/us/legislature/Earl-L-Buddy-Carter-85e43f57-4901-52fd-9fad-57373277f5e1.yml b/data/us/legislature/Earl-L-Buddy-Carter-85e43f57-4901-52fd-9fad-57373277f5e1.yml
index b3304ffe12..6452f993f6 100644
--- a/data/us/legislature/Earl-L-Buddy-Carter-85e43f57-4901-52fd-9fad-57373277f5e1.yml
+++ b/data/us/legislature/Earl-L-Buddy-Carter-85e43f57-4901-52fd-9fad-57373277f5e1.yml
@@ -1,64 +1,66 @@
 id: ocd-person/85e43f57-4901-52fd-9fad-57373277f5e1
-name: Earl L. "Buddy" Carter
-given_name: Earl
+name: Buddy Carter
+given_name: Buddy
 family_name: Carter
-middle_name: L.
-gender: M
 birth_date: 1957-09-06
+gender: Male
+email: https://buddycarter.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001103.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-1
 offices:
 - classification: capitol
-  address: 2432 Rayburn House Office Building Washington DC 20515-1001
+  address: 2432 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5831
+  fax: 202-226-2269
 - classification: district
-  address: 1510 Newcastle St. Suite 200; Brunswick, GA 31520
-  voice: 912-265-9010
-  fax: 912-265-9013
-  name: 'District Office #1'
-- classification: district
-  address: 6602 Abercorn St. Suite 105B; Savannah, GA 31405
+  address: 6602 Abercorn St. Suite 105B, Savannah, GA 31405
   voice: 912-352-0101
   fax: 912-352-0105
-  name: 'District Office #2'
+- classification: district
+  address: 777 Gloucester St. Suite 410, Brunswick, GA 31520
+  voice: 912-265-9010
+  fax: 912-265-9013
 links:
 - url: https://buddycarter.house.gov
   note: website
+- url: https://buddycarter.house.gov/
+other_names:
+- name: B. Carter
+- name: Carter (GA)
+- name: Carter, B.
+- name: E.L. Carter
+- name: Earl L. "Buddy" Carter
 ids:
   twitter: RepBuddyCarter
   youtube: UCHQm49T6ikD_ioMAt50AwKQ
   facebook: congressmanbuddycarter
-other_names:
-- name: Carter (GA)
 other_identifiers:
 - scheme: bioguide
   identifier: C001103
@@ -88,3 +90,10 @@ other_identifiers:
   identifier: Earl "Buddy" Carter
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Earl_%22Buddy%22_Carter
+- url: https://buddycarter.house.gov
+- url: https://en.wikipedia.org/wiki/Buddy_Carter
+- url: https://justfacts.votesmart.org/candidate/biography/32085/buddy-carter
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/earl_carter/412622
+- url: https://www.linkedin.com/in/buddycarterga
diff --git a/data/us/legislature/Ed-Case-20f1a4db-1281-5e3f-9d6d-657a3f178b3f.yml b/data/us/legislature/Ed-Case-20f1a4db-1281-5e3f-9d6d-657a3f178b3f.yml
index 390b05d880..0be342e772 100644
--- a/data/us/legislature/Ed-Case-20f1a4db-1281-5e3f-9d6d-657a3f178b3f.yml
+++ b/data/us/legislature/Ed-Case-20f1a4db-1281-5e3f-9d6d-657a3f178b3f.yml
@@ -2,50 +2,53 @@ id: ocd-person/20f1a4db-1281-5e3f-9d6d-657a3f178b3f
 name: Ed Case
 given_name: Ed
 family_name: Case
-gender: M
 birth_date: 1952-09-27
+gender: Male
+email: https://case.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001055.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: HI-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: HI-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: HI-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: HI-1
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: HI-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: HI-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: HI-2
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: HI-1
+  district: HI-2
 offices:
 - classification: capitol
-  address: 2210 Rayburn House Office Building Washington DC 20515-1101
+  address: 2210 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2726
 - classification: district
-  address: 1132 Bishop St Suite 1910; Honolulu, HI 96813-2807
+  address: 1003 Bishop St. Suite 1110, Honolulu, HI 96813
   voice: 808-650-6688
-  name: 'District Office #1'
 links:
 - url: https://case.house.gov
   note: website
+- url: https://case.house.gov/
+other_names:
+- name: Case, E.
+- name: E. Case
+- name: E.E. Case
 ids:
   twitter: RepEdCase
 other_identifiers:
@@ -73,3 +76,9 @@ other_identifiers:
   identifier: Ed Case
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ed_Case
+- url: https://case.house.gov
+- url: https://en.wikipedia.org/wiki/Ed_Case
+- url: https://justfacts.votesmart.org/candidate/biography/3422/ed-case
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ed_case/400069
diff --git a/data/us/legislature/Edward-J-Markey-bceb5ccd-31b0-5d03-894d-03cf2cbb2771.yml b/data/us/legislature/Edward-J-Markey-bceb5ccd-31b0-5d03-894d-03cf2cbb2771.yml
index b9a5c264e7..d41bea2708 100644
--- a/data/us/legislature/Edward-J-Markey-bceb5ccd-31b0-5d03-894d-03cf2cbb2771.yml
+++ b/data/us/legislature/Edward-J-Markey-bceb5ccd-31b0-5d03-894d-03cf2cbb2771.yml
@@ -1,159 +1,155 @@
 id: ocd-person/bceb5ccd-31b0-5d03-894d-03cf2cbb2771
-name: Edward J. Markey
-given_name: Edward
+name: Ed Markey
+given_name: Ed
 family_name: Markey
-middle_name: J.
-gender: M
 birth_date: 1946-07-11
+gender: Male
+email: https://www.markey.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M000133.jpg
 party:
-- start_date: '1975-01-14'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1975-01-14'
-  end_date: '1977-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Massachusetts
+- start_date: 2015-01-06
+  end_date: 2021-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Massachusetts
+- start_date: 2013-07-16
+  end_date: 2015-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Massachusetts
+- start_date: 2013-01-03
+  end_date: 2013-07-15
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-7
-- start_date: '1977-01-04'
-  end_date: '1979-01-03'
+  district: MA-5
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1979-01-15'
-  end_date: '1981-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1979-01-15
+  end_date: 1981-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1977-01-04
+  end_date: 1979-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-7
-- start_date: '2013-01-03'
-  end_date: '2013-07-15'
+- start_date: 1975-01-14
+  end_date: 1977-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-5
-- start_date: '2013-07-16'
-  end_date: '2015-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Massachusetts
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Massachusetts
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Massachusetts
+  district: MA-7
 offices:
 - classification: capitol
-  address: 255 Dirksen Senate Office Building Washington DC 20510
+  address: 1550 Main St. 4th Floor, Springfield, MA 01103
+  voice: 413-785-4610
+- classification: capitol
+  address: 255 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-2742
 - classification: district
-  address: 15 Sudbury St. 975; Boston, MA 02203
+  address: 975 John F. Kennedy Federal Building 15 New Sudbury St., Boston, MA 02203
   voice: 617-565-8519
-  fax: 617-248-3870
-  name: 'District Office #1'
-- classification: district
-  address: 222 Milliken Blvd. Suite 312; Fall River, MA 02721
-  voice: 508-677-0523
-  name: 'District Office #2'
-- classification: district
-  address: 1550 Main St. 4th Floor; Springfield, MA 01103
-  voice: 413-785-4610
-  name: 'District Office #3'
 links:
 - url: https://www.markey.senate.gov
   note: website
 - url: https://www.markey.senate.gov/contact
   note: contact form
+- url: https://www.markey.senate.gov/
+other_names:
+- name: E. Markey
+- name: E.J. Markey
+- name: Edward J. Markey
+- name: Markey (D-MA)
+- name: Markey, E.
 ids:
   twitter: SenMarkey
   youtube: UCT1ujew5yQy2uMhGrjiKHoA
   facebook: EdJMarkey
-other_names:
-- name: Markey (D-MA)
 other_identifiers:
 - scheme: bioguide
   identifier: M000133
@@ -189,3 +185,9 @@ other_identifiers:
   identifier: kg:/m/028vr4
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Edward_Markey
+- url: https://en.wikipedia.org/wiki/Ed_Markey
+- url: https://justfacts.votesmart.org/candidate/biography/26900/ed-markey
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/edward_markey/400253
+- url: https://www.markey.senate.gov
diff --git a/data/us/legislature/Eleanor-Holmes-Norton-709b6b03-c38f-540b-85f2-83c16f62d3bd.yml b/data/us/legislature/Eleanor-Holmes-Norton-709b6b03-c38f-540b-85f2-83c16f62d3bd.yml
index b43ecc751c..20131f29ea 100644
--- a/data/us/legislature/Eleanor-Holmes-Norton-709b6b03-c38f-540b-85f2-83c16f62d3bd.yml
+++ b/data/us/legislature/Eleanor-Holmes-Norton-709b6b03-c38f-540b-85f2-83c16f62d3bd.yml
@@ -1,118 +1,116 @@
 id: ocd-person/709b6b03-c38f-540b-85f2-83c16f62d3bd
 name: Eleanor Holmes Norton
-given_name: Eleanor
+given_name: Eleanor Holmes
 family_name: Norton
-middle_name: Holmes
-gender: F
 birth_date: 1937-06-13
+gender: Female
+email: https://norton.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/N000147.jpg
 party:
-- start_date: '1991-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DC-AL
 offices:
 - classification: capitol
-  address: 2136 Rayburn House Office Building Washington DC 20515-5101
+  address: 2136 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8050
+  fax: 202-225-3002
 - classification: district
-  address: 90 K St. NE Suite 100; Washington, DC 20002-4203
+  address: 1300 Pennsylvania Ave. NW Suite M-1000, Washington, DC 20004
   voice: 202-408-9041
   fax: 202-408-9048
-  name: 'District Office #1'
-- classification: district
-  address: 2235 Shannon Place SE Suite 2032-A; Washington, DC 20020
-  voice: 202-678-8900
-  fax: 202-678-8844
-  name: 'District Office #2'
 links:
 - url: https://norton.house.gov
   note: website
+- url: https://norton.house.gov/
+other_names:
+- name: E. Norton
+- name: E.H. Norton
+- name: Norton, E.
 ids:
   twitter: EleanorNorton
   youtube: UChRrAXUGylfxJjbquC6aUjQ
@@ -144,3 +142,10 @@ other_identifiers:
   identifier: kg:/m/01s_vp
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eleanor_Holmes_Norton
+- url: https://en.wikipedia.org/wiki/Eleanor_Holmes_Norton
+- url: https://justfacts.votesmart.org/candidate/775/eleanor-norton
+- url: https://norton.house.gov
+- url: https://norton.house.gov/about/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/eleanor_norton/400295
diff --git a/data/us/legislature/Elijah-Crane-e59ccc1e-b5f0-5b86-9b5b-a8fbf6038665.yml b/data/us/legislature/Elijah-Crane-e59ccc1e-b5f0-5b86-9b5b-a8fbf6038665.yml
index 192bd2e370..d7d210b00b 100644
--- a/data/us/legislature/Elijah-Crane-e59ccc1e-b5f0-5b86-9b5b-a8fbf6038665.yml
+++ b/data/us/legislature/Elijah-Crane-e59ccc1e-b5f0-5b86-9b5b-a8fbf6038665.yml
@@ -1,27 +1,38 @@
 id: ocd-person/e59ccc1e-b5f0-5b86-9b5b-a8fbf6038665
-name: Elijah Crane
+name: Eli Crane
 given_name: Eli
 family_name: Crane
-gender: M
 birth_date: 1980-01-03
+gender: Male
+email: https://crane.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001132.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-2
 offices:
 - classification: capitol
-  address: 1229 Longworth House Office Building Washington DC 20515-0302
+  address: 1229 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3361
+- classification: district
+  address: 122 N. Cortez St. Suite 211, Prescott, AZ 86301
+  voice: 928-286-5338
+- classification: district
+  address: 19955 N. Wilson Ave., Suite 300, Maricopa, AZ 85139
+  voice: 928-286-5338
 links:
 - url: https://crane.house.gov
   note: website
+- url: https://crane.house.gov/
+other_names:
+- name: Crane, E.
+- name: E. Crane
+- name: E.J. Crane
+- name: Elijah Crane
 ids:
   twitter: RepEliCrane
 other_identifiers:
@@ -43,3 +54,10 @@ other_identifiers:
   identifier: '205885'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eli_Crane
+- url: https://crane.house.gov
+- url: https://en.wikipedia.org/wiki/Eli_Crane
+- url: https://justfacts.votesmart.org/candidate/biography/205885/eli-crane
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/eli_crane/456879
+- url: https://www.linkedin.com/in/eli-crane-62607858
diff --git a/data/us/legislature/Elise-M-Stefanik-febd3b9d-501f-5191-aaff-87666a5af603.yml b/data/us/legislature/Elise-M-Stefanik-febd3b9d-501f-5191-aaff-87666a5af603.yml
index 71f64c059c..cf40e33694 100644
--- a/data/us/legislature/Elise-M-Stefanik-febd3b9d-501f-5191-aaff-87666a5af603.yml
+++ b/data/us/legislature/Elise-M-Stefanik-febd3b9d-501f-5191-aaff-87666a5af603.yml
@@ -1,63 +1,65 @@
 id: ocd-person/febd3b9d-501f-5191-aaff-87666a5af603
-name: Elise M. Stefanik
+name: Elise Stefanik
 given_name: Elise
 family_name: Stefanik
-middle_name: M.
-gender: F
 birth_date: 1984-07-02
+gender: Female
+email: https://stefanik.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001196.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-21
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-21
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-21
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-21
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-21
 offices:
 - classification: capitol
-  address: 2211 Rayburn House Office Building Washington DC 20515-3221
+  address: 2211 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4611
 - classification: district
-  address: 5 Warren St Suite 4; Glens Falls, NY 12801-4565
-  voice: 518-743-0964
-  fax: 518-743-1391
-  name: 'District Office #1'
+  address: 108 Court St., Herkimer, NY 13350
+  voice: 315-219-8005
 - classification: district
-  address: 23 Durkee St. Suite C; Plattsburgh, NY 12901
+  address: 137 Margaret St. Suite 100, Plattsburgh, NY 12901
   voice: 518-561-2324
   fax: 518-561-2408
-  name: 'District Office #2'
 - classification: district
-  address: 88 Public Sq. Suite A; Watertown, NY 13601
-  voice: 315-782-3150
-  fax: 315-782-1291
-  name: 'District Office #3'
+  address: 330 Ford St. Suite B8, Ogdensburg, NY 13669
+  voice: 315-541-2670
+- classification: district
+  address: 99 Troy Road Suite 312, East Greenbush, NY 12061
+  voice: 518-242-4707
 links:
 - url: https://stefanik.house.gov
   note: website
+- url: https://stefanik.house.gov/
+other_names:
+- name: E. Stefanik
+- name: E.M. Stefanik
+- name: Elise M. Stefanik
+- name: Stefanik, E.
 ids:
   twitter: RepStefanik
   youtube: UCHvf42C8Vw6QnjwO2L2ukKA
@@ -93,3 +95,9 @@ other_identifiers:
   identifier: Elise Stefanik
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Elise_Stefanik
+- url: https://en.wikipedia.org/wiki/Elise_Stefanik
+- url: https://justfacts.votesmart.org/candidate/biography/152539/elise-stefanik
+- url: https://stefanik.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/elise_stefanik/412648
diff --git a/data/us/legislature/Elissa-Slotkin-e7ebade8-8c17-50e0-ac00-70e0327b9071.yml b/data/us/legislature/Elissa-Slotkin-e7ebade8-8c17-50e0-ac00-70e0327b9071.yml
index 7e2e25a18f..ee75647bc9 100644
--- a/data/us/legislature/Elissa-Slotkin-e7ebade8-8c17-50e0-ac00-70e0327b9071.yml
+++ b/data/us/legislature/Elissa-Slotkin-e7ebade8-8c17-50e0-ac00-70e0327b9071.yml
@@ -2,40 +2,44 @@ id: ocd-person/e7ebade8-8c17-50e0-ac00-70e0327b9071
 name: Elissa Slotkin
 given_name: Elissa
 family_name: Slotkin
-gender: F
 birth_date: 1976-07-10
+gender: Female
+email: https://slotkin.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001208.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: MI-7
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-7
+  district: MI-8
 offices:
 - classification: capitol
-  address: 2245 Rayburn House Office Building Washington DC 20515-2207
+  address: 2245 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4872
 - classification: district
-  address: 1100 W Saginaw St 3a; Lansing, MI 48915-2033
+  address: 315 W. Allegan St. Suite 207, Lansing, MI 48933
   voice: 517-993-0510
-  name: 'District Office #1'
+  fax: 844-239-4485
 links:
 - url: https://slotkin.house.gov
   note: website
+- url: https://slotkin.house.gov/
+other_names:
+- name: E. Slotkin
+- name: E.B. Slotkin
+- name: Slotkin, E.
 ids:
   twitter: RepSlotkin
 other_identifiers:
@@ -61,3 +65,10 @@ other_identifiers:
   identifier: kg:/g/11dfr3z7r1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Elissa_Slotkin
+- url: https://en.wikipedia.org/wiki/Elissa_Slotkin
+- url: https://justfacts.votesmart.org/candidate/biography/181080/elissa-slotkin
+- url: https://slotkin.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/elissa_slotkin/412784
+- url: https://www.linkedin.com/in/elissa-slotkin-513554130
diff --git a/data/us/legislature/Elizabeth-Warren-3de20aaf-f982-5aa3-8280-c5154be829aa.yml b/data/us/legislature/Elizabeth-Warren-3de20aaf-f982-5aa3-8280-c5154be829aa.yml
index c38cfdefbb..399b09d6ef 100644
--- a/data/us/legislature/Elizabeth-Warren-3de20aaf-f982-5aa3-8280-c5154be829aa.yml
+++ b/data/us/legislature/Elizabeth-Warren-3de20aaf-f982-5aa3-8280-c5154be829aa.yml
@@ -2,48 +2,50 @@ id: ocd-person/3de20aaf-f982-5aa3-8280-c5154be829aa
 name: Elizabeth Warren
 given_name: Elizabeth
 family_name: Warren
-gender: F
 birth_date: 1949-06-22
+gender: Female
+email: https://www.warren.senate.gov/contact/shareyouropinion
 image: https://theunitedstates.io/images/congress/450x550/W000817.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Massachusetts
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Massachusetts
 offices:
 - classification: capitol
-  address: 309 Hart Senate Office Building Washington DC 20510
+  address: 1550 Main St. Suite 406, Springfield, MA 01103
+  voice: 413-788-2690
+- classification: capitol
+  address: 309 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4543
 - classification: district
-  address: 15 Sudbury St.; Boston, MA 02203
+  address: John F. Kennedy Federal Building 15 New Sudbury St., Suite 2400, Boston,
+    MA 02203
   voice: 617-565-3170
-  name: 'District Office #1'
-- classification: district
-  address: 1550 Main St. Suite 406; Springfield, MA 01103
-  voice: 413-788-2690
-  name: 'District Office #2'
 links:
 - url: https://www.warren.senate.gov
   note: website
 - url: https://www.warren.senate.gov/?p=email_senator
   note: contact form
+- url: https://www.warren.senate.gov/
+other_names:
+- name: E. Warren
+- name: E.A. Warren
+- name: Elizabeth A. Warren
+- name: Warren (D-MA)
+- name: Warren, E.
 ids:
   twitter: SenWarren
   youtube: UCTH9zV8Imw09J5bOoTR18_A
   facebook: senatorelizabethwarren
-other_names:
-- name: Elizabeth A. Warren
-- name: Warren (D-MA)
 other_identifiers:
 - scheme: bioguide
   identifier: W000817
@@ -77,3 +79,9 @@ other_identifiers:
   identifier: kg:/m/01qh39
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Elizabeth_Warren
+- url: https://en.wikipedia.org/wiki/Elizabeth_Warren
+- url: https://justfacts.votesmart.org/candidate/biography/141272/elizabeth-warren
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/elizabeth_warren/412542
+- url: https://www.warren.senate.gov
diff --git a/data/us/legislature/Emanuel-Cleaver-8ea538b9-6af5-5683-8b4b-9061f89691c1.yml b/data/us/legislature/Emanuel-Cleaver-8ea538b9-6af5-5683-8b4b-9061f89691c1.yml
index 3ed8a2f7eb..55efdf1e93 100644
--- a/data/us/legislature/Emanuel-Cleaver-8ea538b9-6af5-5683-8b4b-9061f89691c1.yml
+++ b/data/us/legislature/Emanuel-Cleaver-8ea538b9-6af5-5683-8b4b-9061f89691c1.yml
@@ -2,86 +2,83 @@ id: ocd-person/8ea538b9-6af5-5683-8b4b-9061f89691c1
 name: Emanuel Cleaver
 given_name: Emanuel
 family_name: Cleaver
-gender: M
 birth_date: 1944-10-26
+gender: Male
+email: https://cleaver.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001061.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-5
 offices:
 - classification: capitol
-  address: 2217 Rayburn House Office Building Washington DC 20515-2505
+  address: 2217 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4535
+  fax: 202-225-4403
 - classification: district
-  address: 1923 Main St; Higginsville, MO 64037
-  voice: 660-584-7373
-  fax: 660-584-7227
-  name: 'District Office #1'
+  address: 4001 Dr. Martin Luther King Jr. Blvd. Suite 210, Kansas City, MO 64130
+  voice: 816-842-4545
+  fax: 771-200-5575
 - classification: district
-  address: 411 W Maple Ave F; Independence, MO 64050-2840
+  address: 411 W. Maple Ave. Suite F, Independence, MO 64050
   voice: 816-833-4545
   fax: 816-833-2991
-  name: 'District Office #2'
-- classification: district
-  address: 101 W. 31 St.; Kansas City, MO 64108
-  voice: 816-842-4545
-  fax: 816-471-5215
-  name: 'District Office #3'
 links:
 - url: https://cleaver.house.gov
   note: website
+- url: https://cleaver.house.gov/
+other_names:
+- name: Cleaver, E.
+- name: E. Cleaver
 ids:
   twitter: RepCleaver
   youtube: UCVC-7CLFjXczoihr5FxDLsw
@@ -117,3 +114,9 @@ other_identifiers:
   identifier: Emanuel Cleaver
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Emanuel_Cleaver
+- url: https://cleaver.house.gov
+- url: https://en.wikipedia.org/wiki/Emanuel_Cleaver
+- url: https://justfacts.votesmart.org/candidate/39507/emanuel-cleaver-ii
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/emanuel_cleaver/400639
diff --git a/data/us/legislature/Emilia-Strong-Sykes-93c5c8f8-8311-547d-9465-9e7fdc557769.yml b/data/us/legislature/Emilia-Strong-Sykes-93c5c8f8-8311-547d-9465-9e7fdc557769.yml
index a359f4bd4a..9677e251bd 100644
--- a/data/us/legislature/Emilia-Strong-Sykes-93c5c8f8-8311-547d-9465-9e7fdc557769.yml
+++ b/data/us/legislature/Emilia-Strong-Sykes-93c5c8f8-8311-547d-9465-9e7fdc557769.yml
@@ -1,28 +1,35 @@
 id: ocd-person/93c5c8f8-8311-547d-9465-9e7fdc557769
-name: Emilia Strong Sykes
+name: Emilia Sykes
 given_name: Emilia
 family_name: Sykes
-middle_name: Strong
-gender: F
 birth_date: 1986-01-04
+gender: Female
+email: https://sykes.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001223.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
 offices:
 - classification: capitol
-  address: 1217 Longworth House Office Building Washington DC 20515-3513
+  address: 1217 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6265
+- classification: district
+  address: 121 S. Main St. Suite 107, Akron, OH 44308
+  voice: 330-400-5350
 links:
 - url: https://sykes.house.gov
   note: website
+- url: https://sykes.house.gov/
+other_names:
+- name: E. Sykes
+- name: E.S. Sykes
+- name: Emilia Strong Sykes
+- name: Sykes, E.
 ids:
   twitter: RepEmiliaSykes
 other_identifiers:
@@ -42,3 +49,7 @@ other_identifiers:
   identifier: '152164'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Emilia_Sykes
+- url: https://en.wikipedia.org/wiki/Emilia_Sykes
+- url: https://sykes.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Eric-A-Rick-Crawford-9a89c225-65e9-5680-a780-9802c17cb7c4.yml b/data/us/legislature/Eric-A-Rick-Crawford-9a89c225-65e9-5680-a780-9802c17cb7c4.yml
index b5117bf37f..581814aa56 100644
--- a/data/us/legislature/Eric-A-Rick-Crawford-9a89c225-65e9-5680-a780-9802c17cb7c4.yml
+++ b/data/us/legislature/Eric-A-Rick-Crawford-9a89c225-65e9-5680-a780-9802c17cb7c4.yml
@@ -1,77 +1,78 @@
 id: ocd-person/9a89c225-65e9-5680-a780-9802c17cb7c4
-name: Eric A. "Rick" Crawford
-given_name: Eric
+name: Rick Crawford
+given_name: Rick
 family_name: Crawford
-middle_name: A.
-gender: M
 birth_date: 1966-01-22
+gender: Male
+email: https://crawford.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001087.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-1
 offices:
 - classification: capitol
-  address: 2422 Rayburn House Office Building Washington DC 20515-0401
+  address: 2422 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4076
+  fax: 202-225-5602
 - classification: district
-  address: 112 S. 1st; Cabot, AR 72023
-  voice: 501-843-3043
-  fax: 501-843-4955
-  name: 'District Office #1'
+  address: 1001 Highway 62 East Suite 9, Mountain Home, AR 72653
+  voice: 870-424-2075
+  fax: 870-424-3149
 - classification: district
-  address: 101 E Waterman St; Dumas, AR 71639-2226
+  address: 101 E. Waterman St., Dumas, AR 71639
   voice: 870-377-5571
-  name: 'District Office #2'
 - classification: district
-  address: 2400 Highland Dr. Suite 300; Jonesboro, AR 72401
+  address: 112 S. 1st St., Cabot, AR 72023
+  voice: 501-843-3043
+  fax: 501-843-4955
+- classification: district
+  address: 2400 E. Highland Drive Suite 300, Jonesboro, AR 72401
   voice: 870-203-0540
   fax: 870-203-0542
-  name: 'District Office #3'
-- classification: district
-  address: 1001 Highway 62 E Suite 9; Mountain Home, AR 72653
-  voice: 870-424-2075
-  fax: 870-424-3149
-  name: 'District Office #4'
 links:
 - url: https://crawford.house.gov
   note: website
+- url: https://crawford.house.gov/
+other_names:
+- name: Crawford, R.
+- name: E.A. Crawford
+- name: Eric A. "Rick" Crawford
+- name: R. Crawford
 ids:
   twitter: RepRickCrawford
   youtube: UCLKAkVl4BHRK73lmDiIgPYg
@@ -107,3 +108,10 @@ other_identifiers:
   identifier: kg:/m/0czb3pp
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rick_Crawford_(Arkansas)
+- url: https://crawford.house.gov
+- url: https://en.wikipedia.org/wiki/Rick_Crawford_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/119208/rick-crawford
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/eric_crawford/412400
+- url: https://www.linkedin.com/in/rick-crawford-a1644815b
diff --git a/data/us/legislature/Eric-Burlison-6a54b336-ad96-5ceb-a963-50fe0f56c288.yml b/data/us/legislature/Eric-Burlison-6a54b336-ad96-5ceb-a963-50fe0f56c288.yml
index b4325c055e..e9ecfd3318 100644
--- a/data/us/legislature/Eric-Burlison-6a54b336-ad96-5ceb-a963-50fe0f56c288.yml
+++ b/data/us/legislature/Eric-Burlison-6a54b336-ad96-5ceb-a963-50fe0f56c288.yml
@@ -2,27 +2,38 @@ id: ocd-person/6a54b336-ad96-5ceb-a963-50fe0f56c288
 name: Eric Burlison
 given_name: Eric
 family_name: Burlison
-middle_name: Wayne
-gender: M
 birth_date: 1976-10-02
+gender: Male
+email: https://burlison.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B001316.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-7
 offices:
 - classification: capitol
-  address: 1108 Longworth House Office Building Washington DC 20515-2507
+  address: 1108 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6536
+- classification: capitol
+  address: 3232 E. Ridgeview St., Springfield, MO 65804
+  voice: 417-889-1800
+  fax: 771-200-5750
+- classification: district
+  address: 2727 E. 32nd St. Suite 2, Joplin, MO 64804
+  voice: 417-781-1041
+  fax: 771-200-5750
 links:
 - url: https://burlison.house.gov
   note: website
+- url: https://burlison.house.gov/
+other_names:
+- name: Burlison, E.
+- name: E. Burlison
+- name: E.W. Burlison
 ids:
   twitter: RepEricBurlison
 other_identifiers:
@@ -44,3 +55,9 @@ other_identifiers:
   identifier: Eric Burlison
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eric_Burlison
+- url: https://burlison.house.gov
+- url: https://en.wikipedia.org/wiki/Eric_Burlison
+- url: https://justfacts.votesmart.org/candidate/biography/104635/eric-burlison
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/eric-burlison-53473b6
diff --git a/data/us/legislature/Eric-Schmitt-999df51b-9318-55b9-b0f6-d738ffc1d62d.yml b/data/us/legislature/Eric-Schmitt-999df51b-9318-55b9-b0f6-d738ffc1d62d.yml
index 6fede63113..af01d3510c 100644
--- a/data/us/legislature/Eric-Schmitt-999df51b-9318-55b9-b0f6-d738ffc1d62d.yml
+++ b/data/us/legislature/Eric-Schmitt-999df51b-9318-55b9-b0f6-d738ffc1d62d.yml
@@ -2,32 +2,46 @@ id: ocd-person/999df51b-9318-55b9-b0f6-d738ffc1d62d
 name: Eric Schmitt
 given_name: Eric
 family_name: Schmitt
-middle_name: Stephen
-gender: M
 birth_date: 1975-06-20
+gender: Male
+email: https://www.schmitt.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S001227.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Missouri
 offices:
 - classification: capitol
-  address: 387 Russell Senate Office Building Washington DC 20510
+  address: 2870 S. Ingram Mill Road Suite D2, Springfield, MO 65804
+  voice: 417-290-5000
+- classification: capitol
+  address: 387 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5721
+- classification: district
+  address: 1123 Wilkes Blvd. Suite 320, Columbia, MO 65201
+  voice: 573-514-8680
+- classification: district
+  address: Kansas City, MO
+- classification: district
+  address: Thomas F. Eagleton U.S. Courthouse 111 S. 10th St., Suite 23.305, St. Louis,
+    MO 63102
+  voice: 314-230-7263
 links:
 - url: https://www.schmitt.senate.gov
   note: website
 - url: https://www.schmitt.senate.gov/contact/
   note: contact form
+- url: https://www.schmitt.senate.gov/
 other_names:
+- name: E. Schmitt
+- name: E.S. Schmitt
 - name: Eric S. Schmitt
 - name: Schmitt (R-MO)
+- name: Schmitt, E.
 other_identifiers:
 - scheme: bioguide
   identifier: S001227
@@ -49,3 +63,12 @@ other_identifiers:
   identifier: '104474'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eric_Schmitt
+- url: https://en.wikipedia.org/wiki/Eric_S._Schmitt
+- url: https://justfacts.votesmart.org/candidate/104474/eric-schmitt
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/eric_schmitt/456875
+- url: https://www.linkedin.com/in/eric-schmitt-57aa067
+- url: https://www.schmitt.senate.gov
+- url: https://www.schmitt.senate.gov/about
+- url: https://www.schmittforsenate.com/about
diff --git a/data/us/legislature/Eric-Sorensen-42d739b0-f570-5d50-b549-eeaa2c7507ee.yml b/data/us/legislature/Eric-Sorensen-42d739b0-f570-5d50-b549-eeaa2c7507ee.yml
index 3a6e317676..6267b1905e 100644
--- a/data/us/legislature/Eric-Sorensen-42d739b0-f570-5d50-b549-eeaa2c7507ee.yml
+++ b/data/us/legislature/Eric-Sorensen-42d739b0-f570-5d50-b549-eeaa2c7507ee.yml
@@ -2,26 +2,38 @@ id: ocd-person/42d739b0-f570-5d50-b549-eeaa2c7507ee
 name: Eric Sorensen
 given_name: Eric
 family_name: Sorensen
-gender: M
 birth_date: 1976-03-18
+gender: Male
+email: https://sorensen.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001225.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-17
 offices:
 - classification: capitol
-  address: 1205 Longworth House Office Building Washington DC 20515-1317
+  address: 1205 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5905
+- classification: district
+  address: 2401 4th Ave., Rock Island, IL 61201
+  voice: 309-786-3406
+- classification: district
+  address: 401 E. State St., Ground Floor, Rockford, IL 61104
+  voice: 779-513-4960
+- classification: district
+  address: "Conductor's Quarters Building 403\xBD NE Jefferson St., Peoria, IL 61602"
+  voice: 309-621-7070
 links:
 - url: https://sorensen.house.gov
   note: website
+- url: https://sorensen.house.gov/
+other_names:
+- name: E. Sorensen
+- name: Sorensen, E.
 ids:
   twitter: RepEricSorensen
 other_identifiers:
@@ -41,3 +53,8 @@ other_identifiers:
   identifier: '204339'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eric_Sorensen
+- url: https://en.wikipedia.org/wiki/Eric_Sorensen_(politician)
+- url: https://sorensen.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/eric-sorensen-1733a989
diff --git a/data/us/legislature/Eric-Swalwell-032302ae-d513-5e31-bafc-8bc3cbb18d7c.yml b/data/us/legislature/Eric-Swalwell-032302ae-d513-5e31-bafc-8bc3cbb18d7c.yml
index eed8117c9d..1b51b0e348 100644
--- a/data/us/legislature/Eric-Swalwell-032302ae-d513-5e31-bafc-8bc3cbb18d7c.yml
+++ b/data/us/legislature/Eric-Swalwell-032302ae-d513-5e31-bafc-8bc3cbb18d7c.yml
@@ -2,55 +2,58 @@ id: ocd-person/032302ae-d513-5e31-bafc-8bc3cbb18d7c
 name: Eric Swalwell
 given_name: Eric
 family_name: Swalwell
-gender: M
 birth_date: 1980-11-16
+gender: Male
+email: https://swalwell.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001193.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-15
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-14
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-15
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-15
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-15
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-14
+  district: CA-15
 offices:
 - classification: capitol
-  address: 174 Cannon House Office Building Washington DC 20515-0514
+  address: 174 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5065
 - classification: district
-  address: 3615 Castro Valley Blvd.; Castro Valley, CA 94546
+  address: 20990 Redwood Road, Castro Valley, CA 94546
   voice: 510-370-3322
-  name: 'District Office #1'
 links:
 - url: https://swalwell.house.gov
   note: website
+- url: https://swalwell.house.gov/
+other_names:
+- name: E. Swalwell
+- name: E.M. Swalwell
+- name: Swalwell, E.
 ids:
   twitter: RepSwalwell
   youtube: UCKvwsFNGD4sDkE_9g-2ft0w
@@ -84,3 +87,10 @@ other_identifiers:
   identifier: kg:/m/0ncq55g
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Eric_Swalwell
+- url: https://en.wikipedia.org/wiki/Eric_Swalwell
+- url: https://justfacts.votesmart.org/candidate/biography/129529/eric-swalwell
+- url: https://swalwell.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/eric_swalwell/412514
+- url: https://www.linkedin.com/in/eric-swalwell-2346aa4b
diff --git a/data/us/legislature/Erin-Houchin-c5e2bb91-8e10-5b4c-a442-bf5edb05bd45.yml b/data/us/legislature/Erin-Houchin-c5e2bb91-8e10-5b4c-a442-bf5edb05bd45.yml
index 9ce256ca17..3157495000 100644
--- a/data/us/legislature/Erin-Houchin-c5e2bb91-8e10-5b4c-a442-bf5edb05bd45.yml
+++ b/data/us/legislature/Erin-Houchin-c5e2bb91-8e10-5b4c-a442-bf5edb05bd45.yml
@@ -2,27 +2,33 @@ id: ocd-person/c5e2bb91-8e10-5b4c-a442-bf5edb05bd45
 name: Erin Houchin
 given_name: Erin
 family_name: Houchin
-middle_name: Suzanne
-gender: F
 birth_date: 1976-09-24
+gender: Female
+email: https://houchin.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/H001093.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-9
 offices:
 - classification: capitol
-  address: 1632 Longworth House Office Building Washington DC 20515-1409
+  address: 1632 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5315
+- classification: district
+  address: 321 Quartermaster Court, Jeffersonville, IN 47130
+  voice: 812-288-3999
 links:
+- url: https://iga.in.gov/legislative/2019/legislators/legislator_erin_houchin_1/
 - url: https://houchin.house.gov
   note: website
+other_names:
+- name: E. Houchin
+- name: E.S. Houchin
+- name: Houchin, E.
 ids:
   twitter: RepHouchin
 other_identifiers:
@@ -44,3 +50,11 @@ other_identifiers:
   identifier: '149614'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Erin_Houchin
+- url: https://en.wikipedia.org/wiki/Erin_Houchin
+- url: https://houchin.house.gov
+- url: https://iga.in.gov/legislative/2019/legislators/legislator_erin_houchin_1
+- url: https://justfacts.votesmart.org/candidate/149614/erin-houchin
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/erin_houchin/456903
+- url: https://www.linkedin.com/in/erin-houchin-b56969a
diff --git a/data/us/legislature/Frank-D-Lucas-90a2bdbf-1b51-5e72-aef9-5a98c305f31d.yml b/data/us/legislature/Frank-D-Lucas-90a2bdbf-1b51-5e72-aef9-5a98c305f31d.yml
index 004b2562fe..6b6ed61da1 100644
--- a/data/us/legislature/Frank-D-Lucas-90a2bdbf-1b51-5e72-aef9-5a98c305f31d.yml
+++ b/data/us/legislature/Frank-D-Lucas-90a2bdbf-1b51-5e72-aef9-5a98c305f31d.yml
@@ -1,108 +1,110 @@
 id: ocd-person/90a2bdbf-1b51-5e72-aef9-5a98c305f31d
-name: Frank D. Lucas
+name: Frank Lucas
 given_name: Frank
 family_name: Lucas
-middle_name: D.
-gender: M
 birth_date: 1960-01-06
+gender: Male
+email: https://lucas.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000491.jpg
 party:
-- start_date: '1993-05-10'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1993-05-10'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-6
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: OK-3
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-6
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: OK-3
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-6
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: OK-3
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-6
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: OK-3
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-6
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: OK-3
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: OK-6
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: OK-6
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: OK-6
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: OK-6
+- start_date: 1993-05-10
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-3
+  district: OK-6
 offices:
 - classification: capitol
-  address: 2405 Rayburn House Office Building Washington DC 20515-3603
+  address: 2405 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5565
 - classification: district
-  address: 10952 NW Expressway Suite B; Yukon, OK 73099
+  address: 11528 SW 15th St. Suite 200, Yukon, OK 73099
   voice: 405-373-1958
-  fax: 405-373-2046
-  name: 'District Office #1'
 links:
 - url: https://lucas.house.gov
   note: website
+- url: https://lucas.house.gov/
+other_names:
+- name: F. Lucas
+- name: F.D. Lucas
+- name: Frank D. Lucas
+- name: Lucas, F.
 ids:
   twitter: RepFrankLucas
   youtube: UCdYZbKY8pkWAThqwC3fdVMg
@@ -138,3 +140,10 @@ other_identifiers:
   identifier: kg:/m/033tnk
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Frank_Lucas
+- url: https://en.wikipedia.org/wiki/Frank_Lucas_%28Oklahoma%29
+- url: https://frankdlucas.com/about
+- url: https://justfacts.votesmart.org/candidate/27032/frank-lucas
+- url: https://lucas.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/frank_lucas/400247
diff --git a/data/us/legislature/Frank-J-Mrvan-c6c1c65f-7735-5ebb-951c-56d6cacc8ebb.yml b/data/us/legislature/Frank-J-Mrvan-c6c1c65f-7735-5ebb-951c-56d6cacc8ebb.yml
index 07e43e2360..f1c985f339 100644
--- a/data/us/legislature/Frank-J-Mrvan-c6c1c65f-7735-5ebb-951c-56d6cacc8ebb.yml
+++ b/data/us/legislature/Frank-J-Mrvan-c6c1c65f-7735-5ebb-951c-56d6cacc8ebb.yml
@@ -1,33 +1,42 @@
 id: ocd-person/c6c1c65f-7735-5ebb-951c-56d6cacc8ebb
-name: Frank J. Mrvan
+name: Frank Mrvan
 given_name: Frank
 family_name: Mrvan
-middle_name: John
-gender: M
 birth_date: 1969-04-16
+gender: Male
+email: https://mrvan.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001214.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-1
 offices:
 - classification: capitol
-  address: 1607 Longworth House Office Building Washington DC 20515-1401
+  address: 1607 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2461
+  fax: 202-225-2493
+- classification: district
+  address: 7895 Broadway Suite A, Merrillville, IN 46410
+  voice: 219-795-1844
+  fax: 219-795-1850
 links:
 - url: https://mrvan.house.gov
   note: website
+- url: https://mrvan.house.gov/
+other_names:
+- name: F. Mrvan
+- name: F.J. Mrvan
+- name: Frank J. Mrvan
+- name: Mrvan, F.
 ids:
   twitter: RepMrvan
 other_identifiers:
@@ -47,3 +56,9 @@ other_identifiers:
   identifier: kg:/g/11gtz3tlbh
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Frank_Mrvan_(Indiana_congressional_candidate)
+- url: https://en.wikipedia.org/wiki/Frank_J._Mrvan
+- url: https://justfacts.votesmart.org/candidate/biography/113775/frank-mrvan
+- url: https://mrvan.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/frank_mrvan/456821
diff --git a/data/us/legislature/Frank-Pallone-Jr-dfcc16d4-7116-5a16-bf7f-81c6f10d8276.yml b/data/us/legislature/Frank-Pallone-Jr-dfcc16d4-7116-5a16-bf7f-81c6f10d8276.yml
index 21c4e58d44..0863386923 100644
--- a/data/us/legislature/Frank-Pallone-Jr-dfcc16d4-7116-5a16-bf7f-81c6f10d8276.yml
+++ b/data/us/legislature/Frank-Pallone-Jr-dfcc16d4-7116-5a16-bf7f-81c6f10d8276.yml
@@ -1,128 +1,131 @@
 id: ocd-person/dfcc16d4-7116-5a16-bf7f-81c6f10d8276
-name: Frank Pallone, Jr.
+name: Frank Pallone
 given_name: Frank
 family_name: Pallone
-middle_name: J.
-gender: M
 birth_date: 1951-10-30
+gender: Male
+email: https://palloneforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/P000034.jpg
 party:
-- start_date: '1987-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NJ-3
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+  district: NJ-6
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NJ-3
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+  district: NJ-6
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NJ-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NJ-3
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NJ-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NJ-3
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-6
 offices:
 - classification: capitol
-  address: 2107 Rayburn House Office Building Washington DC 20515-3006
+  address: 2107 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4671
+  fax: 202-225-9665
 - classification: district
-  address: 504 Broadway; Long Branch, NJ 07740
+  address: 504 Broadway, Long Branch, NJ 07740
   voice: 732-571-1140
   fax: 732-870-3890
-  name: 'District Office #1'
 - classification: district
-  address: 67/69 Church St.; New Brunswick, NJ 08901
+  address: Kilmer Square 67-69 Church St., New Brunswick, NJ 08901
   voice: 732-249-8892
   fax: 732-249-1335
-  name: 'District Office #2'
 links:
 - url: https://pallone.house.gov
   note: website
+- url: https://pallone.house.gov/
+other_names:
+- name: F. Pallone
+- name: F.J. Pallone
+- name: Frank Pallone, Jr.
+- name: Pallone, F.
 ids:
   twitter: FrankPallone
   youtube: UCN0_wn9hs1LI3UKkji2PP2A
@@ -160,3 +163,11 @@ other_identifiers:
   identifier: Frank Pallone
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Frank_Pallone
+- url: https://en.wikipedia.org/wiki/Frank_Pallone
+- url: https://justfacts.votesmart.org/candidate/26951/frank-pallone-jr
+- url: https://pallone.house.gov
+- url: https://pallone.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/frank_pallone/400308
+- url: https://www.pallonefornewjersey.com/about
diff --git a/data/us/legislature/Frederica-S-Wilson-bd701bdc-2944-5bb8-b4bf-e2914e6e1241.yml b/data/us/legislature/Frederica-S-Wilson-bd701bdc-2944-5bb8-b4bf-e2914e6e1241.yml
index 2b0a1a0ff4..b8dd9457b6 100644
--- a/data/us/legislature/Frederica-S-Wilson-bd701bdc-2944-5bb8-b4bf-e2914e6e1241.yml
+++ b/data/us/legislature/Frederica-S-Wilson-bd701bdc-2944-5bb8-b4bf-e2914e6e1241.yml
@@ -1,77 +1,75 @@
 id: ocd-person/bd701bdc-2944-5bb8-b4bf-e2914e6e1241
-name: Frederica S. Wilson
+name: Frederica Wilson
 given_name: Frederica
 family_name: Wilson
-middle_name: S.
-gender: F
 birth_date: 1942-11-05
+gender: Female
+email: https://wilson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000808.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-17
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-24
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-24
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-24
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-24
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-24
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-24
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-24
+  district: FL-17
 offices:
 - classification: capitol
-  address: 2080 Rayburn House Office Building Washington DC 20515-0924
+  address: 2080 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4506
+  fax: 202-226-0777
 - classification: district
-  address: 2600 Hollywood Blvd 1st Floor; Hollywood, FL 33020-4807
-  voice: 954-921-3682
-  name: 'District Office #1'
-- classification: district
-  address: 18425 NW 2nd Avenue Suite 355; Miami Gardens, FL 33169
+  address: 18425 NW 2nd Ave. Suite 355, Miami Gardens, FL 33169
   voice: 305-690-5905
   fax: 305-690-5951
-  name: 'District Office #2'
 - classification: district
-  address: 1965 South State Road 7; West Park, FL 33023
+  address: West Park City Hall 1965 S. State Road 7, West Park, FL 33023
   voice: 954-989-2688
-  name: 'District Office #3'
 links:
 - url: https://wilson.house.gov
   note: website
+- url: https://wilson.house.gov/
+other_names:
+- name: F. Wilson
+- name: F.S. Wilson
+- name: Frederica S. Wilson
+- name: Wilson (FL)
+- name: Wilson, F.
 ids:
   twitter: RepWilson
   youtube: UCP5QBhng_lHv-vJgE_h7lpA
   facebook: RepWilson
-other_names:
-- name: Wilson (FL)
 other_identifiers:
 - scheme: bioguide
   identifier: W000808
@@ -103,3 +101,9 @@ other_identifiers:
   identifier: kg:/m/03cg3tv
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Frederica_Wilson
+- url: https://en.wikipedia.org/wiki/Frederica_Wilson
+- url: https://justfacts.votesmart.org/candidate/17319/frederica-wilson
+- url: https://theunitedstates.io
+- url: https://wilson.house.gov
+- url: https://www.govtrack.us/congress/members/frederica_wilson/412412
diff --git a/data/us/legislature/Gabe-Amo-c0f06e59-7d28-535f-8efe-5f49f273763d.yml b/data/us/legislature/Gabe-Amo-c0f06e59-7d28-535f-8efe-5f49f273763d.yml
index 9258d5b374..637cd1f685 100644
--- a/data/us/legislature/Gabe-Amo-c0f06e59-7d28-535f-8efe-5f49f273763d.yml
+++ b/data/us/legislature/Gabe-Amo-c0f06e59-7d28-535f-8efe-5f49f273763d.yml
@@ -2,26 +2,35 @@ id: ocd-person/c0f06e59-7d28-535f-8efe-5f49f273763d
 name: Gabe Amo
 given_name: Gabe
 family_name: Amo
-gender: M
 birth_date: 1987-12-11
+gender: Male
+email: https://amo.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/A000380.jpg
 party:
-- start_date: '2023-11-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-11-07'
-  end_date: '2025-01-03'
+- start_date: 2023-11-07
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: RI-1
 offices:
 - classification: capitol
-  address: 2233 Rayburn House Office Building Washington DC 20515-3901
+  address: 2233 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4911
+  fax: 202-225-3290
+- classification: district
+  address: 1070 Main St. Suite 300, Pawtucket, RI 02860
+  voice: 401-729-5600
+  fax: 401-729-5608
 links:
 - url: https://amo.house.gov
   note: website
+- url: https://amo.house.gov/
+other_names:
+- name: Amo, G.
+- name: G. Amo
+- name: G.F.K. Amo
 other_identifiers:
 - scheme: bioguide
   identifier: A000380
@@ -39,3 +48,7 @@ other_identifiers:
   identifier: Gabe Amo
 sources:
 - url: https://theunitedstates.io/
+- url: https://amo.house.gov
+- url: https://en.wikipedia.org/wiki/Gabe_Amo
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/gabeamo
diff --git a/data/us/legislature/Gabe-Vasquez-e643b29f-840b-51ac-aba1-62c85eb9e36c.yml b/data/us/legislature/Gabe-Vasquez-e643b29f-840b-51ac-aba1-62c85eb9e36c.yml
index 4a1bdb9b8a..8d572545c9 100644
--- a/data/us/legislature/Gabe-Vasquez-e643b29f-840b-51ac-aba1-62c85eb9e36c.yml
+++ b/data/us/legislature/Gabe-Vasquez-e643b29f-840b-51ac-aba1-62c85eb9e36c.yml
@@ -1,27 +1,38 @@
 id: ocd-person/e643b29f-840b-51ac-aba1-62c85eb9e36c
 name: Gabe Vasquez
-given_name: Gabriel (Gabe)
+given_name: Gabe
 family_name: Vasquez
-gender: M
 birth_date: 1984-08-03
+gender: Male
+email: https://vasquez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/V000136.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-2
 offices:
 - classification: capitol
-  address: 1517 Longworth House Office Building Washington DC 20515-3102
+  address: 1517 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2365
+- classification: district
+  address: 101 N. Halagueno St., Room 213-B, Carlsbad, NM 88220
+- classification: district
+  address: 115 W. Griggs Ave., Las Cruces, NM 88001
+  voice: 575-323-6390
+- classification: district
+  address: 201 Unser Blvd. NW, Unit 116, Albuquerque, NM 87121
+  voice: 505-208-4777
 links:
 - url: https://vasquez.house.gov
   note: website
+- url: https://vasquez.house.gov/
+other_names:
+- name: G. Vasquez
+- name: Vasquez, G.
 other_identifiers:
 - scheme: bioguide
   identifier: V000136
@@ -39,3 +50,9 @@ other_identifiers:
   identifier: N00049142
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gabriel_Vasquez
+- url: https://en.wikipedia.org/wiki/Gabe_Vasquez
+- url: https://theunitedstates.io
+- url: https://vasquez.house.gov
+- url: https://www.govtrack.us/congress/members/gabriel_gabe_vasquez/456919
+- url: https://www.linkedin.com/in/gabe-vasquez-06a20b13
diff --git a/data/us/legislature/Garret-Graves-6b0fb307-b985-56d0-83d3-c17a01e9b98e.yml b/data/us/legislature/Garret-Graves-6b0fb307-b985-56d0-83d3-c17a01e9b98e.yml
index 34ef558acf..19fb3b6244 100644
--- a/data/us/legislature/Garret-Graves-6b0fb307-b985-56d0-83d3-c17a01e9b98e.yml
+++ b/data/us/legislature/Garret-Graves-6b0fb307-b985-56d0-83d3-c17a01e9b98e.yml
@@ -2,67 +2,73 @@ id: ocd-person/6b0fb307-b985-56d0-83d3-c17a01e9b98e
 name: Garret Graves
 given_name: Garret
 family_name: Graves
-gender: M
 birth_date: 1972-01-31
+gender: Male
+email: https://garretgraves.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000577.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-6
 offices:
 - classification: capitol
-  address: 2402 Rayburn House Office Building Washington DC 20515-1806
+  address: 2402 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3901
+  fax: 202-225-7313
 - classification: district
-  address: 2351 Energy Dr. Suite 1200; Baton Rouge, LA 70808
+  address: 2351 Energy Drive Suite 1200, Baton Rouge, LA 70808
   voice: 225-442-1731
   fax: 225-442-1736
-  name: 'District Office #1'
 - classification: district
-  address: 29261 Frost Rd. 2nd Floor; Livingston, LA 70754
+  address: Ascension Parish Government Building 615 E. Worthy St., Gonzales, LA 70737
+  voice: 225-450-1672
+- classification: district
+  address: Livingston Parish Government Building 29261 Frost Road, 2nd Floor, Livingston,
+    LA 70754
   voice: 225-686-4413
   fax: 225-442-1736
-  name: 'District Office #2'
 - classification: district
-  address: 908 E. 1st St. Suite 405; Thibodaux, LA 70301
+  address: Nicholls State University Candies Hall, 908 E. 1st St., Suite 405, Thibodaux,
+    LA 70301
   voice: 985-448-4103
   fax: 225-442-1736
-  name: 'District Office #3'
 links:
 - url: https://garretgraves.house.gov
   note: website
+- url: https://garretgraves.house.gov/
+other_names:
+- name: G. Graves
+- name: G.N. Graves
+- name: Graves (LA)
+- name: Graves, G.
 ids:
   twitter: RepGarretGraves
   youtube: UCQLg9GGwTDluEFJtXf8seTA
   facebook: CongressmanGarretGraves
-other_names:
-- name: Graves (LA)
 other_identifiers:
 - scheme: bioguide
   identifier: G000577
@@ -92,3 +98,10 @@ other_identifiers:
   identifier: Garret Graves
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Garret_Graves
+- url: https://en.wikipedia.org/wiki/Garret_Graves
+- url: https://garretgraves.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/155424/garret-graves
+- url: https://theunitedstates.io
+- url: https://www.garretgraves.com/about
+- url: https://www.govtrack.us/congress/members/garret_graves/412631
diff --git a/data/us/legislature/Gary-C-Peters-edbfabfd-d26b-5d22-9a5d-f079181608f8.yml b/data/us/legislature/Gary-C-Peters-edbfabfd-d26b-5d22-9a5d-f079181608f8.yml
index 72cb2c9ac0..bd7cbfe12c 100644
--- a/data/us/legislature/Gary-C-Peters-edbfabfd-d26b-5d22-9a5d-f079181608f8.yml
+++ b/data/us/legislature/Gary-C-Peters-edbfabfd-d26b-5d22-9a5d-f079181608f8.yml
@@ -1,85 +1,83 @@
 id: ocd-person/edbfabfd-d26b-5d22-9a5d-f079181608f8
-name: Gary C. Peters
+name: Gary Peters
 given_name: Gary
 family_name: Peters
-middle_name: C.
-gender: M
 birth_date: 1958-12-01
+gender: Male
+email: https://www.peters.senate.gov/contact/email-gary
 image: https://theunitedstates.io/images/congress/450x550/P000595.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
-  type: lower
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
-  type: lower
+  district: Michigan
+- start_date: 2015-01-06
+  end_date: 2021-01-03
+  type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: Michigan
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-14
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
-  type: upper
+- start_date: 2011-01-05
+  end_date: 2013-01-03
+  type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: Michigan
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
+  district: MI-9
+- start_date: 2009-01-06
+  end_date: 2011-01-03
+  type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: Michigan
+  district: MI-9
 offices:
 - classification: capitol
-  address: 724 Hart Senate Office Building Washington DC 20510
+  address: 724 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6221
 - classification: district
-  address: 477 Michigan Ave. Suite 1837; Detroit, MI 48226
-  voice: 313-226-6020
-  name: 'District Office #1'
-- classification: district
-  address: 110 Michigan St. NW Suite 720; Grand Rapids, MI 49503
-  voice: 616-233-9150
-  name: 'District Office #2'
+  address: 109 E. Front St. Suite 215b, Traverse City, MI 49684
+  voice: 231-947-7773
 - classification: district
-  address: 124 W. Allegan St. Suite 1400; Lansing, MI 48933
+  address: 124 W. Allegan St. Suite 1400, Lansing, MI 48933
   voice: 517-377-1508
-  name: 'District Office #3'
 - classification: district
-  address: 857 W. Washington St. Suite 308; Marquette, MI 49855
-  voice: 906-226-4554
-  name: 'District Office #4'
+  address: 416 N. Saginaw St. Suite 222, Flint, MI 48502
+  voice: 989-754-0112
 - classification: district
-  address: 407 6th St. Suite C; Rochester, MI 48307
+  address: 51111 Woodward Ave. Suite 725, Pontiac, MI 48342
   voice: 248-608-8040
-  name: 'District Office #5'
 - classification: district
-  address: 515 N. Washington Ave. Suite 401; Saginaw, MI 48607
-  voice: 989-754-0112
-  name: 'District Office #6'
+  address: 857 W. Washington St. Suite 308, Marquette, MI 49855
+  voice: 906-226-4554
 - classification: district
-  address: 818 Red Dr. Suite 40; Traverse City, MI 49684
-  voice: 231-947-7773
-  name: 'District Office #7'
+  address: Gerald R. Ford Federal Building 110 Michigan St. NW, Suite 720, Grand Rapids,
+    MI 49503
+  voice: 616-233-9150
+- classification: district
+  address: Patrick V. McNamara Federal Building 477 Michigan Ave., Suite 1837, Detroit,
+    MI 48226
+  voice: 313-226-6020
 links:
 - url: https://www.peters.senate.gov
   note: website
 - url: https://www.peters.senate.gov/contact/email-gary
   note: contact form
+- url: https://www.peters.senate.gov/
+other_names:
+- name: G. Peters
+- name: G.C. Peters
+- name: Gary C. Peters
+- name: Gary Peters
+- name: Peters (D-MI)
+- name: Peters, G.
 ids:
   twitter: SenGaryPeters
   youtube: UC7LYNbnKSK2VZqQ98YROWHQ
   facebook: SenGaryPeters
-other_names:
-- name: Gary Peters
-- name: Peters (D-MI)
 other_identifiers:
 - scheme: bioguide
   identifier: P000595
@@ -115,3 +113,9 @@ other_identifiers:
   identifier: kg:/m/02x0lnt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gary_Peters
+- url: https://en.wikipedia.org/wiki/Gary_Peters_(Michigan_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/8749/gary-peters
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gary_peters/412305
+- url: https://www.peters.senate.gov
diff --git a/data/us/legislature/Gary-J-Palmer-1add3f9c-2946-50ed-92e9-fa54a98fe985.yml b/data/us/legislature/Gary-J-Palmer-1add3f9c-2946-50ed-92e9-fa54a98fe985.yml
index 37c2063af9..70c177deac 100644
--- a/data/us/legislature/Gary-J-Palmer-1add3f9c-2946-50ed-92e9-fa54a98fe985.yml
+++ b/data/us/legislature/Gary-J-Palmer-1add3f9c-2946-50ed-92e9-fa54a98fe985.yml
@@ -1,61 +1,59 @@
 id: ocd-person/1add3f9c-2946-50ed-92e9-fa54a98fe985
-name: Gary J. Palmer
+name: Gary Palmer
 given_name: Gary
 family_name: Palmer
-middle_name: J.
-gender: M
 birth_date: 1954-05-14
+gender: Male
+email: https://palmer.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/P000609.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-6
 offices:
 - classification: capitol
-  address: 170 Cannon House Office Building Washington DC 20515-0106
+  address: 170 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4921
+  fax: 202-225-2082
 - classification: district
-  address: 3535 Grandview Pkwy. Suite 525; Birmingham, AL 35243
+  address: 3535 Grandview Parkway Suite 525, Birmingham, AL 35242
   voice: 205-968-1290
   fax: 205-968-1294
-  name: 'District Office #1'
 - classification: district
-  address: 703 2nd Ave North Box 502; Clanton, AL 35045
-  voice: 205-280-6846
-  name: 'District Office #2'
-- classification: district
-  address: 220 2nd Ave E; Oneonta, AL 35121
-  voice: 205-625-4160
-  name: 'District Office #3'
+  address: Blount County Courthouse 220 2nd Ave. East, Oneonta, AL 35121
 links:
 - url: https://palmer.house.gov
   note: website
+- url: https://palmer.house.gov/
+other_names:
+- name: G. Palmer
+- name: G.J. Palmer
+- name: Gary J. Palmer
+- name: Palmer, G.
 ids:
   twitter: USRepGaryPalmer
   youtube: UCYZfP-cNIvlJY3AcAc9OPpQ
@@ -89,3 +87,11 @@ other_identifiers:
   identifier: Gary Palmer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gary_Palmer
+- url: https://en.wikipedia.org/wiki/Gary_Palmer_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/146274/gary-palmer
+- url: https://palmer.house.gov
+- url: https://palmer.house.gov/about/full-biography
+- url: https://palmerforalabama.com/meet-gary
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gary_palmer/412608
diff --git a/data/us/legislature/George-S-Helmy-ef3e7d6c-ac3c-58d2-9404-0b164aea0477.yml b/data/us/legislature/George-S-Helmy-ef3e7d6c-ac3c-58d2-9404-0b164aea0477.yml
index 131e676783..dd9ff889ad 100644
--- a/data/us/legislature/George-S-Helmy-ef3e7d6c-ac3c-58d2-9404-0b164aea0477.yml
+++ b/data/us/legislature/George-S-Helmy-ef3e7d6c-ac3c-58d2-9404-0b164aea0477.yml
@@ -1,28 +1,41 @@
 id: ocd-person/ef3e7d6c-ac3c-58d2-9404-0b164aea0477
-name: George S. Helmy
+name: George Helmy
 given_name: George
 family_name: Helmy
-middle_name: S.
-gender: M
 birth_date: 1979-10-27
+gender: Male
+email: https://helmy.senate.gov/share-your-opinion/
 image: https://theunitedstates.io/images/congress/450x550/H001097.jpg
 party:
-- start_date: '2024-09-09'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2024-09-09'
-  end_date: '2025-01-03'
+- start_date: 2024-09-09
+  end_date: 2024-11-27
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Jersey
 offices:
 - classification: capitol
-  address: 528 Hart Senate Office Building Washington DC 20510
+  address: 528 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4744
+  fax: 202-228-2197
+- classification: district
+  address: 208 White Horse Pike Suite 18, Barrington, NJ 08007
+  voice: 856-757-5353
+  fax: 856-546-1526
+- classification: district
+  address: Harborside 3 210 Hudson St., Suite 1000, Jersey City, NJ 07311
+  voice: 973-645-3030
+  fax: 201-434-9272
 links:
 - url: https://www.helmy.senate.gov
   note: website
+- url: https://www.helmy.senate.gov/
+other_names:
+- name: G. Helmy
+- name: G.S. Helmy
+- name: George S. Helmy
+- name: Helmy, G.
 other_identifiers:
 - scheme: bioguide
   identifier: H001097
@@ -38,3 +51,9 @@ other_identifiers:
   identifier: George Helmy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/George_Helmy
+- url: https://en.wikipedia.org/wiki/George_Helmy
+- url: https://theunitedstates.io
+- url: https://www.helmy.senate.gov
+- url: https://www.helmy.senate.gov/about
+- url: https://www.linkedin.com/in/george-helmy-110b4a19
diff --git a/data/us/legislature/Gerald-E-Connolly-716b011f-3673-558d-b35f-d5a454cafa81.yml b/data/us/legislature/Gerald-E-Connolly-716b011f-3673-558d-b35f-d5a454cafa81.yml
index b8b6672bd9..4f4ca4bb65 100644
--- a/data/us/legislature/Gerald-E-Connolly-716b011f-3673-558d-b35f-d5a454cafa81.yml
+++ b/data/us/legislature/Gerald-E-Connolly-716b011f-3673-558d-b35f-d5a454cafa81.yml
@@ -1,73 +1,71 @@
 id: ocd-person/716b011f-3673-558d-b35f-d5a454cafa81
-name: Gerald E. Connolly
-given_name: Gerald
+name: Gerry Connolly
+given_name: Gerry
 family_name: Connolly
-middle_name: E.
-gender: M
 birth_date: 1950-03-30
+gender: Male
+email: https://connolly.house.gov/contact/zip-auth.htm
 image: https://theunitedstates.io/images/congress/450x550/C001078.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-11
 offices:
 - classification: capitol
-  address: 2265 Rayburn House Office Building Washington DC 20515-4611
+  address: 2265 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1492
 - classification: district
-  address: 4115 Annandale Rd. Suite 103; Annandale, VA 22003
+  address: 10680 Main St. Suite 140, Fairfax, VA 22030
   voice: 703-256-3071
-  fax: 703-354-1284
-  name: 'District Office #1'
-- classification: district
-  address: 2241-D Tacketts Mill Drive; Woodbridge, VA 22192
-  voice: 571-408-4407
-  fax: 571-408-4708
-  name: 'District Office #2'
+  fax: 703-261-6088
 links:
 - url: https://connolly.house.gov
   note: website
+- url: https://connolly.house.gov/
+other_names:
+- name: Connolly, G.
+- name: G. Connolly
+- name: G.E. Connolly
+- name: Gerald E. Connolly
 ids:
   twitter: GerryConnolly
   youtube: UC4WG9PlmoOeSLIuyVjs-RSA
@@ -103,3 +101,11 @@ other_identifiers:
   identifier: Gerald Connolly
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gerald_Connolly
+- url: https://connolly.house.gov
+- url: https://connolly.house.gov/biography
+- url: https://en.wikipedia.org/wiki/Gerry_Connolly
+- url: https://gerryconnolly.com/about
+- url: https://justfacts.votesmart.org/candidate/95078/gerry-connolly
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gerald_connolly/412272
diff --git a/data/us/legislature/Glenn-Grothman-57016d46-c931-5a93-aeb5-1ffec71fb87e.yml b/data/us/legislature/Glenn-Grothman-57016d46-c931-5a93-aeb5-1ffec71fb87e.yml
index d1711c8c0c..4ea2da5686 100644
--- a/data/us/legislature/Glenn-Grothman-57016d46-c931-5a93-aeb5-1ffec71fb87e.yml
+++ b/data/us/legislature/Glenn-Grothman-57016d46-c931-5a93-aeb5-1ffec71fb87e.yml
@@ -2,50 +2,55 @@ id: ocd-person/57016d46-c931-5a93-aeb5-1ffec71fb87e
 name: Glenn Grothman
 given_name: Glenn
 family_name: Grothman
-gender: M
 birth_date: 1955-07-03
+gender: Male
+email: https://grothman.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000576.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-6
 offices:
 - classification: capitol
-  address: 1511 Longworth House Office Building Washington DC 20515-4906
+  address: 1511 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2476
+  fax: 202-225-2356
 - classification: district
-  address: 24 W. Pioneer Rd.; Fond du Lac, WI 54935
+  address: 525 N. Peters Ave. Suite 700, Fond du Lac, WI 54937
   voice: 920-907-0624
-  name: 'District Office #1'
+  fax: 920-907-0763
 links:
 - url: https://grothman.house.gov
   note: website
+- url: https://grothman.house.gov/
+other_names:
+- name: G. Grothman
+- name: G.S. Grothman
+- name: Grothman, G.
 ids:
   twitter: RepGrothman
   youtube: UCui4k83Cot4aeVW_8T33fgg
@@ -79,3 +84,11 @@ other_identifiers:
   identifier: Glenn Grothman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Glenn_Grothman
+- url: https://en.wikipedia.org/wiki/Glenn_Grothman
+- url: https://glenngrothman.com/meet-glenn
+- url: https://grothman.house.gov
+- url: https://grothman.house.gov/biography
+- url: https://justfacts.votesmart.org/candidate/biography/3493/glenn-grothman
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/glenn_grothman/412661
diff --git a/data/us/legislature/Glenn-Ivey-3e53830a-108c-5864-92f1-9f9c8f7b1d0f.yml b/data/us/legislature/Glenn-Ivey-3e53830a-108c-5864-92f1-9f9c8f7b1d0f.yml
index 804ad23540..32086c7bb9 100644
--- a/data/us/legislature/Glenn-Ivey-3e53830a-108c-5864-92f1-9f9c8f7b1d0f.yml
+++ b/data/us/legislature/Glenn-Ivey-3e53830a-108c-5864-92f1-9f9c8f7b1d0f.yml
@@ -2,27 +2,35 @@ id: ocd-person/3e53830a-108c-5864-92f1-9f9c8f7b1d0f
 name: Glenn Ivey
 given_name: Glenn
 family_name: Ivey
-middle_name: Frederick
-gender: M
 birth_date: 1961-02-27
+gender: Male
+email: https://ivey.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/I000058.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-4
 offices:
 - classification: capitol
-  address: 1529 Longworth House Office Building Washington DC 20515-2004
+  address: 1529 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-8699
+  fax: 202-225-2848
+- classification: district
+  address: 1101 Mercantile Lane Suite 220, Largo, MD 20774
+  voice: 240-906-6262
+  fax: 202-225-8000
 links:
 - url: https://ivey.house.gov
   note: website
+- url: https://ivey.house.gov/
+other_names:
+- name: G. Ivey
+- name: G.F. Ivey
+- name: Ivey, G.
 ids:
   twitter: RepGlennIvey
 other_identifiers:
@@ -44,3 +52,11 @@ other_identifiers:
   identifier: '166279'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Glenn_Ivey
+- url: https://en.wikipedia.org/wiki/Glenn_Ivey
+- url: https://ivey.house.gov
+- url: https://ivey.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/biography/166279/glenn-ivey
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/glenn_ivey/456905
+- url: https://www.linkedin.com/in/glennivey
diff --git a/data/us/legislature/Glenn-Thompson-2faf9e06-f667-5b60-830f-2161dae9c77a.yml b/data/us/legislature/Glenn-Thompson-2faf9e06-f667-5b60-830f-2161dae9c77a.yml
index 490fd97a49..0531d1dbc1 100644
--- a/data/us/legislature/Glenn-Thompson-2faf9e06-f667-5b60-830f-2161dae9c77a.yml
+++ b/data/us/legislature/Glenn-Thompson-2faf9e06-f667-5b60-830f-2161dae9c77a.yml
@@ -1,78 +1,81 @@
 id: ocd-person/2faf9e06-f667-5b60-830f-2161dae9c77a
-name: Glenn Thompson
-given_name: Glenn
+name: G.T. Thompson
+given_name: G.T.
 family_name: Thompson
-gender: M
 birth_date: 1959-07-27
+gender: Male
+email: https://thompson.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/T000467.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: PA-15
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: PA-15
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: PA-15
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-15
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: PA-5
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-5
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-15
+  district: PA-5
 offices:
 - classification: capitol
-  address: 400 Cannon House Office Building Washington DC 20515-3815
+  address: 400 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5121
+  fax: 202-225-5796
 - classification: district
-  address: 3555 Benner Pike. Suite 101; Bellefonte, PA 16823
-  voice: 814-353-0215
-  fax: 814-353-0218
-  name: 'District Office #1'
-- classification: district
-  address: 217 Elm St B; Oil City, PA 16301-1412
+  address: 217 Elm St. Suite B, Oil City, PA 16301
   voice: 814-670-0432
   fax: 814-670-0868
-  name: 'District Office #2'
+- classification: district
+  address: 3555 Benner Pike Suite 101, Bellefonte, PA 16823
+  voice: 814-353-0215
+  fax: 814-353-0218
 links:
 - url: https://thompson.house.gov
   note: website
+- url: https://thompson.house.gov/
+other_names:
+- name: G. Thompson
+- name: G.W. Thompson
+- name: Glenn Thompson
+- name: Thompson (PA)
+- name: Thompson, G.
 ids:
   twitter: CongressmanGT
   youtube: UCNWX7lbWWvnNdzVMFI9DRiQ
   facebook: CongressmanGT
-other_names:
-- name: Thompson (PA)
 other_identifiers:
 - scheme: bioguide
   identifier: T000467
@@ -104,3 +107,10 @@ other_identifiers:
   identifier: Glenn Thompson (Pennsylvania)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Glenn_Thompson_(Pennsylvania)
+- url: https://en.wikipedia.org/wiki/Glenn_Thompson_(politician)
+- url: https://justfacts.votesmart.org/candidate/24046/gt-thompson-jr
+- url: https://theunitedstates.io
+- url: https://thompson.house.gov
+- url: https://www.friendsofglennthompson.com
+- url: https://www.govtrack.us/congress/members/glenn_thompson/412317
diff --git a/data/us/legislature/Grace-F-Napolitano-228dc55f-1b76-5458-b344-4df46c4e632a.yml b/data/us/legislature/Grace-F-Napolitano-228dc55f-1b76-5458-b344-4df46c4e632a.yml
index 69e817b2f2..cffc9933fc 100644
--- a/data/us/legislature/Grace-F-Napolitano-228dc55f-1b76-5458-b344-4df46c4e632a.yml
+++ b/data/us/legislature/Grace-F-Napolitano-228dc55f-1b76-5458-b344-4df46c4e632a.yml
@@ -1,93 +1,97 @@
 id: ocd-person/228dc55f-1b76-5458-b344-4df46c4e632a
-name: Grace F. Napolitano
+name: Grace Napolitano
 given_name: Grace
 family_name: Napolitano
-middle_name: F.
-gender: F
 birth_date: 1936-12-04
+gender: Female
+email: https://napolitano.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/N000179.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-34
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-31
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-34
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-32
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-32
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-32
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-32
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-32
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-38
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-38
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-38
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-38
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-38
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-34
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-31
+  district: CA-34
 offices:
 - classification: capitol
-  address: 1610 Longworth House Office Building Washington DC 20515-0531
+  address: 1610 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5256
+  fax: 202-225-0027
 - classification: district
-  address: 4401 Santa Anita Ave. Suite 201; El Monte, CA 91731
+  address: 4401 Santa Anita Ave. Suite 201, El Monte, CA 91731
   voice: 626-350-0150
   fax: 626-350-0450
-  name: 'District Office #1'
 links:
 - url: https://napolitano.house.gov
   note: website
+- url: https://napolitano.house.gov/
+other_names:
+- name: G. Napolitano
+- name: G.F. Napolitano
+- name: Grace F. Napolitano
+- name: Napolitano, G.
 ids:
   twitter: GraceNapolitano
   youtube: UCPWjmiAIR04oQ8QMoOWcDtA
@@ -123,3 +127,9 @@ other_identifiers:
   identifier: Grace Napolitano
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Grace_Napolitano
+- url: https://en.wikipedia.org/wiki/Grace_Napolitano
+- url: https://justfacts.votesmart.org/candidate/8393/grace-napolitano
+- url: https://napolitano.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/grace_napolitano/400290
diff --git a/data/us/legislature/Grace-Meng-ae123357-c70e-5d29-b16f-2d17775ab0f6.yml b/data/us/legislature/Grace-Meng-ae123357-c70e-5d29-b16f-2d17775ab0f6.yml
index 6fc2437586..c2b502747d 100644
--- a/data/us/legislature/Grace-Meng-ae123357-c70e-5d29-b16f-2d17775ab0f6.yml
+++ b/data/us/legislature/Grace-Meng-ae123357-c70e-5d29-b16f-2d17775ab0f6.yml
@@ -2,61 +2,59 @@ id: ocd-person/ae123357-c70e-5d29-b16f-2d17775ab0f6
 name: Grace Meng
 given_name: Grace
 family_name: Meng
-gender: F
 birth_date: 1975-10-01
+gender: Female
+email: https://meng.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001188.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
 offices:
 - classification: capitol
-  address: 2209 Rayburn House Office Building Washington DC 20515-3206
+  address: 2209 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2601
+  fax: 202-225-1589
 - classification: district
-  address: 40-13 159th St. Suite A; Flushing, NY 11358
+  address: 40-13 159th St. Suite A, Flushing, NY 11358
   voice: 718-358-6364
   fax: 718-445-7868
-  name: 'District Office #1'
-- classification: district
-  address: 118-35 Queens Blvd. 17th Floor; Forest Hills, NY 11375
-  voice: 718-358-6364
-  fax: 718-445-7868
-  name: 'District Office #2'
 links:
 - url: https://meng.house.gov
   note: website
+- url: https://meng.house.gov/
+other_names:
+- name: G. Meng
+- name: Meng, G.
 ids:
   twitter: RepGraceMeng
   youtube: UCHg516zJKbIBtXFAJ0nu3XQ
@@ -92,3 +90,9 @@ other_identifiers:
   identifier: kg:/m/04ld76x
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Grace_Meng
+- url: https://en.wikipedia.org/wiki/Grace_Meng
+- url: https://justfacts.votesmart.org/candidate/biography/69157/grace-meng
+- url: https://meng.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/grace_meng/412560
diff --git a/data/us/legislature/Greg-Casar-3b0de391-3f75-564b-9b1c-c793300ff1a9.yml b/data/us/legislature/Greg-Casar-3b0de391-3f75-564b-9b1c-c793300ff1a9.yml
index 0a262610b4..657f185ca9 100644
--- a/data/us/legislature/Greg-Casar-3b0de391-3f75-564b-9b1c-c793300ff1a9.yml
+++ b/data/us/legislature/Greg-Casar-3b0de391-3f75-564b-9b1c-c793300ff1a9.yml
@@ -1,28 +1,37 @@
 id: ocd-person/3b0de391-3f75-564b-9b1c-c793300ff1a9
 name: Greg Casar
-given_name: Gregorio
+given_name: Greg
 family_name: Casar
-middle_name: Eduardo
-gender: M
 birth_date: 1989-05-04
+gender: Male
+email: https://casar.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001131.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-35
 offices:
 - classification: capitol
-  address: 1339 Longworth House Office Building Washington DC 20515-4335
+  address: 1339 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5645
+- classification: district
+  address: "727 E. C\xE9sar E. Ch\xE1vez Blvd. Suite A-105, San Antonio, TX 78205"
+  voice: 210-580-7000
+- classification: district
+  address: Austin, TX 78702
+  voice: 512-691-1200
 links:
 - url: https://casar.house.gov
   note: website
+- url: https://casar.house.gov/
+other_names:
+- name: Casar, G.
+- name: G. Casar
+- name: G.E. Casar
 ids:
   twitter: RepCasar
 other_identifiers:
@@ -44,3 +53,11 @@ other_identifiers:
   identifier: '161953'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Casar
+- url: https://casar.house.gov
+- url: https://casar.house.gov/about
+- url: https://en.wikipedia.org/wiki/Greg_Casar
+- url: https://justfacts.votesmart.org/candidate/161953/greg-casar
+- url: https://theunitedstates.io
+- url: https://www.casarforcongress.com/about
+- url: https://www.govtrack.us/congress/members/gregorio_casar/456945
diff --git a/data/us/legislature/Greg-Landsman-63dfcb23-8196-5bd6-a5cc-b6592d99150e.yml b/data/us/legislature/Greg-Landsman-63dfcb23-8196-5bd6-a5cc-b6592d99150e.yml
index 6b10bfebfd..a14bf08d9d 100644
--- a/data/us/legislature/Greg-Landsman-63dfcb23-8196-5bd6-a5cc-b6592d99150e.yml
+++ b/data/us/legislature/Greg-Landsman-63dfcb23-8196-5bd6-a5cc-b6592d99150e.yml
@@ -2,27 +2,36 @@ id: ocd-person/63dfcb23-8196-5bd6-a5cc-b6592d99150e
 name: Greg Landsman
 given_name: Greg
 family_name: Landsman
-middle_name: John
-gender: M
 birth_date: 1976-12-04
+gender: Male
+email: https://landsman.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000601.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-1
 offices:
 - classification: capitol
-  address: 1432 Longworth House Office Building Washington DC 20515-3501
+  address: 1432 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2216
+- classification: district
+  address: 11 S. Broadway St. Suite 301, Lebanon, OH 45036
+  voice: 513-409-6188
+- classification: district
+  address: 961 E. McMillan St. Suite C-1, Cincinnati, OH 45206
+  voice: 513-810-7988
 links:
 - url: https://landsman.house.gov
   note: website
+- url: https://landsman.house.gov/
+other_names:
+- name: G. Landsman
+- name: G.J. Landsman
+- name: Landsman, G.
 other_identifiers:
 - scheme: bioguide
   identifier: L000601
@@ -42,3 +51,10 @@ other_identifiers:
   identifier: kg:/g/11rn585y5q
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Landsman
+- url: https://en.wikipedia.org/wiki/Greg_Landsman
+- url: https://justfacts.votesmart.org/candidate/biography/186237/greg-landsman
+- url: https://landsman.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/greg_landsman/456928
+- url: https://www.linkedin.com/in/greg-landsman-3b335ab
diff --git a/data/us/legislature/Greg-Lopez-b513aafd-8615-53db-910f-b0d3e4c0dec6.yml b/data/us/legislature/Greg-Lopez-b513aafd-8615-53db-910f-b0d3e4c0dec6.yml
index e12d70b7c7..c06b1f054b 100644
--- a/data/us/legislature/Greg-Lopez-b513aafd-8615-53db-910f-b0d3e4c0dec6.yml
+++ b/data/us/legislature/Greg-Lopez-b513aafd-8615-53db-910f-b0d3e4c0dec6.yml
@@ -2,26 +2,38 @@ id: ocd-person/b513aafd-8615-53db-910f-b0d3e4c0dec6
 name: Greg Lopez
 given_name: Greg
 family_name: Lopez
-gender: M
 birth_date: 1964-06-07
+gender: Male
+email: https://lopez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000604.jpg
 party:
-- start_date: '2024-07-08'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2024-07-08'
-  end_date: '2025-01-03'
+- start_date: 2024-07-08
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-4
 offices:
 - classification: capitol
-  address: 2455 Rayburn House Office Building Washington DC 20515-3506
+  address: 2455 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4676
+- classification: district
+  address: 271 S. Elm Ave. Suite 1A, Eaton, CO 80615
+  voice: 970-702-2136
+  fax: 771-200-5799
+- classification: district
+  address: 900 Castleton Road Suite 112, Castle Rock, CO 80109
+  voice: 720-639-9165
+  fax: 771-200-5564
 links:
 - url: https://lopez.house.gov
   note: website
+- url: https://lopez.house.gov/
+other_names:
+- name: G. Lopez
+- name: G.B. Lopez
+- name: Lopez, G.
 other_identifiers:
 - scheme: bioguide
   identifier: L000604
@@ -35,3 +47,7 @@ other_identifiers:
   identifier: Q126910689
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Lopez
+- url: https://en.wikipedia.org/wiki/Greg_Lopez
+- url: https://lopez.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Greg-Pence-4c0bab34-0485-54c6-8b00-15042f52fd87.yml b/data/us/legislature/Greg-Pence-4c0bab34-0485-54c6-8b00-15042f52fd87.yml
index 452541c1b3..e191236384 100644
--- a/data/us/legislature/Greg-Pence-4c0bab34-0485-54c6-8b00-15042f52fd87.yml
+++ b/data/us/legislature/Greg-Pence-4c0bab34-0485-54c6-8b00-15042f52fd87.yml
@@ -2,40 +2,53 @@ id: ocd-person/4c0bab34-0485-54c6-8b00-15042f52fd87
 name: Greg Pence
 given_name: Greg
 family_name: Pence
-gender: M
 birth_date: 1956-11-14
+gender: Male
+email: https://pence.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/P000615.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-6
 offices:
 - classification: capitol
-  address: 404 Cannon House Office Building Washington DC 20515-1406
+  address: 404 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3021
+- classification: capitol
+  address: 50 N. 5th St. 2nd Floor, Richmond, IN 47374
+  voice: 765-660-1083
 - classification: district
-  address: 555 1st St B; Columbus, IN 47201-6703
+  address: 18 E. Main St. Suite 210, Greenfield, IN 46140
   voice: 812-799-5230
-  name: 'District Office #1'
+- classification: district
+  address: 300 S. Madison Ave. Suite 335, Greenwood, IN 46142
+  voice: 812-447-3647
+- classification: district
+  address: 529 Washington St., Columbus, IN 47201
+  voice: 812-799-5230
+  fax: 844-313-1563
 links:
 - url: https://pence.house.gov
   note: website
+- url: https://pence.house.gov/
+other_names:
+- name: G. Pence
+- name: G.J. Pence
+- name: Pence, G.
 ids:
   twitter: RepGregPence
 other_identifiers:
@@ -61,3 +74,11 @@ other_identifiers:
   identifier: kg:/g/11gh5qt6_p
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Pence
+- url: https://en.wikipedia.org/wiki/Greg_Pence
+- url: https://gregpenceforcongress.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/177876/greg-pence
+- url: https://pence.house.gov
+- url: https://pence.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/greg_pence/412778
diff --git a/data/us/legislature/Greg-Stanton-3300ee9c-6602-5be9-9bb5-2fb7f65a8d5c.yml b/data/us/legislature/Greg-Stanton-3300ee9c-6602-5be9-9bb5-2fb7f65a8d5c.yml
index f4ac58a4bf..4ad13a753e 100644
--- a/data/us/legislature/Greg-Stanton-3300ee9c-6602-5be9-9bb5-2fb7f65a8d5c.yml
+++ b/data/us/legislature/Greg-Stanton-3300ee9c-6602-5be9-9bb5-2fb7f65a8d5c.yml
@@ -2,40 +2,43 @@ id: ocd-person/3300ee9c-6602-5be9-9bb5-2fb7f65a8d5c
 name: Greg Stanton
 given_name: Greg
 family_name: Stanton
-gender: M
 birth_date: 1970-03-08
+gender: Male
+email: https://stanton.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001211.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: AZ-4
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-4
+  district: AZ-9
 offices:
 - classification: capitol
-  address: 207 Cannon House Office Building Washington DC 20515-0304
+  address: 207 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-9888
 - classification: district
-  address: 2944 N 44th St Suite 150; Phoenix, AZ 85018-7257
+  address: 1220 S. Alma School Road Suite 209, Mesa, AZ 85210
   voice: 602-956-2463
-  name: 'District Office #1'
 links:
 - url: https://stanton.house.gov
   note: website
+- url: https://stanton.house.gov/
+other_names:
+- name: G. Stanton
+- name: G.J. Stanton
+- name: Stanton, G.
 ids:
   twitter: RepGregStanton
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: Greg Stanton
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Stanton
+- url: https://en.wikipedia.org/wiki/Greg_Stanton
+- url: https://stanton.house.gov
+- url: https://stanton.house.gov/meet-greg-stanton
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/greg_stanton/412753
+- url: https://www.linkedin.com/in/repgregstanton
diff --git a/data/us/legislature/Gregorio-Kilili-Camacho-Sablan-3f4f5bab-eae1-594a-a93f-53c463b03d5b.yml b/data/us/legislature/Gregorio-Kilili-Camacho-Sablan-3f4f5bab-eae1-594a-a93f-53c463b03d5b.yml
index fe412bd592..86f98562d3 100644
--- a/data/us/legislature/Gregorio-Kilili-Camacho-Sablan-3f4f5bab-eae1-594a-a93f-53c463b03d5b.yml
+++ b/data/us/legislature/Gregorio-Kilili-Camacho-Sablan-3f4f5bab-eae1-594a-a93f-53c463b03d5b.yml
@@ -1,81 +1,80 @@
 id: ocd-person/3f4f5bab-eae1-594a-a93f-53c463b03d5b
-name: Gregorio Kilili Camacho Sablan
-given_name: Gregorio
+name: Kilili Sablan
+given_name: Kilili
 family_name: Sablan
-middle_name: Kilili Camacho
-gender: M
 birth_date: 1955-01-19
+gender: Male
+email: https://sablan.house.gov/address_authentication?form=/contact-me/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001177.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
-  name: Independent
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MP-AL
 offices:
 - classification: capitol
-  address: 2267 Rayburn House Office Building Washington DC 20515-5201
+  address: 2267 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2646
+  fax: 202-226-4249
 - classification: district
-  address: P.O. Box 1361; Rota, MP 96951
-  voice: 670-532-2647
-  fax: 670-532-2649
-  name: 'District Office #1'
-- classification: district
-  address: P.O. Box 504879; Saipan, MP 96950
+  address: P.O. Box 504879, Saipan, MP 96950
   voice: 670-323-2647
   fax: 670-323-2649
-  name: 'District Office #2'
 - classification: district
-  address: PO Box 520394; Tinian, MP 96952
+  address: P.O. Box 520394, Tinian, MP 96952
   voice: 670-433-2647
   fax: 670-433-2648
-  name: 'District Office #3'
+- classification: district
+  address: Rota Merchandising Building P.O. Box 1361, Rota, MP 96951
+  voice: 670-532-2647
+  fax: 670-532-2649
 links:
 - url: https://sablan.house.gov
   note: website
+- url: https://sablan.house.gov/
+other_names:
+- name: G.K.C. Sablan
+- name: Gregorio Kilili Camacho Sablan
+- name: K. Sablan
+- name: Sablan, K.
 ids:
   twitter: Kilili_Sablan
   youtube: UC-fbzxBSiC98eAE2goaANVQ
@@ -107,3 +106,11 @@ other_identifiers:
   identifier: kg:/m/04ycmvy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gregorio_Sablan
+- url: https://chci.org/staff-and-leadership/rep-gregorio-sablan
+- url: https://en.wikipedia.org/wiki/Gregorio_Sablan
+- url: https://justfacts.votesmart.org/candidate/110903/kilili-sablan
+- url: https://sablan.house.gov
+- url: https://sablan.house.gov/about/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gregorio_sablan/412312
diff --git a/data/us/legislature/Gregory-F-Murphy-b66a5d85-c9cd-5689-a482-d175230ab86d.yml b/data/us/legislature/Gregory-F-Murphy-b66a5d85-c9cd-5689-a482-d175230ab86d.yml
index e74e6a0068..7cb707590d 100644
--- a/data/us/legislature/Gregory-F-Murphy-b66a5d85-c9cd-5689-a482-d175230ab86d.yml
+++ b/data/us/legislature/Gregory-F-Murphy-b66a5d85-c9cd-5689-a482-d175230ab86d.yml
@@ -1,51 +1,58 @@
 id: ocd-person/b66a5d85-c9cd-5689-a482-d175230ab86d
-name: Gregory F. Murphy
-given_name: Gregory
+name: Greg Murphy
+given_name: Greg
 family_name: Murphy
-middle_name: Francis
-gender: M
 birth_date: 1963-03-05
+gender: Male
+email: https://gregmurphyforms.house.gov/contact/email-me.htm
 image: https://theunitedstates.io/images/congress/450x550/M001210.jpg
 party:
-- start_date: '2019-09-17'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-09-17'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-09-17
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-3
 offices:
 - classification: capitol
-  address: 407 Cannon House Office Building Washington DC 20515-3303
+  address: 407 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3415
 - classification: district
-  address: 1105 Corporate Drive Suite C; Greenville, NC 27858
+  address: 1105 Corporate Drive Suite C, Greenville, NC 27858
   voice: 252-931-1003
-  name: 'District Office #1'
 - classification: district
-  address: 234 Northwest Corridor Blvd.; Jacksonville, NC 28540
+  address: 2402 Dr. Martin Luther King Jr. Blvd., New Bern, NC 28562
+  voice: 252-636-6612
+- classification: district
+  address: 815 New Bridge St. P.O. Box 1487, Jacksonville, NC 28541
   voice: 910-937-6929
-  name: 'District Office #2'
+- classification: district
+  address: 954 Marshall C. Collins Drive Room 194, Manteo, NC 27954
+  voice: 252-230-3549
 links:
 - url: https://murphy.house.gov
   note: website
+- url: https://murphy.house.gov/
+other_names:
+- name: G. Murphy
+- name: G.F. Murphy
+- name: Gregory F. Murphy
+- name: Murphy
+- name: Murphy, G.
 ids:
   twitter: RepGregMurphy
   facebook: RepGregMurphy
-other_names:
-- name: Murphy
 other_identifiers:
 - scheme: bioguide
   identifier: M001210
@@ -69,3 +76,10 @@ other_identifiers:
   identifier: '166135'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gregory_Murphy
+- url: https://en.wikipedia.org/wiki/Greg_Murphy_(politician)
+- url: https://murphy.house.gov
+- url: https://murphy.house.gov/about-greg
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gregory_murphy/412845
+- url: https://www.linkedin.com/in/greg-murphy-819a7a2b
diff --git a/data/us/legislature/Gregory-W-Meeks-372b42da-f525-5938-9a01-e21378fe287c.yml b/data/us/legislature/Gregory-W-Meeks-372b42da-f525-5938-9a01-e21378fe287c.yml
index 029f94d260..03e868f05b 100644
--- a/data/us/legislature/Gregory-W-Meeks-372b42da-f525-5938-9a01-e21378fe287c.yml
+++ b/data/us/legislature/Gregory-W-Meeks-372b42da-f525-5938-9a01-e21378fe287c.yml
@@ -1,103 +1,106 @@
 id: ocd-person/372b42da-f525-5938-9a01-e21378fe287c
-name: Gregory W. Meeks
+name: Gregory Meeks
 given_name: Gregory
 family_name: Meeks
-middle_name: W.
-gender: M
 birth_date: 1953-09-25
+gender: Male
+email: https://meeks.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001137.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: NY-5
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: NY-5
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: NY-5
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: NY-5
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: NY-5
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-6
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: NY-5
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-6
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: NY-6
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: NY-6
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: NY-6
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NY-6
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-6
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-5
+  district: NY-6
 offices:
 - classification: capitol
-  address: 2310 Rayburn House Office Building Washington DC 20515-3205
+  address: 2310 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3461
+  fax: 202-226-4169
 - classification: district
-  address: 67-12 Rockaway Beach Blvd.; Arverne, NY 11692
-  voice: 347-230-4032
-  fax: 347-230-4045
-  name: 'District Office #1'
-- classification: district
-  address: 153-01 Jamaica Ave. 2nd floor; Jamaica, NY 11432
+  address: 153-01 Jamaica Ave. 2nd Floor, Jamaica, NY 11432
   voice: 718-725-6000
   fax: 718-725-9868
-  name: 'District Office #2'
+- classification: district
+  address: 67-12 Rockaway Beach Blvd., Arverne, NY 11692
+  voice: 347-230-4032
+  fax: 347-230-4045
 links:
 - url: https://meeks.house.gov
   note: website
+- url: https://meeks.house.gov/
+other_names:
+- name: G. Meeks
+- name: G.W. Meeks
+- name: Gregory W. Meeks
+- name: Meeks, G.
 ids:
   twitter: RepGregoryMeeks
   youtube: UCljJnwgQS6Z6-NypDyqKJZQ
@@ -133,3 +136,13 @@ other_identifiers:
   identifier: Gregory Meeks
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gregory_Meeks
+- url: https://en.wikipedia.org/wiki/Gregory_Meeks
+- url: https://justfacts.votesmart.org/candidate/4360/gregory-meeks
+- url: https://meeks.house.gov
+- url: https://meeks.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.congressmangregorymeeks.com/about
+- url: https://www.govtrack.us/congress/members/gregory_meeks/400271
+- url: https://www.linkedin.com/in/congressman-meeks-67b80ab1
+- url: https://www.linkedin.com/in/gregory-meeks-22b62429
diff --git a/data/us/legislature/Gus-M-Bilirakis-cd29931a-8dab-5ad7-8d4e-f0066cce7d4c.yml b/data/us/legislature/Gus-M-Bilirakis-cd29931a-8dab-5ad7-8d4e-f0066cce7d4c.yml
index 4e6c020c1b..fd3bba8b3b 100644
--- a/data/us/legislature/Gus-M-Bilirakis-cd29931a-8dab-5ad7-8d4e-f0066cce7d4c.yml
+++ b/data/us/legislature/Gus-M-Bilirakis-cd29931a-8dab-5ad7-8d4e-f0066cce7d4c.yml
@@ -1,78 +1,81 @@
 id: ocd-person/cd29931a-8dab-5ad7-8d4e-f0066cce7d4c
-name: Gus M. Bilirakis
+name: Gus Bilirakis
 given_name: Gus
 family_name: Bilirakis
-middle_name: M.
-gender: M
 birth_date: 1963-02-08
+gender: Male
+email: https://bilirakis.house.gov/zip_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/B001257.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: FL-12
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: FL-12
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-12
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-12
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: FL-9
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-9
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-12
+  district: FL-9
 offices:
 - classification: capitol
-  address: 2306 Rayburn House Office Building Washington DC 20515-0912
+  address: 2306 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5755
 - classification: district
-  address: 7132 Little Rd.; New Port Richey, FL 34654
-  voice: 727-232-2921
-  fax: 727-232-2923
-  name: 'District Office #1'
+  address: 15 N. Main St. Suite B, Brooksville, FL 34601
+  voice: 352-691-1231
+- classification: district
+  address: 212 W. Main St. Suite 208A, Inverness, FL 34451
+  voice: 352-654-1004
 - classification: district
-  address: 38500 U.S. Hwy 19 North BB-038; Tarpon Springs, FL 34689
-  voice: 727-940-5860
-  fax: 727-940-5861
-  name: 'District Office #2'
+  address: 8731 Citizens Drive Suite 135, New Port Richey, FL 34654
+  voice: 727-232-2921
 links:
 - url: https://bilirakis.house.gov
   note: website
+- url: https://bilirakis.house.gov/
+other_names:
+- name: Bilirakis, G.
+- name: G. Bilirakis
+- name: G.M. Bilirakis
+- name: Gus M. Bilirakis
 ids:
   twitter: RepGusBilirakis
   youtube: UC2z1uu1n4-60xXs5x1mvLJw
@@ -108,3 +111,8 @@ other_identifiers:
   identifier: kg:/m/0dy3z1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gus_Bilirakis
+- url: https://bilirakis.house.gov
+- url: https://en.wikipedia.org/wiki/Gus_Bilirakis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gus_bilirakis/412250
diff --git a/data/us/legislature/Guy-Reschenthaler-58bfb394-46c1-51e6-9f85-c3f091ddada7.yml b/data/us/legislature/Guy-Reschenthaler-58bfb394-46c1-51e6-9f85-c3f091ddada7.yml
index 74159a2c17..51db81ec7a 100644
--- a/data/us/legislature/Guy-Reschenthaler-58bfb394-46c1-51e6-9f85-c3f091ddada7.yml
+++ b/data/us/legislature/Guy-Reschenthaler-58bfb394-46c1-51e6-9f85-c3f091ddada7.yml
@@ -2,40 +2,46 @@ id: ocd-person/58bfb394-46c1-51e6-9f85-c3f091ddada7
 name: Guy Reschenthaler
 given_name: Guy
 family_name: Reschenthaler
-gender: M
 birth_date: 1983-04-17
+gender: Male
+email: https://reschenthaler.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/R000610.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-14
 offices:
 - classification: capitol
-  address: 342 Cannon House Office Building Washington DC 20515-3814
+  address: 342 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2065
 - classification: district
-  address: 700 Pellis Rd Suite 1; Greensburg, PA 15601-4488
+  address: 14 S. Main St., Washington, PA 15301
+  voice: 724-206-4800
+- classification: district
+  address: 5856 State Route 981 (Lloyd Ave.), Latrobe, PA 15650
   voice: 724-219-4200
-  name: 'District Office #1'
 links:
 - url: https://reschenthaler.house.gov
   note: website
+- url: https://reschenthaler.house.gov/
+other_names:
+- name: G. Reschenthaler
+- name: G.L. Reschenthaler
+- name: Reschenthaler, G.
 ids:
   twitter: GReschenthaler
 other_identifiers:
@@ -61,3 +67,9 @@ other_identifiers:
   identifier: Guy Reschenthaler
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Guy_Reschenthaler
+- url: https://en.wikipedia.org/wiki/Guy_Reschenthaler
+- url: https://justfacts.votesmart.org/candidate/biography/166004/guy-reschenthaler
+- url: https://reschenthaler.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/guy_reschenthaler/412813
diff --git a/data/us/legislature/Gwen-Moore-0223a517-1c97-5425-8bca-2120c45ce2e5.yml b/data/us/legislature/Gwen-Moore-0223a517-1c97-5425-8bca-2120c45ce2e5.yml
index 95b7e87ffc..3113d2ceb3 100644
--- a/data/us/legislature/Gwen-Moore-0223a517-1c97-5425-8bca-2120c45ce2e5.yml
+++ b/data/us/legislature/Gwen-Moore-0223a517-1c97-5425-8bca-2120c45ce2e5.yml
@@ -2,82 +2,84 @@ id: ocd-person/0223a517-1c97-5425-8bca-2120c45ce2e5
 name: Gwen Moore
 given_name: Gwen
 family_name: Moore
-gender: F
 birth_date: 1951-04-18
+gender: Female
+email: https://gwenmoore.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001160.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-4
 offices:
 - classification: capitol
-  address: 2252 Rayburn House Office Building Washington DC 20515-4904
+  address: 2252 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4572
 - classification: district
-  address: 316 N. Milwaukee St. Suite 406; Milwaukee, WI 53202
+  address: 250 E. Wisconsin Suite 950, Milwaukee, WI 53202
   voice: 414-297-1140
   fax: 414-297-1086
-  name: 'District Office #1'
 links:
 - url: https://gwenmoore.house.gov
   note: website
+- url: https://gwenmoore.house.gov/
+other_names:
+- name: G. Moore
+- name: G.S. Moore
+- name: Moore (WI)
+- name: Moore, G.
 ids:
   twitter: RepGwenMoore
   youtube: UCCs9o1XaSsCsqNpO0iO0_Ew
   facebook: GwenSMoore
-other_names:
-- name: Moore (WI)
 other_identifiers:
 - scheme: bioguide
   identifier: M001160
@@ -109,3 +111,11 @@ other_identifiers:
   identifier: kg:/m/04cvds
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Gwen_Moore
+- url: https://en.wikipedia.org/wiki/Gwen_Moore
+- url: https://gwenmoore.house.gov
+- url: https://gwenmoore.house.gov/biography
+- url: https://gwenmooreforcongress.com/about-gwen
+- url: https://justfacts.votesmart.org/candidate/3457/gwen-moore
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gwen_moore/400661
diff --git a/data/us/legislature/H-Morgan-Griffith-562f0794-c1fb-50ee-b69c-3a01b25cfc3a.yml b/data/us/legislature/H-Morgan-Griffith-562f0794-c1fb-50ee-b69c-3a01b25cfc3a.yml
index 4004db1d29..78ef0ea576 100644
--- a/data/us/legislature/H-Morgan-Griffith-562f0794-c1fb-50ee-b69c-3a01b25cfc3a.yml
+++ b/data/us/legislature/H-Morgan-Griffith-562f0794-c1fb-50ee-b69c-3a01b25cfc3a.yml
@@ -1,72 +1,71 @@
 id: ocd-person/562f0794-c1fb-50ee-b69c-3a01b25cfc3a
-name: H. Morgan Griffith
-given_name: H.
+name: Morgan Griffith
+given_name: Morgan
 family_name: Griffith
-middle_name: Morgan
-gender: M
 birth_date: 1958-03-15
+gender: Male
+email: https://morgangriffith.house.gov/contact/contactform.htm
 image: https://theunitedstates.io/images/congress/450x550/G000568.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-9
 offices:
 - classification: capitol
-  address: 2202 Rayburn House Office Building Washington DC 20515-4609
+  address: 2202 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3861
+  fax: 202-225-0076
 - classification: district
-  address: 323 W. Main St.; Abingdon, VA 24210
-  voice: 276-525-1405
-  fax: 276-525-1444
-  name: 'District Office #1'
-- classification: district
-  address: 322 E. Wood Ave; Big Stone Gap, VA 24219
-  voice: 276-525-1405
-  name: 'District Office #2'
-- classification: district
-  address: 17 W. Main St.; Christiansburg, VA 24073
+  address: 17 W. Main St., Christiansburg, VA 24073
   voice: 540-381-5671
   fax: 540-381-5675
-  name: 'District Office #3'
+- classification: district
+  address: 323 W. Main St., Abingdon, VA 24210
+  voice: 276-525-1405
+  fax: 276-525-1444
 links:
 - url: https://morgangriffith.house.gov
   note: website
+- url: https://morgangriffith.house.gov/
+other_names:
+- name: Griffith, M.
+- name: H. Morgan Griffith
+- name: H.M. Griffith
+- name: M. Griffith
 ids:
   twitter: RepMGriffith
   youtube: UCzxqD7EY_Rdvbc0spbaYkJA
@@ -102,3 +101,9 @@ other_identifiers:
   identifier: kg:/m/025vdrq
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Morgan_Griffith
+- url: https://en.wikipedia.org/wiki/Morgan_Griffith
+- url: https://justfacts.votesmart.org/candidate/5148/morgan-griffith
+- url: https://morgangriffith.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/morgan_griffith/412485
diff --git a/data/us/legislature/Hakeem-S-Jeffries-f06d8480-e875-5184-8316-4140a912a03d.yml b/data/us/legislature/Hakeem-S-Jeffries-f06d8480-e875-5184-8316-4140a912a03d.yml
index d441b42d96..be7e487c57 100644
--- a/data/us/legislature/Hakeem-S-Jeffries-f06d8480-e875-5184-8316-4140a912a03d.yml
+++ b/data/us/legislature/Hakeem-S-Jeffries-f06d8480-e875-5184-8316-4140a912a03d.yml
@@ -1,61 +1,63 @@
 id: ocd-person/f06d8480-e875-5184-8316-4140a912a03d
-name: Hakeem S. Jeffries
+name: Hakeem Jeffries
 given_name: Hakeem
 family_name: Jeffries
-middle_name: S.
-gender: M
 birth_date: 1970-08-04
+gender: Male
+email: https://jeffries.house.gov/contact/email-me/
 image: https://theunitedstates.io/images/congress/450x550/J000294.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
 offices:
 - classification: capitol
-  address: 2433 Rayburn House Office Building Washington DC 20515-3208
+  address: 2433 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5936
 - classification: district
-  address: 445 Neptune Ave 1st Floor, Community Room 2C; Brooklyn, NY 11224
+  address: 445 Neptune Ave. 1st Floor, Community Room 2C, Brooklyn, NY 11224
   voice: 718-373-0033
-  name: 'District Office #1'
 - classification: district
-  address: 55 Hanson Pl. Suite 603; Brooklyn, NY 11217
+  address: 55 Hanson Place Suite 603, Brooklyn, NY 11217
   voice: 718-237-2211
-  name: 'District Office #2'
 links:
 - url: https://jeffries.house.gov
   note: website
+- url: https://jeffries.house.gov/
+other_names:
+- name: H. Jeffries
+- name: H.S. Jeffries
+- name: Hakeem S. Jeffries
+- name: Jeffries, H.
 ids:
   twitter: RepJeffries
   youtube: UCYVmbsjoNbQ4j-PCQIYgpWQ
@@ -89,3 +91,12 @@ other_identifiers:
   identifier: kg:/m/025_74m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Hakeem_Jeffries
+- url: https://en.wikipedia.org/wiki/Hakeem_Jeffries
+- url: https://hakeemjeffries.com/about-hakeem
+- url: https://jeffries.house.gov
+- url: https://jeffries.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/biography/55285/hakeem-jeffries
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/hakeem_jeffries/412561
+- url: https://www.linkedin.com/in/hon-hakeem-jeffries-5b522543
diff --git a/data/us/legislature/Haley-M-Stevens-62d84fce-0ff4-53df-b7a8-4c02d1dc8654.yml b/data/us/legislature/Haley-M-Stevens-62d84fce-0ff4-53df-b7a8-4c02d1dc8654.yml
index 09659ed037..09bf497abb 100644
--- a/data/us/legislature/Haley-M-Stevens-62d84fce-0ff4-53df-b7a8-4c02d1dc8654.yml
+++ b/data/us/legislature/Haley-M-Stevens-62d84fce-0ff4-53df-b7a8-4c02d1dc8654.yml
@@ -1,42 +1,45 @@
 id: ocd-person/62d84fce-0ff4-53df-b7a8-4c02d1dc8654
-name: Haley M. Stevens
+name: Haley Stevens
 given_name: Haley
 family_name: Stevens
-middle_name: M.
-gender: F
 birth_date: 1983-06-24
+gender: Female
+email: https://stevens.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001215.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-11
 offices:
 - classification: capitol
-  address: 2411 Rayburn House Office Building Washington DC 20515-2211
+  address: 2411 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8171
 - classification: district
-  address: 30500 Northwestern Highway Suite 525; Farmington Hills, MI 48334
+  address: 30500 Northwestern Highway Suite 525, Farmington Hills, MI 48334
   voice: 734-853-3040
-  name: 'District Office #1'
 links:
 - url: https://stevens.house.gov
   note: website
+- url: https://stevens.house.gov/
+other_names:
+- name: H. Stevens
+- name: H.M. Stevens
+- name: Haley M. Stevens
+- name: Stevens, H.
 ids:
   twitter: RepHaleyStevens
 other_identifiers:
@@ -62,3 +65,11 @@ other_identifiers:
   identifier: kg:/g/11fjw095g8
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Haley_Stevens
+- url: https://en.wikipedia.org/wiki/Haley_Stevens
+- url: https://haleystevensforcongress.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/181092/haley-stevens
+- url: https://stevens.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/haley_stevens/412786
+- url: https://www.linkedin.com/in/haley-stevens-b459365
diff --git a/data/us/legislature/Harold-Rogers-8b8caa4b-52c1-54aa-bb51-bd0bccdc69b9.yml b/data/us/legislature/Harold-Rogers-8b8caa4b-52c1-54aa-bb51-bd0bccdc69b9.yml
index a9b75ffad8..3c014f9fa8 100644
--- a/data/us/legislature/Harold-Rogers-8b8caa4b-52c1-54aa-bb51-bd0bccdc69b9.yml
+++ b/data/us/legislature/Harold-Rogers-8b8caa4b-52c1-54aa-bb51-bd0bccdc69b9.yml
@@ -1,153 +1,158 @@
 id: ocd-person/8b8caa4b-52c1-54aa-bb51-bd0bccdc69b9
-name: Harold Rogers
-given_name: Harold
+name: Hal Rogers
+given_name: Hal
 family_name: Rogers
-gender: M
 birth_date: 1937-12-31
+gender: Male
+email: https://halrogers.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/R000395.jpg
 party:
-- start_date: '1981-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-5
 offices:
 - classification: capitol
-  address: 2406 Rayburn House Office Building Washington DC 20515-1705
+  address: 2406 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4601
+  fax: 202-225-0940
 - classification: district
-  address: 48 S. KY Hwy. 15; Hazard, KY 41701
-  voice: 606-439-0794
-  fax: 606-439-4647
-  name: 'District Office #1'
-- classification: district
-  address: 110 Resource Ct. Suite A; Prestonsburg, KY 41653
+  address: 110 Resource Court Suite A, Prestonsburg, KY 41653
   voice: 606-886-0844
   fax: 606-889-0371
-  name: 'District Office #2'
 - classification: district
-  address: 551 Clifty St.; Somerset, KY 42503
-  voice: 800-632-8588
+  address: 341 16th St., Ashland, KY 41101
+  voice: 606-467-6211
+- classification: district
+  address: 48 S. Kentucky Highway 15, Hazard, KY 41701
+  voice: 606-439-0794
+  fax: 606-439-4647
+- classification: district
+  address: 551 Clifty St., Somerset, KY 42503
+  voice: 606-679-8346
   fax: 606-678-4856
-  name: 'District Office #3'
 links:
 - url: https://halrogers.house.gov
   note: website
+- url: https://halrogers.house.gov/
+other_names:
+- name: H. Rogers
+- name: H.D. Rogers
+- name: Harold Rogers
+- name: Rogers (KY)
+- name: Rogers, H.
 ids:
   twitter: RepHalRogers
   youtube: UChVFKLZkRoHQDhp4zNvEezQ
   facebook: CongressmanHalRogers
-other_names:
-- name: Rogers (KY)
 other_identifiers:
 - scheme: bioguide
   identifier: R000395
@@ -179,3 +184,10 @@ other_identifiers:
   identifier: kg:/m/025jnx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Hal_Rogers
+- url: https://en.wikipedia.org/wiki/Hal_Rogers
+- url: https://halrogers.house.gov
+- url: https://halrogers.house.gov/biography
+- url: https://justfacts.votesmart.org/candidate/biography/26875/hal-rogers
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/harold_rogers/400340
diff --git a/data/us/legislature/Harriet-M-Hageman-17005404-0e78-5bcc-8a71-d67af0e033fd.yml b/data/us/legislature/Harriet-M-Hageman-17005404-0e78-5bcc-8a71-d67af0e033fd.yml
index 8228cca29f..dd51dfa2a4 100644
--- a/data/us/legislature/Harriet-M-Hageman-17005404-0e78-5bcc-8a71-d67af0e033fd.yml
+++ b/data/us/legislature/Harriet-M-Hageman-17005404-0e78-5bcc-8a71-d67af0e033fd.yml
@@ -1,28 +1,38 @@
 id: ocd-person/17005404-0e78-5bcc-8a71-d67af0e033fd
-name: Harriet M. Hageman
+name: Harriet Hageman
 given_name: Harriet
 family_name: Hageman
-middle_name: Maxine
-gender: F
 birth_date: 1962-10-18
+gender: Female
+email: https://hageman.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001096.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WY-AL
 offices:
 - classification: capitol
-  address: 1531 Longworth House Office Building Washington DC 20515-5000
+  address: 1531 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2311
+- classification: capitol
+  address: 2120 Capitol Ave. Suite 8005, Cheyenne, WY 82001
+  voice: 307-772-2595
+- classification: district
+  address: 100 E. B St. Suite 4003, Casper, WY 82601
+  voice: 307-261-6595
 links:
 - url: https://hageman.house.gov
   note: website
+- url: https://hageman.house.gov/
+other_names:
+- name: H. Hageman
+- name: H.M. Hageman
+- name: Hageman, H.
+- name: Harriet M. Hageman
 other_identifiers:
 - scheme: bioguide
   identifier: H001096
@@ -44,3 +54,9 @@ other_identifiers:
   identifier: '182961'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Harriet_Hageman
+- url: https://en.wikipedia.org/wiki/Harriet_Hageman
+- url: https://hageman.house.gov
+- url: https://justfacts.votesmart.org/candidate/182961/harriet-hageman
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/harriet_hageman/456951
diff --git a/data/us/legislature/Henry-C-Hank-Johnson-Jr-51b7316e-0885-571b-8a2e-daf54dd906bb.yml b/data/us/legislature/Henry-C-Hank-Johnson-Jr-51b7316e-0885-571b-8a2e-daf54dd906bb.yml
index 17b0971726..9f5fa222e1 100644
--- a/data/us/legislature/Henry-C-Hank-Johnson-Jr-51b7316e-0885-571b-8a2e-daf54dd906bb.yml
+++ b/data/us/legislature/Henry-C-Hank-Johnson-Jr-51b7316e-0885-571b-8a2e-daf54dd906bb.yml
@@ -1,80 +1,83 @@
 id: ocd-person/51b7316e-0885-571b-8a2e-daf54dd906bb
-name: Henry C. "Hank" Johnson, Jr.
-given_name: Henry
+name: Hank Johnson
+given_name: Hank
 family_name: Johnson
-middle_name: C.
-gender: M
 birth_date: 1954-10-02
+gender: Male
+email: https://hankjohnson.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/J000288.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-4
 offices:
 - classification: capitol
-  address: 2240 Rayburn House Office Building Washington DC 20515-1004
+  address: 2240 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1605
+  fax: 202-226-0691
 - classification: district
-  address: 5240 Snapfinger Park Dr. Suite 130; Decatur, GA 30035
+  address: 5240 Snapfinger Park Drive Suite 140, Decatur, GA 30035
   voice: 770-987-2291
   fax: 770-987-8721
-  name: 'District Office #1'
 links:
 - url: https://hankjohnson.house.gov
   note: website
+- url: https://hankjohnson.house.gov/
+other_names:
+- name: H. Johnson
+- name: H.C. Johnson
+- name: Henry C. "Hank" Johnson
+- name: Henry C. "Hank" Johnson, Jr.
+- name: Johnson (GA)
+- name: Johnson, H.
 ids:
   twitter: RepHankJohnson
   youtube: UCqMici9I7nz_i-PN7eSYjwQ
   facebook: '115356957005'
-other_names:
-- name: Henry C. "Hank" Johnson
-- name: Johnson (GA)
 other_identifiers:
 - scheme: bioguide
   identifier: J000288
@@ -106,3 +109,9 @@ other_identifiers:
   identifier: kg:/m/0flgyy
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Hank_Johnson
+- url: https://en.wikipedia.org/wiki/Hank_Johnson
+- url: https://hankjohnson.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/henry_johnson/412199
+- url: https://www.linkedin.com/in/henry-hank-johnson-jr-7b90a090
diff --git a/data/us/legislature/Henry-Cuellar-f67869ed-f124-54ce-b870-600ae4ff20e8.yml b/data/us/legislature/Henry-Cuellar-f67869ed-f124-54ce-b870-600ae4ff20e8.yml
index 7325469272..58fe820205 100644
--- a/data/us/legislature/Henry-Cuellar-f67869ed-f124-54ce-b870-600ae4ff20e8.yml
+++ b/data/us/legislature/Henry-Cuellar-f67869ed-f124-54ce-b870-600ae4ff20e8.yml
@@ -2,91 +2,88 @@ id: ocd-person/f67869ed-f124-54ce-b870-600ae4ff20e8
 name: Henry Cuellar
 given_name: Henry
 family_name: Cuellar
-gender: M
 birth_date: 1955-09-19
+gender: Male
+email: https://cuellar.house.gov/contact/sendmeanemail.htm
 image: https://theunitedstates.io/images/congress/450x550/C001063.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-28
 offices:
 - classification: capitol
-  address: 2372 Rayburn House Office Building Washington DC 20515-4328
+  address: 2372 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1640
+  fax: 202-225-1641
 - classification: district
-  address: 602 E. Calton Rd. Suite 2; Laredo, TX 78041
-  voice: 956-725-0639
-  fax: 956-725-2647
-  name: 'District Office #1'
-- classification: district
-  address: 117 E. Tom Landry; Mission, TX 78572
-  voice: 956-424-3942
-  fax: 956-424-3936
-  name: 'District Office #2'
-- classification: district
-  address: 100 N. F.M. 3167; Rio Grande City, TX 78582
+  address: 100 N. Farm to Market 3167 Suite 208, Rio Grande City, TX 78582
   voice: 956-487-5603
-  fax: 956-488-0952
-  name: 'District Office #3'
+  fax: 956-424-3936
 - classification: district
-  address: 615 E. Houston St. Suite 563; San Antonio, TX 78205
+  address: 1145 E. Commerce St. Suite 205, San Antonio, TX 78205
   voice: 210-271-2851
   fax: 210-277-6671
-  name: 'District Office #4'
+- classification: district
+  address: 602 E. Calton Road Suite 2, Laredo, TX 78041
+  voice: 956-725-0639
+  fax: 956-725-2647
 links:
 - url: https://cuellar.house.gov
   note: website
+- url: https://cuellar.house.gov/
+other_names:
+- name: Cuellar, H.
+- name: E.R. Cuellar
+- name: H. Cuellar
 ids:
   twitter: RepCuellar
   youtube: UCVgEOdJx3tyILO9EjZ-heEQ
@@ -122,3 +119,9 @@ other_identifiers:
   identifier: Henry Cuellar
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Henry_Cuellar
+- url: https://cuellar.house.gov
+- url: https://en.wikipedia.org/wiki/Henry_Cuellar
+- url: https://justfacts.votesmart.org/candidate/5486/henry-cuellar
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/henry_cuellar/400657
diff --git a/data/us/legislature/Hillary-J-Scholten-55404260-10e4-59e0-b228-2a01a21fb952.yml b/data/us/legislature/Hillary-J-Scholten-55404260-10e4-59e0-b228-2a01a21fb952.yml
index b087fd5593..9d9766d28f 100644
--- a/data/us/legislature/Hillary-J-Scholten-55404260-10e4-59e0-b228-2a01a21fb952.yml
+++ b/data/us/legislature/Hillary-J-Scholten-55404260-10e4-59e0-b228-2a01a21fb952.yml
@@ -1,28 +1,36 @@
 id: ocd-person/55404260-10e4-59e0-b228-2a01a21fb952
-name: Hillary J. Scholten
+name: Hillary Scholten
 given_name: Hillary
 family_name: Scholten
-middle_name: Jeanne
-gender: F
 birth_date: 1982-02-22
+gender: Female
+email: https://scholten.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001221.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-3
 offices:
 - classification: capitol
-  address: 1317 Longworth House Office Building Washington DC 20515-2203
+  address: 1317 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3831
+- classification: district
+  address: 110 Michigan St. NW Suite 460, Grand Rapids, MI 49503
+  voice: 616-451-8383
+  fax: 616-454-5630
 links:
 - url: https://scholten.house.gov
   note: website
+- url: https://scholten.house.gov/
+other_names:
+- name: H. Scholten
+- name: H.J. Scholten
+- name: Hillary J. Scholten
+- name: Scholten, H.
 other_identifiers:
 - scheme: bioguide
   identifier: S001221
@@ -40,3 +48,11 @@ other_identifiers:
   identifier: '191584'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Hillary_Scholten
+- url: https://en.wikipedia.org/wiki/Hillary_Scholten
+- url: https://hillaryscholten.com/meet-hillary
+- url: https://justfacts.votesmart.org/candidate/191584/hillary-scholten
+- url: https://scholten.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/hillary_scholten/456906
+- url: https://www.linkedin.com/in/hillary-scholten-3b090078
diff --git a/data/us/legislature/Ilhan-Omar-dc1ded48-08a5-5981-be73-53bbbe668782.yml b/data/us/legislature/Ilhan-Omar-dc1ded48-08a5-5981-be73-53bbbe668782.yml
index 0a7be5270f..b998bf0bb2 100644
--- a/data/us/legislature/Ilhan-Omar-dc1ded48-08a5-5981-be73-53bbbe668782.yml
+++ b/data/us/legislature/Ilhan-Omar-dc1ded48-08a5-5981-be73-53bbbe668782.yml
@@ -2,40 +2,43 @@ id: ocd-person/dc1ded48-08a5-5981-be73-53bbbe668782
 name: Ilhan Omar
 given_name: Ilhan
 family_name: Omar
-gender: F
-birth_date: 1981-10-04
+birth_date: 1982-10-04
+gender: Female
+email: https://omar.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/O000173.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-5
 offices:
 - classification: capitol
-  address: 1730 Longworth House Office Building Washington DC 20515-2305
+  address: 1730 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4755
 - classification: district
-  address: 404 3rd Ave N Suite 203; Minneapolis, MN 55401-1779
+  address: 310 E. 38th St. Suite 222, Minneapolis, MN 55409
   voice: 612-333-1272
-  name: 'District Office #1'
 links:
 - url: https://omar.house.gov
   note: website
+- url: https://omar.house.gov/
+other_names:
+- name: I. Omar
+- name: I.A. Omar
+- name: Omar, I.
 ids:
   twitter: Ilhan
 other_identifiers:
@@ -61,3 +64,12 @@ other_identifiers:
   identifier: kg:/g/11c4wx5dm0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ilhan_Omar
+- url: https://en.wikipedia.org/wiki/Ilhan_Omar
+- url: https://ilhanomar.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/171628/ilhan-omar
+- url: https://omar.house.gov
+- url: https://omar.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ilhan_omar/412791
+- url: https://www.linkedin.com/in/ilhan-omar-a6433644
diff --git a/data/us/legislature/J-French-Hill-73ff0305-598d-5558-9b5e-6834be8a503a.yml b/data/us/legislature/J-French-Hill-73ff0305-598d-5558-9b5e-6834be8a503a.yml
index e8fe2a541e..2251459cc6 100644
--- a/data/us/legislature/J-French-Hill-73ff0305-598d-5558-9b5e-6834be8a503a.yml
+++ b/data/us/legislature/J-French-Hill-73ff0305-598d-5558-9b5e-6834be8a503a.yml
@@ -1,58 +1,57 @@
 id: ocd-person/73ff0305-598d-5558-9b5e-6834be8a503a
-name: J. French Hill
-given_name: J.
+name: French Hill
+given_name: French
 family_name: Hill
-middle_name: French
-gender: M
 birth_date: 1956-12-05
+gender: Male
+email: https://hill.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/H001072.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-2
 offices:
 - classification: capitol
-  address: 1533 Longworth House Office Building Washington DC 20515-0402
+  address: 1533 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2506
+  fax: 202-225-5903
 - classification: district
-  address: 1105 Deer St. Suite 12; Conway, AR 72032
-  voice: 501-358-3481
-  fax: 501-358-3494
-  name: 'District Office #1'
-- classification: district
-  address: 1501 N. University Ave. Suite 630; Little Rock, AR 72207
+  address: 1501 N. University Ave. Suite 630, Little Rock, AR 72207
   voice: 501-324-5941
   fax: 501-324-6029
-  name: 'District Office #2'
 links:
 - url: https://hill.house.gov
   note: website
+- url: https://hill.house.gov/
+other_names:
+- name: F. Hill
+- name: Hill, F.
+- name: J. French Hill
+- name: J.F. Hill
 ids:
   twitter: RepFrenchHill
   youtube: UCT8uWroJtkwSsCJlVg0IKvQ
@@ -86,3 +85,9 @@ other_identifiers:
   identifier: French Hill
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/French_Hill
+- url: https://en.wikipedia.org/wiki/French_Hill_(politician)
+- url: https://hill.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/french_hill/412609
+- url: https://www.linkedin.com/in/j-french-hill-83466526
diff --git a/data/us/legislature/J-Luis-Correa-86b65fd7-4549-51fa-80e8-eaf3daf3e60e.yml b/data/us/legislature/J-Luis-Correa-86b65fd7-4549-51fa-80e8-eaf3daf3e60e.yml
index 2ebec81d71..8d9d25a48a 100644
--- a/data/us/legislature/J-Luis-Correa-86b65fd7-4549-51fa-80e8-eaf3daf3e60e.yml
+++ b/data/us/legislature/J-Luis-Correa-86b65fd7-4549-51fa-80e8-eaf3daf3e60e.yml
@@ -1,47 +1,51 @@
 id: ocd-person/86b65fd7-4549-51fa-80e8-eaf3daf3e60e
-name: J. Luis Correa
-given_name: J.
+name: Lou Correa
+given_name: Lou
 family_name: Correa
-middle_name: Luis
-gender: M
 birth_date: 1958-01-24
+gender: Male
+email: https://correa.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001110.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-46
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-46
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-46
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-46
 offices:
 - classification: capitol
-  address: 2301 Rayburn House Office Building Washington DC 20515-0546
+  address: 2301 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2965
 - classification: district
-  address: 2323 N. Broadway Suite 319; Santa Ana, CA 92706
-  voice: 714-621-0102
-  name: 'District Office #1'
+  address: Rancho Santiago Community College Building 2323 N. Broadway, Suite 319,
+    Santa Ana, CA 92706
+  voice: 714-559-6190
 links:
 - url: https://correa.house.gov
   note: website
+- url: https://correa.house.gov/
+other_names:
+- name: Correa, L.
+- name: J. Luis Correa
+- name: J.L. Correa
+- name: L. Correa
 ids:
   twitter: RepLouCorrea
   youtube: UCIKJJp4QJIDjnjodc23qKkw
@@ -73,3 +77,9 @@ other_identifiers:
   identifier: Lou Correa
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lou_Correa
+- url: https://correa.house.gov
+- url: https://en.wikipedia.org/wiki/Lou_Correa
+- url: https://justfacts.votesmart.org/candidate/biography/9732/lou-correa
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/luis_correa/412688
diff --git a/data/us/legislature/JD-Vance-5a8792bc-1520-56aa-ab19-729008cd559b.yml b/data/us/legislature/JD-Vance-5a8792bc-1520-56aa-ab19-729008cd559b.yml
index 8787515b0f..20715b2060 100644
--- a/data/us/legislature/JD-Vance-5a8792bc-1520-56aa-ab19-729008cd559b.yml
+++ b/data/us/legislature/JD-Vance-5a8792bc-1520-56aa-ab19-729008cd559b.yml
@@ -1,33 +1,46 @@
 id: ocd-person/5a8792bc-1520-56aa-ab19-729008cd559b
-name: J.D. Vance
-given_name: J.D. (James)
+name: JD Vance
+given_name: JD
 family_name: Vance
-middle_name: (David)
-gender: M
 birth_date: 1984-08-02
+gender: Male
+email: https://www.vance.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/V000137.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Ohio
 offices:
 - classification: capitol
-  address: 288 Russell Senate Office Building Washington DC 20510
+  address: 288 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3353
+- classification: district
+  address: 1240 E. 9th St. Room 3061, Cleveland, OH 44199
+  voice: 216-539-7877
+- classification: district
+  address: 300 N. Main St. Suite 200, Middletown, OH 45042
+  voice: 513-318-1100
+- classification: district
+  address: 37 W. Broad St. Room 300, Columbus, OH 43215
+  voice: 614-369-4925
+- classification: district
+  address: 420 Madison Ave. Room 1210, Toledo, OH 43604
+  voice: 567-304-3777
 links:
 - url: https://www.vance.senate.gov
   note: website
 - url: https://www.vance.senate.gov/contact/
   note: contact form
+- url: https://www.vance.senate.gov/
 other_names:
+- name: J. Vance
 - name: J.D. Vance
 - name: Vance (R-OH)
+- name: Vance, J.
 other_identifiers:
 - scheme: bioguide
   identifier: V000137
@@ -49,3 +62,11 @@ other_identifiers:
   identifier: J.D. Vance
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/J.D._Vance
+- url: https://en.wikipedia.org/wiki/J._D._Vance
+- url: https://jdvance.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jd_james_vance/456876
+- url: https://www.linkedin.com/in/jd-vance-770a9047
+- url: https://www.vance.senate.gov
+- url: https://www.vance.senate.gov/about
diff --git a/data/us/legislature/Jack-Bergman-5f3b131a-0f64-5d55-875a-2861e5347727.yml b/data/us/legislature/Jack-Bergman-5f3b131a-0f64-5d55-875a-2861e5347727.yml
index c7ec30dca4..e82113c63d 100644
--- a/data/us/legislature/Jack-Bergman-5f3b131a-0f64-5d55-875a-2861e5347727.yml
+++ b/data/us/legislature/Jack-Bergman-5f3b131a-0f64-5d55-875a-2861e5347727.yml
@@ -2,49 +2,56 @@ id: ocd-person/5f3b131a-0f64-5d55-875a-2861e5347727
 name: Jack Bergman
 given_name: Jack
 family_name: Bergman
-gender: M
 birth_date: 1947-02-02
+gender: Male
+email: https://bergman.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001301.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-1
 offices:
 - classification: capitol
-  address: 566 Cannon House Office Building Washington DC 20515-2201
+  address: 566 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4735
 - classification: district
-  address: 1396 Douglas Drive Suite 22B; Traverse City, MI 49696
+  address: 125 G Ave. Suite B-119, Gwinn, MI 49841
+  voice: 906-273-2227
+- classification: district
+  address: 1396 Douglas Drive Suite 22B, Traverse City, MI 49696
   voice: 231-944-7633
-  name: 'District Office #1'
 - classification: district
-  address: 1500 W. Washington St. Suite 2; Marquette, MI 49855
-  voice: 906-273-2227
-  name: 'District Office #2'
+  address: 7676W County Road 442 Suite B, Manistique, MI 49854
+  voice: 906-286-4191
+- classification: district
+  address: P.O. Box 498, Oscoda, MI 48750
 links:
 - url: https://bergman.house.gov
   note: website
+- url: https://bergman.house.gov/
+other_names:
+- name: Bergman, J.
+- name: J. Bergman
+- name: J.W. Bergman
 ids:
   twitter: RepJackBergman
   facebook: RepJackBergman
@@ -75,3 +82,10 @@ other_identifiers:
   identifier: Jack Bergman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jack_Bergman
+- url: https://bergman.house.gov
+- url: https://en.wikipedia.org/wiki/Jack_Bergman
+- url: https://justfacts.votesmart.org/candidate/biography/170172/jack-bergman
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jack_bergman/412709
+- url: https://www.linkedin.com/in/jack-bergman-4467b010
diff --git a/data/us/legislature/Jack-Reed-e62576aa-1bf5-5664-ad0f-b1fdbcdead56.yml b/data/us/legislature/Jack-Reed-e62576aa-1bf5-5664-ad0f-b1fdbcdead56.yml
index cf8619e0d5..a758ae0b4f 100644
--- a/data/us/legislature/Jack-Reed-e62576aa-1bf5-5664-ad0f-b1fdbcdead56.yml
+++ b/data/us/legislature/Jack-Reed-e62576aa-1bf5-5664-ad0f-b1fdbcdead56.yml
@@ -1,82 +1,84 @@
 id: ocd-person/e62576aa-1bf5-5664-ad0f-b1fdbcdead56
 name: Jack Reed
-given_name: John
+given_name: Jack
 family_name: Reed
-middle_name: F.
-gender: M
 birth_date: 1949-11-12
+gender: Male
+email: https://www.reed.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/R000122.jpg
 party:
-- start_date: '1991-01-03'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: RI-2
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: RI-2
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: RI-2
-- start_date: '1997-01-07'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2009-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 1997-01-07
+  end_date: 2003-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
+- start_date: 1995-01-04
+  end_date: 1997-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: RI-2
+- start_date: 1993-01-05
+  end_date: 1995-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: RI-2
+- start_date: 1991-01-03
+  end_date: 1993-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: RI-2
 offices:
 - classification: capitol
-  address: 728 Hart Senate Office Building Washington DC 20510
+  address: 728 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4642
+  fax: 202-224-4680
 - classification: district
-  address: 1000 Chapel View Blvd. Suite 290; Cranston, RI 02920
+  address: 1000 Chapel View Blvd. Suite 290, Cranston, RI 02920
   voice: 401-943-3100
   fax: 401-464-6837
-  name: 'District Office #1'
 - classification: district
-  address: One Exchange Terrace Suite 408; Providence, RI 02903-1744
+  address: U.S. District Courthouse 1 Exchange Terrace, Suite 408, Providence, RI
+    02903
   voice: 401-528-5200
   fax: 202-224-4680
-  name: 'District Office #2'
 links:
 - url: https://www.reed.senate.gov
   note: website
 - url: https://www.reed.senate.gov/contact/
   note: contact form
+- url: https://www.reed.senate.gov/
+other_names:
+- name: J. Reed
+- name: J.F. Reed
+- name: John F. Reed
+- name: Reed (D-RI)
+- name: Reed, J.
 ids:
   twitter: SenJackReed
   youtube: UCT_aFVtsjxPwWKfO-PW_hPw
   facebook: SenJackReed
-other_names:
-- name: John F. Reed
-- name: Reed (D-RI)
 other_identifiers:
 - scheme: bioguide
   identifier: R000122
@@ -112,3 +114,10 @@ other_identifiers:
   identifier: kg:/m/0202mc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jack_Reed
+- url: https://en.wikipedia.org/wiki/Jack_Reed_(Rhode_Island_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/27060/jack-reed
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_reed/300081
+- url: https://www.reed.senate.gov
+- url: https://www.reed.senate.gov/about/jacks-story
diff --git a/data/us/legislature/Jacky-Rosen-2f7f8ec5-f652-5c47-8dcb-06d7bc54557c.yml b/data/us/legislature/Jacky-Rosen-2f7f8ec5-f652-5c47-8dcb-06d7bc54557c.yml
index 8d9c1d53c6..a3fc1f5c19 100644
--- a/data/us/legislature/Jacky-Rosen-2f7f8ec5-f652-5c47-8dcb-06d7bc54557c.yml
+++ b/data/us/legislature/Jacky-Rosen-2f7f8ec5-f652-5c47-8dcb-06d7bc54557c.yml
@@ -2,47 +2,49 @@ id: ocd-person/2f7f8ec5-f652-5c47-8dcb-06d7bc54557c
 name: Jacky Rosen
 given_name: Jacky
 family_name: Rosen
-gender: F
 birth_date: 1957-08-02
+gender: Female
+email: https://www.rosen.senate.gov/email-jacky/
 image: https://theunitedstates.io/images/congress/450x550/R000608.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: NV-3
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nevada
+- start_date: 2017-01-03
+  end_date: 2019-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NV-3
 offices:
 - classification: capitol
-  address: 713 Hart Senate Office Building Washington DC 20510
+  address: 713 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6244
 - classification: district
-  address: 8930 W Sunset Rd Suite 230; Las Vegas, NV 89148-5008
+  address: 333 S. Las Vegas Blvd. Suite 8203, Las Vegas, NV 89101
   voice: 702-388-0205
-  name: 'District Office #1'
 - classification: district
-  address: 400 S Virginia St Suite 738; Reno, NV 89501-2132
+  address: Bruce Thompson Federal Building 400 S. Virginia St., Suite 738, Reno, NV
+    89501
   voice: 775-337-0110
-  name: 'District Office #2'
 links:
 - url: https://www.rosen.senate.gov
   note: website
 - url: https://www.rosen.senate.gov/contact_jacky
   note: contact form
+- url: https://www.rosen.senate.gov/
+other_names:
+- name: J. Rosen
+- name: J.S. Rosen
+- name: Jacklyn Rosen
+- name: Rosen (D-NV)
+- name: Rosen, J.
 ids:
   twitter: SenJackyRosen
   facebook: RepJackyRosen
-other_names:
-- name: Rosen (D-NV)
-- name: Jacklyn Rosen
 other_identifiers:
 - scheme: bioguide
   identifier: R000608
@@ -72,3 +74,10 @@ other_identifiers:
   identifier: '21743'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jacky_Rosen
+- url: https://en.wikipedia.org/wiki/Jacky_Rosen
+- url: https://justfacts.votesmart.org/candidate/biography/169471/jacky-rosen
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jacky_rosen/412715
+- url: https://www.rosen.senate.gov
+- url: https://www.rosen.senate.gov/about-jacky
diff --git a/data/us/legislature/Jahana-Hayes-1d87ca8c-1a95-531f-bbdd-34e1679d45d2.yml b/data/us/legislature/Jahana-Hayes-1d87ca8c-1a95-531f-bbdd-34e1679d45d2.yml
index dc5520c08a..f8dd92ffd4 100644
--- a/data/us/legislature/Jahana-Hayes-1d87ca8c-1a95-531f-bbdd-34e1679d45d2.yml
+++ b/data/us/legislature/Jahana-Hayes-1d87ca8c-1a95-531f-bbdd-34e1679d45d2.yml
@@ -2,40 +2,43 @@ id: ocd-person/1d87ca8c-1a95-531f-bbdd-34e1679d45d2
 name: Jahana Hayes
 given_name: Jahana
 family_name: Hayes
-gender: F
 birth_date: 1973-03-08
+gender: Female
+email: https://hayes.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/H001081.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-5
 offices:
 - classification: capitol
-  address: 2458 Rayburn House Office Building Washington DC 20515-0705
+  address: 2458 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4476
 - classification: district
-  address: 108 Bank St 2nd Floor; Waterbury, CT 06702-2233
+  address: 108 Bank St., 2nd Floor, Waterbury, CT 06702
   voice: 860-223-8412
-  name: 'District Office #1'
 links:
 - url: https://hayes.house.gov
   note: website
+- url: https://hayes.house.gov/
+other_names:
+- name: Hayes, J.
+- name: J. Hayes
+- name: J.F. Hayes
 ids:
   twitter: RepJahanaHayes
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: kg:/g/11cn8wstn6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jahana_Hayes
+- url: https://en.wikipedia.org/wiki/Jahana_Hayes
+- url: https://hayes.house.gov
+- url: https://justfacts.votesmart.org/candidate/181744/jahana-hayes
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jahana_hayes/412763
+- url: https://www.linkedin.com/in/jahana-hayes-727b52164
diff --git a/data/us/legislature/Jake-Auchincloss-a68063b7-2ce8-5638-a836-4fa7b22b3432.yml b/data/us/legislature/Jake-Auchincloss-a68063b7-2ce8-5638-a836-4fa7b22b3432.yml
index 01df8f1c09..68a42cdc47 100644
--- a/data/us/legislature/Jake-Auchincloss-a68063b7-2ce8-5638-a836-4fa7b22b3432.yml
+++ b/data/us/legislature/Jake-Auchincloss-a68063b7-2ce8-5638-a836-4fa7b22b3432.yml
@@ -2,32 +2,42 @@ id: ocd-person/a68063b7-2ce8-5638-a836-4fa7b22b3432
 name: Jake Auchincloss
 given_name: Jake
 family_name: Auchincloss
-middle_name: Daniel
-gender: M
 birth_date: 1988-01-29
+gender: Male
+email: https://auchincloss.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/A000148.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-4
 offices:
 - classification: capitol
-  address: 1524 Longworth House Office Building Washington DC 20515-2104
+  address: 1524 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5931
+  fax: 202-225-0182
+- classification: district
+  address: 29 Crafts St. Suite 375, Newton, MA 02458
+  voice: 617-332-3333
+- classification: district
+  address: 8 N. Main St. Suite 200, Attleboro, MA 02703
+  voice: 508-431-1110
 links:
 - url: https://auchincloss.house.gov
   note: website
+- url: https://auchincloss.house.gov/
+other_names:
+- name: Auchincloss, J.
+- name: J. Auchincloss
+- name: J.D. Auchincloss
 ids:
   twitter: RepAuchincloss
 other_identifiers:
@@ -47,3 +57,10 @@ other_identifiers:
   identifier: kg:/g/11f0xw2_p4
 sources:
 - url: https://theunitedstates.io/
+- url: https://auchincloss.house.gov
+- url: https://ballotpedia.org/Jake_Auchincloss
+- url: https://en.wikipedia.org/wiki/Jake_Auchincloss
+- url: https://justfacts.votesmart.org/candidate/biography/173832/jake-auchincloss
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jake_auchincloss/456825
+- url: https://www.linkedin.com/in/auchincloss
diff --git a/data/us/legislature/Jake-Ellzey-7add5a36-095e-5209-b94f-71b436555100.yml b/data/us/legislature/Jake-Ellzey-7add5a36-095e-5209-b94f-71b436555100.yml
index cdf1736c9b..83292e7dce 100644
--- a/data/us/legislature/Jake-Ellzey-7add5a36-095e-5209-b94f-71b436555100.yml
+++ b/data/us/legislature/Jake-Ellzey-7add5a36-095e-5209-b94f-71b436555100.yml
@@ -2,31 +2,41 @@ id: ocd-person/7add5a36-095e-5209-b94f-71b436555100
 name: Jake Ellzey
 given_name: Jake
 family_name: Ellzey
-gender: M
 birth_date: 1970-01-24
+gender: Male
+email: https://ellzey.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/E000071.jpg
 party:
-- start_date: '2021-07-30'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-07-30'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-07-30
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-6
 offices:
 - classification: capitol
-  address: 1721 Longworth House Office Building Washington DC 20515-4306
+  address: 1721 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2002
+- classification: district
+  address: 122 N. Beaton St., Corsicana, TX 75110
+  voice: 903-602-7860
+- classification: district
+  address: 2001 Bates Drive Suite 100, Waxahachie, TX 75167
+  voice: 469-550-7150
 links:
 - url: https://ellzey.house.gov
   note: website
+- url: https://ellzey.house.gov/
+other_names:
+- name: Ellzey, J.
+- name: J. Ellzey
+- name: J.K. Ellzey
 ids:
   twitter: RepEllzey
 other_identifiers:
@@ -48,3 +58,10 @@ other_identifiers:
   identifier: kg:/g/11f0lw2cdc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jake_Ellzey
+- url: https://ellzey.house.gov
+- url: https://en.wikipedia.org/wiki/Jake_Ellzey
+- url: https://justfacts.votesmart.org/candidate/biography/147592/jake-ellzey
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jake_ellzey/456862
+- url: https://www.linkedin.com/in/jake-ellzey-0a253138
diff --git a/data/us/legislature/Jake-LaTurner-b4bfc55d-3cdd-5a6e-accf-912a2b2d28b8.yml b/data/us/legislature/Jake-LaTurner-b4bfc55d-3cdd-5a6e-accf-912a2b2d28b8.yml
index aa7a5a044e..1c0a0a7859 100644
--- a/data/us/legislature/Jake-LaTurner-b4bfc55d-3cdd-5a6e-accf-912a2b2d28b8.yml
+++ b/data/us/legislature/Jake-LaTurner-b4bfc55d-3cdd-5a6e-accf-912a2b2d28b8.yml
@@ -1,32 +1,42 @@
 id: ocd-person/b4bfc55d-3cdd-5a6e-accf-912a2b2d28b8
 name: Jake LaTurner
-given_name: Jacob
+given_name: Jake
 family_name: LaTurner
-gender: M
 birth_date: 1988-02-17
+gender: Male
+email: https://laturner.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000266.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-2
 offices:
 - classification: capitol
-  address: 2441 Rayburn House Office Building Washington DC 20515-1602
+  address: 2441 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6601
+- classification: district
+  address: 3550 SW 5th St. Suite B, Topeka, KS 66606
+  voice: 785-205-5253
+- classification: district
+  address: 402 N. Broadway St. Suite B, Pittsburg, KS 66762
+  voice: 620-308-7450
 links:
 - url: https://laturner.house.gov
   note: website
+- url: https://laturner.house.gov/
+other_names:
+- name: J. LaTurner
+- name: J.A.J. LaTurner
+- name: LaTurner, J.
 ids:
   twitter: RepLaTurner
 other_identifiers:
@@ -46,3 +56,10 @@ other_identifiers:
   identifier: kg:/m/0w32xrn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jacob_LaTurner
+- url: https://en.wikipedia.org/wiki/Jake_LaTurner
+- url: https://justfacts.votesmart.org/candidate/biography/107024/jacob-laturner
+- url: https://laturner.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jacob_laturner/456824
+- url: https://www.linkedin.com/in/jake-laturner-12912b180
diff --git a/data/us/legislature/Jamaal-Bowman-e79a7ea4-9fcd-5c43-99b3-68bee77eb928.yml b/data/us/legislature/Jamaal-Bowman-e79a7ea4-9fcd-5c43-99b3-68bee77eb928.yml
index 4914865e00..59831c1f5d 100644
--- a/data/us/legislature/Jamaal-Bowman-e79a7ea4-9fcd-5c43-99b3-68bee77eb928.yml
+++ b/data/us/legislature/Jamaal-Bowman-e79a7ea4-9fcd-5c43-99b3-68bee77eb928.yml
@@ -2,31 +2,42 @@ id: ocd-person/e79a7ea4-9fcd-5c43-99b3-68bee77eb928
 name: Jamaal Bowman
 given_name: Jamaal
 family_name: Bowman
-gender: M
 birth_date: 1976-04-01
+gender: Male
+email: https://bowman.house.gov/contact/email-us
 image: https://theunitedstates.io/images/congress/450x550/B001223.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-16
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-16
 offices:
 - classification: capitol
-  address: 345 Cannon House Office Building Washington DC 20515-3216
+  address: 345 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2464
+  fax: 202-225-5513
+- classification: district
+  address: 222 Mamaroneck Ave. Suite 312, White Plains, NY 10605
+  voice: 914-323-5550
+- classification: district
+  address: 6 Gramatan Ave. Suite 205, Mount Vernon, NY 10550
+  voice: 914-371-9220
 links:
 - url: https://bowman.house.gov
   note: website
+- url: https://bowman.house.gov/
+other_names:
+- name: Bowman, J.
+- name: J. Bowman
+- name: J.A. Bowman
 ids:
   twitter: RepBowman
 other_identifiers:
@@ -48,3 +59,9 @@ other_identifiers:
   identifier: Jamaal Bowman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jamaal_Bowman
+- url: https://bowman.house.gov
+- url: https://en.wikipedia.org/wiki/Jamaal_Bowman
+- url: https://justfacts.votesmart.org/candidate/biography/191205/jamaal-bowman
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jamaal_bowman/456839
diff --git a/data/us/legislature/James-A-Himes-e1a8d4da-7cbd-571e-817d-774ff06bb342.yml b/data/us/legislature/James-A-Himes-e1a8d4da-7cbd-571e-817d-774ff06bb342.yml
index 15855d52d4..dba352d9f0 100644
--- a/data/us/legislature/James-A-Himes-e1a8d4da-7cbd-571e-817d-774ff06bb342.yml
+++ b/data/us/legislature/James-A-Himes-e1a8d4da-7cbd-571e-817d-774ff06bb342.yml
@@ -1,73 +1,75 @@
 id: ocd-person/e1a8d4da-7cbd-571e-817d-774ff06bb342
-name: James A. Himes
-given_name: James
+name: Jim Himes
+given_name: Jim
 family_name: Himes
-middle_name: A.
-gender: M
 birth_date: 1966-07-05
+gender: Male
+email: https://himes.house.gov/email-me-about-legislation
 image: https://theunitedstates.io/images/congress/450x550/H001047.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-4
 offices:
 - classification: capitol
-  address: 2137 Rayburn House Office Building Washington DC 20515-0704
+  address: 2137 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5541
 - classification: district
-  address: 211 State St. 2nd Floor; Bridgeport, CT 06604
+  address: 350 Fairfield Ave. Suite 603, Bridgeport, CT 06604
   voice: 203-333-6600
   fax: 203-333-6655
-  name: 'District Office #1'
 - classification: district
-  address: 888 Washington Blvd. 10th Floor; Stamford, CT 06901
+  address: 888 Washington Blvd. 10th Floor, Stamford, CT 06901
   voice: 203-353-9400
   fax: 203-323-1793
-  name: 'District Office #2'
 links:
 - url: https://himes.house.gov
   note: website
+- url: https://himes.house.gov/
+other_names:
+- name: Himes, J.
+- name: J. Himes
+- name: J.A. Himes
+- name: James A. Himes
 ids:
   youtube: UCCeB6czh6nhCHxOMCk_V4yA
   facebook: CongressmanJimHimes
@@ -102,3 +104,10 @@ other_identifiers:
   identifier: kg:/m/03w9x9v
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_Himes
+- url: https://en.wikipedia.org/wiki/Jim_Himes
+- url: https://himes.house.gov
+- url: https://justfacts.votesmart.org/candidate/106744/jim-himes
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_himes/412282
+- url: https://www.linkedin.com/in/jim-himes-8919222b
diff --git a/data/us/legislature/James-C-Moylan-4f6d6ecb-8f69-5f40-9965-ac5fab1e3dba.yml b/data/us/legislature/James-C-Moylan-4f6d6ecb-8f69-5f40-9965-ac5fab1e3dba.yml
index 50b7e433f8..f78bd486cb 100644
--- a/data/us/legislature/James-C-Moylan-4f6d6ecb-8f69-5f40-9965-ac5fab1e3dba.yml
+++ b/data/us/legislature/James-C-Moylan-4f6d6ecb-8f69-5f40-9965-ac5fab1e3dba.yml
@@ -1,28 +1,35 @@
 id: ocd-person/4f6d6ecb-8f69-5f40-9965-ac5fab1e3dba
-name: James C. Moylan
-given_name: James (Jim)
+name: Jim Moylan
+given_name: Jim
 family_name: Moylan
-middle_name: Camacho
-gender: M
 birth_date: 1962-07-18
+gender: Male
+email: https://moylan.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001219.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GU-AL
 offices:
 - classification: capitol
-  address: 1628 Longworth House Office Building Washington DC 20515-5301
+  address: 1628 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-1188
+- classification: district
+  address: 330 Hernan Cortez Ave. Suite 300, Hagatna, GU 96910
+  voice: 671-922-6673
 links:
 - url: https://moylan.house.gov
   note: website
+- url: https://moylan.house.gov/
+other_names:
+- name: J. Moylan
+- name: J.C. Moylan
+- name: James C. Moylan
+- name: Moylan, J.
 other_identifiers:
 - scheme: bioguide
   identifier: M001219
@@ -40,3 +47,9 @@ other_identifiers:
   identifier: James Moylan
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/James_Moylan
+- url: https://en.wikipedia.org/wiki/James_Moylan
+- url: https://justfacts.votesmart.org/candidate/biography/209781/james-moylan
+- url: https://moylan.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_jim_moylan/456896
diff --git a/data/us/legislature/James-Comer-57b0c699-cef2-5740-bd15-4ad2562f8975.yml b/data/us/legislature/James-Comer-57b0c699-cef2-5740-bd15-4ad2562f8975.yml
index 5bda905f18..baae229198 100644
--- a/data/us/legislature/James-Comer-57b0c699-cef2-5740-bd15-4ad2562f8975.yml
+++ b/data/us/legislature/James-Comer-57b0c699-cef2-5740-bd15-4ad2562f8975.yml
@@ -2,58 +2,63 @@ id: ocd-person/57b0c699-cef2-5740-bd15-4ad2562f8975
 name: James Comer
 given_name: James
 family_name: Comer
-gender: M
 birth_date: 1972-08-19
+gender: Male
+email: https://comer.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/C001108.jpg
 party:
-- start_date: '2016-11-14'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2016-11-14'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2016-11-14
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-1
 offices:
 - classification: capitol
-  address: 2410 Rayburn House Office Building Washington DC 20515-1701
+  address: 2410 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3115
+  fax: 202-225-3547
 - classification: district
-  address: 300 S. 3rd St.; Paducah, KY 42003
-  voice: 270-408-1865
-  name: 'District Office #1'
+  address: 141 N. 3rd St. Suite 5, Danville, KY 40422
+  voice: 859-439-5844
 - classification: district
-  address: 200 N. Main St. Suite F; Tompkinsville, KY 42167
+  address: 200 N. Main St. Suite F, Tompkinsville, KY 42167
   voice: 270-487-9509
-  name: 'District Office #2'
 - classification: district
-  address: 67 North Main St.; Madisonville, KY 42431
+  address: 300 S. 3rd St., Paducah, KY 42003
+  voice: 270-408-1865
+- classification: district
+  address: 67 N. Main St., Madisonville, KY 42431
   voice: 270-487-9509
-  name: 'District Office #3'
 links:
 - url: https://comer.house.gov
   note: website
+- url: https://comer.house.gov/
+other_names:
+- name: Comer, J.
+- name: J. Comer
+- name: J.R. Comer
 ids:
   twitter: RepJamesComer
   facebook: congressmancomer
@@ -84,3 +89,10 @@ other_identifiers:
   identifier: '21565'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/James_Comer_Jr.
+- url: https://comer.house.gov
+- url: https://comer.house.gov/about
+- url: https://en.wikipedia.org/wiki/James_Comer_(politician)
+- url: https://jamescomer.com/about
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/james-comer-3767a227
diff --git a/data/us/legislature/James-E-Clyburn-e24e02a4-f70c-5b9e-84e2-eda2d153f80f.yml b/data/us/legislature/James-E-Clyburn-e24e02a4-f70c-5b9e-84e2-eda2d153f80f.yml
index 43ebdb302b..cbbbbe34b9 100644
--- a/data/us/legislature/James-E-Clyburn-e24e02a4-f70c-5b9e-84e2-eda2d153f80f.yml
+++ b/data/us/legislature/James-E-Clyburn-e24e02a4-f70c-5b9e-84e2-eda2d153f80f.yml
@@ -1,118 +1,120 @@
 id: ocd-person/e24e02a4-f70c-5b9e-84e2-eda2d153f80f
-name: James E. Clyburn
-given_name: James
+name: Jim Clyburn
+given_name: Jim
 family_name: Clyburn
-middle_name: E.
-gender: M
 birth_date: 1940-07-21
+gender: Male
+email: https://clyburn.house.gov/contact-me/email-me
 image: https://theunitedstates.io/images/congress/450x550/C000537.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-6
 offices:
 - classification: capitol
-  address: 274 Cannon House Office Building Washington DC 20515-4006
+  address: 274 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3315
+  fax: 202-225-2313
 - classification: district
-  address: 1225 Lady St. Suite 200; Columbia, SC 29201
+  address: 1225 Lady St. Suite 200, Columbia, SC 29201
   voice: 803-799-1100
   fax: 803-799-9060
-  name: 'District Office #1'
 - classification: district
-  address: 130 W. Main St.; Kingstree, SC 29556
+  address: 130 W. Main St., Kingstree, SC 29556
   voice: 843-355-1211
   fax: 843-355-1232
-  name: 'District Office #2'
 - classification: district
-  address: 176 Brooks Blvd.; Santee, SC 29142
+  address: 176 Municipal Way, Santee, SC 29142
   voice: 803-854-4700
   fax: 803-854-4900
-  name: 'District Office #3'
 links:
 - url: https://clyburn.house.gov
   note: website
+- url: https://clyburn.house.gov/
+other_names:
+- name: Clyburn, J.
+- name: J. Clyburn
+- name: J.E. Clyburn
+- name: James E. Clyburn
 ids:
   twitter: RepJamesClyburn
   youtube: UCIyU_UA_JEa14gvAwhquKqg
@@ -148,3 +150,9 @@ other_identifiers:
   identifier: kg:/m/03c469
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/James_Clyburn
+- url: https://clyburn.house.gov
+- url: https://en.wikipedia.org/wiki/Jim_Clyburn
+- url: https://justfacts.votesmart.org/candidate/biography/27066/jim-clyburn
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_clyburn/400075
diff --git a/data/us/legislature/James-E-Risch-e8bb2501-1603-543f-9667-9089f781aa97.yml b/data/us/legislature/James-E-Risch-e8bb2501-1603-543f-9667-9089f781aa97.yml
index 3e24899931..5059c36d17 100644
--- a/data/us/legislature/James-E-Risch-e8bb2501-1603-543f-9667-9089f781aa97.yml
+++ b/data/us/legislature/James-E-Risch-e8bb2501-1603-543f-9667-9089f781aa97.yml
@@ -1,76 +1,74 @@
 id: ocd-person/e8bb2501-1603-543f-9667-9089f781aa97
-name: James E. Risch
-given_name: James
+name: Jim Risch
+given_name: Jim
 family_name: Risch
-middle_name: E.
-gender: M
 birth_date: 1943-05-03
+gender: Male
+email: https://www.risch.senate.gov/public/index.cfm/email
 image: https://theunitedstates.io/images/congress/450x550/R000584.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
 offices:
 - classification: capitol
-  address: 483 Russell Senate Office Building Washington DC 20510
+  address: 483 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-2752
+  fax: 202-224-2573
 - classification: district
-  address: 350 N. 9th St. Suite 302; Boise, ID 83702
-  voice: 208-342-7985
-  fax: 208-343-2458
-  name: 'District Office #1'
-- classification: district
-  address: 610 Hubbard Suite 213; Coeur d'Alene, ID 83814
-  voice: 208-667-6130
-  fax: 208-765-1743
-  name: 'District Office #2'
+  address: 1411 Falls Ave. East Suite 201, Twin Falls, ID 83301
+  voice: 208-734-6780
+  fax: 208-734-3905
 - classification: district
-  address: 901 Pier View Dr. Suite 202A; Idaho Falls, ID 83402
-  voice: 208-523-5541
-  fax: 208-523-9373
-  name: 'District Office #3'
+  address: 275 S. 5th Ave. Suite 144, Pocatello, ID 83201
+  voice: 208-236-6817
+  fax: 208-236-6820
 - classification: district
-  address: 313 D St. Suite 106; Lewiston, ID 83501
+  address: 313 D St. Suite 106, Lewiston, ID 83501
   voice: 208-743-0792
   fax: 208-746-7275
-  name: 'District Office #4'
 - classification: district
-  address: 275 S. 5th Ave. Suite 290; Pocatello, ID 83201
-  voice: 208-236-6817
-  fax: 208-236-6820
-  name: 'District Office #5'
+  address: 350 N. 9th St. Suite 302, Boise, ID 83702
+  voice: 208-342-7985
+  fax: 208-343-2458
 - classification: district
-  address: 1411 Falls Avenue East Suite 201; Twin Falls, ID 83301
-  voice: 208-734-6780
-  fax: 208-734-3905
-  name: 'District Office #6'
+  address: 901 Pier View Drive Suite 202A, Idaho Falls, ID 83402
+  voice: 208-523-5541
+  fax: 208-523-9373
+- classification: district
+  address: Harbor Plaza 610 Hubbard St., Suite 213, Coeur d'Alene, ID 83814
+  voice: 208-667-6130
+  fax: 208-765-1743
 links:
 - url: https://www.risch.senate.gov
   note: website
 - url: https://www.risch.senate.gov/public/index.cfm?p=Email
   note: contact form
+- url: https://www.risch.senate.gov/
+other_names:
+- name: J. Risch
+- name: J.E. Risch
+- name: James E. Risch
+- name: Risch (R-ID)
+- name: Risch, J.
 ids:
   twitter: SenatorRisch
   youtube: UCncKW8xyT5UbPNO27YuQnBA
   facebook: senatorjimrisch
-other_names:
-- name: Risch (R-ID)
 other_identifiers:
 - scheme: bioguide
   identifier: R000584
@@ -102,3 +100,11 @@ other_identifiers:
   identifier: kg:/m/06y9p0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_Risch
+- url: https://en.wikipedia.org/wiki/Jim_Risch
+- url: https://justfacts.votesmart.org/candidate/2919/james-risch
+- url: https://senatorrisch.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_risch/412322
+- url: https://www.risch.senate.gov
+- url: https://www.risch.senate.gov/public/index.cfm/biography
diff --git a/data/us/legislature/James-Lankford-62a44404-9be2-5bbc-b672-0ed5f1aba53d.yml b/data/us/legislature/James-Lankford-62a44404-9be2-5bbc-b672-0ed5f1aba53d.yml
index 86ec9f12a2..7ca7bbf71e 100644
--- a/data/us/legislature/James-Lankford-62a44404-9be2-5bbc-b672-0ed5f1aba53d.yml
+++ b/data/us/legislature/James-Lankford-62a44404-9be2-5bbc-b672-0ed5f1aba53d.yml
@@ -2,62 +2,63 @@ id: ocd-person/62a44404-9be2-5bbc-b672-0ed5f1aba53d
 name: James Lankford
 given_name: James
 family_name: Lankford
-gender: M
 birth_date: 1968-03-04
+gender: Male
+email: https://www.lankford.senate.gov/contact/email/
 image: https://theunitedstates.io/images/congress/450x550/L000575.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: OK-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oklahoma
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oklahoma
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oklahoma
+- start_date: 2013-01-03
+  end_date: 2015-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: OK-5
+- start_date: 2011-01-05
+  end_date: 2013-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: OK-5
 offices:
 - classification: capitol
-  address: 316 Hart Senate Office Building Washington DC 20510
+  address: 316 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5754
 - classification: district
-  address: 1015 N. Broadway Ave. Suite 310; Oklahoma City, OK 73102
+  address: 1015 N. Broadway Ave. Suite 310, Oklahoma City, OK 73102
   voice: 405-231-4941
-  name: 'District Office #1'
 - classification: district
-  address: 224 South Boulder Suite 210; Tulsa, OK 74103
+  address: 401 S. Boston Ave. Suite 2150, Tulsa, OK 74103
   voice: 918-581-7651
-  name: 'District Office #2'
 links:
 - url: https://www.lankford.senate.gov
   note: website
 - url: https://www.lankford.senate.gov/contact/email
   note: contact form
+- url: https://www.lankford.senate.gov/
+other_names:
+- name: J. Lankford
+- name: J.P. Lankford
+- name: Lankford (R-OK)
+- name: Lankford, J.
 ids:
   twitter: SenatorLankford
   youtube: UCz8T6sK5fEycyWmVz6Vpe5Q
   facebook: SenatorLankford
-other_names:
-- name: Lankford (R-OK)
 other_identifiers:
 - scheme: bioguide
   identifier: L000575
@@ -93,3 +94,10 @@ other_identifiers:
   identifier: kg:/m/0dgrrx6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/James_Lankford
+- url: https://en.wikipedia.org/wiki/James_Lankford
+- url: https://justfacts.votesmart.org/candidate/124938/james-lankford
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_lankford/412464
+- url: https://www.lankford.senate.gov
+- url: https://www.linkedin.com/in/james-lankford-8001418b
diff --git a/data/us/legislature/James-P-McGovern-d44223bc-5f00-56aa-be61-28b5a3b4429d.yml b/data/us/legislature/James-P-McGovern-d44223bc-5f00-56aa-be61-28b5a3b4429d.yml
index 089c48c7b3..25b94d65fa 100644
--- a/data/us/legislature/James-P-McGovern-d44223bc-5f00-56aa-be61-28b5a3b4429d.yml
+++ b/data/us/legislature/James-P-McGovern-d44223bc-5f00-56aa-be61-28b5a3b4429d.yml
@@ -1,108 +1,110 @@
 id: ocd-person/d44223bc-5f00-56aa-be61-28b5a3b4429d
-name: James P. McGovern
-given_name: James
+name: Jim McGovern
+given_name: Jim
 family_name: McGovern
-middle_name: P.
-gender: M
 birth_date: 1959-11-20
+gender: Male
+email: https://mcgovern.house.gov/contact/zip-auth.htm
 image: https://theunitedstates.io/images/congress/450x550/M000312.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: MA-2
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: MA-2
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: MA-2
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: MA-2
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: MA-2
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: MA-2
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: MA-3
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: MA-3
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: MA-3
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: MA-3
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: MA-3
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
+  district: MA-3
 offices:
 - classification: capitol
-  address: 370 Cannon House Office Building Washington DC 20515-2102
+  address: 370 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6101
+  fax: 202-225-5759
 - classification: district
-  address: 24 Church St. Room 27; Leominster, MA 01453
+  address: 12 E. Worcester St. Suite 1, Worcester, MA 01604
+  voice: 508-831-7356
+  fax: 508-754-0982
+- classification: district
+  address: 24 Church St. Room 27, Leominster, MA 01453
   voice: 978-466-3552
   fax: 978-466-3973
-  name: 'District Office #1'
 - classification: district
-  address: 94 Pleasant St.; Northampton, MA 01060
+  address: 94 Pleasant St., Northampton, MA 01060
   voice: 413-341-8700
   fax: 413-584-1216
-  name: 'District Office #2'
-- classification: district
-  address: 12 E. Worcester St. Suite 1; Worcester, MA 01604
-  voice: 508-831-7356
-  fax: 508-754-0982
-  name: 'District Office #3'
 links:
 - url: https://mcgovern.house.gov
   note: website
+- url: https://mcgovern.house.gov/
+other_names:
+- name: J. McGovern
+- name: J.P. McGovern
+- name: James P. McGovern
+- name: McGovern, J.
 ids:
   twitter: RepMcGovern
   youtube: UCpiUqp2ZF64tXqgR_EQo27g
@@ -138,3 +140,11 @@ other_identifiers:
   identifier: Jim McGovern (Massachusetts)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_McGovern_(Massachusetts)
+- url: https://en.wikipedia.org/wiki/Jim_McGovern_%28American_politician%29
+- url: https://justfacts.votesmart.org/candidate/552/jim-mcgovern
+- url: https://mcgovern.house.gov
+- url: https://mcgovern.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_mcgovern/400263
+- url: https://www.jimmcgovern.com/about
diff --git a/data/us/legislature/James-R-Baird-749232ec-b66c-5bd7-b828-10a466b95f0a.yml b/data/us/legislature/James-R-Baird-749232ec-b66c-5bd7-b828-10a466b95f0a.yml
index c30079cb7a..373569949c 100644
--- a/data/us/legislature/James-R-Baird-749232ec-b66c-5bd7-b828-10a466b95f0a.yml
+++ b/data/us/legislature/James-R-Baird-749232ec-b66c-5bd7-b828-10a466b95f0a.yml
@@ -1,42 +1,47 @@
 id: ocd-person/749232ec-b66c-5bd7-b828-10a466b95f0a
-name: James R. Baird
-given_name: James
+name: Jim Baird
+given_name: Jim
 family_name: Baird
-middle_name: R.
-gender: M
 birth_date: 1945-06-04
+gender: Male
+email: https://baird.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001307.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-4
 offices:
 - classification: capitol
-  address: 2303 Rayburn House Office Building Washington DC 20515-1404
+  address: 2303 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5037
+  fax: 202-226-0544
 - classification: district
-  address: 355 S Washington St Suite 210; Danville, IN 46122-1779
+  address: 355 S. Washington St. Suite 210, Danville, IN 46122
   voice: 317-563-5567
-  name: 'District Office #1'
 links:
 - url: https://baird.house.gov
   note: website
+- url: https://iga.in.gov/legislative/2018/legislators/legislator_james_baird_1029/
+- url: https://baird.house.gov/
+other_names:
+- name: Baird, J.
+- name: J. Baird
+- name: J.R. Baird
+- name: James R. Baird
 ids:
   twitter: RepJimBaird
 other_identifiers:
@@ -62,3 +67,11 @@ other_identifiers:
   identifier: kg:/g/11gfd5wndr
 sources:
 - url: https://theunitedstates.io/
+- url: https://baird.house.gov
+- url: https://ballotpedia.org/James_Baird
+- url: https://en.wikipedia.org/wiki/James_Baird_(Indiana_politician)
+- url: https://iga.in.gov/legislative/2018/legislators/legislator_james_baird_1029
+- url: https://justfacts.votesmart.org/candidate/biography/86013/jim-baird
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/james_baird/412777
+- url: https://www.linkedin.com/in/jim-baird-8391a72a
diff --git a/data/us/legislature/Jamie-Raskin-289b4cb5-a838-5b08-8f74-e06d4d251ae7.yml b/data/us/legislature/Jamie-Raskin-289b4cb5-a838-5b08-8f74-e06d4d251ae7.yml
index 210be4eec3..ea21efe014 100644
--- a/data/us/legislature/Jamie-Raskin-289b4cb5-a838-5b08-8f74-e06d4d251ae7.yml
+++ b/data/us/legislature/Jamie-Raskin-289b4cb5-a838-5b08-8f74-e06d4d251ae7.yml
@@ -2,45 +2,48 @@ id: ocd-person/289b4cb5-a838-5b08-8f74-e06d4d251ae7
 name: Jamie Raskin
 given_name: Jamie
 family_name: Raskin
-gender: M
 birth_date: 1962-12-13
+gender: Male
+email: https://raskin.house.gov/email-jamie
 image: https://theunitedstates.io/images/congress/450x550/R000606.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-8
 offices:
 - classification: capitol
-  address: 2242 Rayburn House Office Building Washington DC 20515-2008
+  address: 2242 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5341
 - classification: district
-  address: 51 Monroe St. Suite 503; Rockville, MD 20850
+  address: 51 Monroe St. Suite 503, Rockville, MD 20850
   voice: 301-354-1000
-  name: 'District Office #1'
 links:
 - url: https://raskin.house.gov
   note: website
+- url: https://raskin.house.gov/
+other_names:
+- name: J. Raskin
+- name: J.B. Raskin
+- name: Raskin, J.
 ids:
   twitter: RepRaskin
   youtube: UChxDE6vho5BfBTOqiBsDmKg
@@ -72,3 +75,10 @@ other_identifiers:
   identifier: Jamie Raskin
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jamie_Raskin
+- url: https://en.wikipedia.org/wiki/Jamie_Raskin
+- url: https://justfacts.votesmart.org/candidate/biography/65904/jamie-raskin
+- url: https://raskin.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jamie_raskin/412708
+- url: https://www.linkedin.com/in/raskinjamie
diff --git a/data/us/legislature/Janice-D-Schakowsky-c5e8693c-dca3-5ff7-b456-e71d944e4fb0.yml b/data/us/legislature/Janice-D-Schakowsky-c5e8693c-dca3-5ff7-b456-e71d944e4fb0.yml
index 99bad9f192..03cc2d7622 100644
--- a/data/us/legislature/Janice-D-Schakowsky-c5e8693c-dca3-5ff7-b456-e71d944e4fb0.yml
+++ b/data/us/legislature/Janice-D-Schakowsky-c5e8693c-dca3-5ff7-b456-e71d944e4fb0.yml
@@ -1,103 +1,97 @@
 id: ocd-person/c5e8693c-dca3-5ff7-b456-e71d944e4fb0
-name: Janice D. Schakowsky
-given_name: Janice
+name: Jan Schakowsky
+given_name: Jan
 family_name: Schakowsky
-middle_name: D.
-gender: F
 birth_date: 1944-05-26
+gender: Female
+email: https://schakowsky.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001145.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-9
 offices:
 - classification: capitol
-  address: 2408 Rayburn House Office Building Washington DC 20515-1309
+  address: 2408 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2111
+  fax: 202-226-6890
 - classification: district
-  address: 1852 Johns Dr.; Glenview, IL 60025
-  voice: 847-328-3409
-  fax: 847-328-3425
-  name: 'District Office #1'
-- classification: district
-  address: 5533 N. Broadway; Chicago, IL 60640
+  address: 4500 Oakton St., Skokie, IL 60076
   voice: 773-506-7100
-  fax: 773-506-9202
-  name: 'District Office #2'
-- classification: district
-  address: 820 Davis St. Suite 105; Evanston, IL 60201
-  voice: 847-328-3409
-  fax: 847-328-3425
-  name: 'District Office #3'
+  fax: 202-226-6890
 links:
 - url: https://schakowsky.house.gov
   note: website
+- url: https://schakowsky.house.gov/
+other_names:
+- name: J. Schakowsky
+- name: J.D. Schakowsky
+- name: Janice D. Schakowsky
+- name: Schakowsky, J.
 ids:
   twitter: JanSchakowsky
   youtube: UCuCHHPSENUEaaeH8n_CYDXQ
@@ -133,3 +127,10 @@ other_identifiers:
   identifier: kg:/m/0256nw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jan_Schakowsky
+- url: https://en.wikipedia.org/wiki/Jan_Schakowsky
+- url: https://justfacts.votesmart.org/candidate/6387/jan-schakowsky
+- url: https://schakowsky.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/janice_schakowsky/400360
+- url: https://www.linkedin.com/in/jan-schakowsky-59053413
diff --git a/data/us/legislature/Jared-F-Golden-3c47a44a-29b8-5aa1-b61a-9e49ea0caf99.yml b/data/us/legislature/Jared-F-Golden-3c47a44a-29b8-5aa1-b61a-9e49ea0caf99.yml
index 464e5ede18..bcf6a29c23 100644
--- a/data/us/legislature/Jared-F-Golden-3c47a44a-29b8-5aa1-b61a-9e49ea0caf99.yml
+++ b/data/us/legislature/Jared-F-Golden-3c47a44a-29b8-5aa1-b61a-9e49ea0caf99.yml
@@ -1,54 +1,58 @@
 id: ocd-person/3c47a44a-29b8-5aa1-b61a-9e49ea0caf99
-name: Jared F. Golden
+name: Jared Golden
 given_name: Jared
 family_name: Golden
-middle_name: Forrest
-gender: M
 birth_date: 1982-07-25
+gender: Male
+email: https://golden.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000592.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ME-2
 offices:
 - classification: capitol
-  address: 1710 Longworth House Office Building Washington DC 20515-1902
+  address: 1710 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6306
+  fax: 202-225-2943
 - classification: district
-  address: 6 State St Suite 101; Bangor, ME 04401-5112
+  address: 179 Lisbon St., Lewiston, ME 04240
+  voice: 207-241-6767
+  fax: 771-200-5805
+- classification: district
+  address: 6 State St., Suite 101, Bangor, ME 04401
   voice: 207-249-7400
-  name: 'District Office #1'
+  fax: 771-200-5805
 - classification: district
-  address: 7 Hatch Dr Suite 230; Caribou, ME 04736-2159
+  address: 7 Hatch Drive Suite 230, Caribou, ME 04736
   voice: 207-492-6009
-  name: 'District Office #2'
-- classification: district
-  address: 179 Lisbon St; Lewiston, ME 04240-7248
-  voice: 207-241-6767
-  name: 'District Office #3'
+  fax: 771-200-5805
 links:
 - url: https://golden.house.gov
   note: website
-ids:
-  twitter: RepGolden
+- url: https://golden.house.gov/
 other_names:
 - name: Golden (ME)
+- name: Golden, J.
+- name: J. Golden
+- name: J.F. Golden
+- name: Jared F. Golden
+ids:
+  twitter: RepGolden
 other_identifiers:
 - scheme: bioguide
   identifier: G000592
@@ -72,3 +76,11 @@ other_identifiers:
   identifier: kg:/g/11f1224576
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jared_Golden
+- url: https://en.wikipedia.org/wiki/Jared_Golden
+- url: https://golden.house.gov
+- url: https://golden.house.gov/about
+- url: https://jaredgoldenforcongress.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/151420/jared-golden
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jared_golden/412842
diff --git a/data/us/legislature/Jared-Huffman-c2b08e7d-2372-5af6-b333-7ea2787cb3ca.yml b/data/us/legislature/Jared-Huffman-c2b08e7d-2372-5af6-b333-7ea2787cb3ca.yml
index 495d0c25f6..66c5ef4418 100644
--- a/data/us/legislature/Jared-Huffman-c2b08e7d-2372-5af6-b333-7ea2787cb3ca.yml
+++ b/data/us/legislature/Jared-Huffman-c2b08e7d-2372-5af6-b333-7ea2787cb3ca.yml
@@ -2,75 +2,75 @@ id: ocd-person/c2b08e7d-2372-5af6-b333-7ea2787cb3ca
 name: Jared Huffman
 given_name: Jared
 family_name: Huffman
-gender: M
 birth_date: 1964-02-18
+gender: Male
+email: https://huffman.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/H001068.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-2
 offices:
 - classification: capitol
-  address: 2445 Rayburn House Office Building Washington DC 20515-0502
+  address: 2445 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5161
+  fax: 202-225-5163
 - classification: district
-  address: 317 Third St. Suite 1; Eureka, CA 95501
+  address: 200 S. School St., Ukiah, CA 95482
+  voice: 707-671-7449
+  fax: 707-962-0905
+- classification: district
+  address: 206 G St. Unit 3, Petaluma, CA 94952
+  voice: 707-981-8967
+- classification: district
+  address: 317 3rd St. Suite 1, Eureka, CA 95501
   voice: 707-407-3585
   fax: 707-407-3559
-  name: 'District Office #1'
 - classification: district
-  address: 430 N. Franklin St. P.O. Box 2208; Fort Bragg, CA 95437
+  address: 430 N. Franklin St., Fort Bragg, CA 95437
   voice: 707-962-0933
   fax: 707-962-0905
-  name: 'District Office #2'
 - classification: district
-  address: '206 G St. Unit #3; Petaluma, CA 94952'
-  voice: 707-981-8967
-  name: 'District Office #3'
-- classification: district
-  address: 999 Fifth Ave. Suite 290; San Rafael, CA 94901
+  address: 999 5th Ave. Suite 290, San Rafael, CA 94901
   voice: 415-258-9657
   fax: 415-258-9913
-  name: 'District Office #4'
-- classification: district
-  address: 559 Low Gap Rd.; Ukiah, CA 95482
-  voice: 707-962-0905
-  fax: 707-671-7449
-  name: 'District Office #5'
 links:
 - url: https://huffman.house.gov
   note: website
+- url: https://huffman.house.gov/
+other_names:
+- name: Huffman, J.
+- name: J. Huffman
+- name: J.W. Huffman
 ids:
   twitter: RepHuffman
   youtube: UCJU6SP1ppp1ZhSiqZLiFgDA
@@ -104,3 +104,8 @@ other_identifiers:
   identifier: kg:/m/0ksfyx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jared_Huffman
+- url: https://en.wikipedia.org/wiki/Jared_Huffman
+- url: https://huffman.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jared_huffman/412511
diff --git a/data/us/legislature/Jared-Moskowitz-356c2159-c402-51d8-b4eb-697aaff46dc2.yml b/data/us/legislature/Jared-Moskowitz-356c2159-c402-51d8-b4eb-697aaff46dc2.yml
index 910e7f645c..05d60156b2 100644
--- a/data/us/legislature/Jared-Moskowitz-356c2159-c402-51d8-b4eb-697aaff46dc2.yml
+++ b/data/us/legislature/Jared-Moskowitz-356c2159-c402-51d8-b4eb-697aaff46dc2.yml
@@ -2,27 +2,40 @@ id: ocd-person/356c2159-c402-51d8-b4eb-697aaff46dc2
 name: Jared Moskowitz
 given_name: Jared
 family_name: Moskowitz
-middle_name: Evan
-gender: M
 birth_date: 1980-12-18
+gender: Male
+email: https://moskowitz.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M001217.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-23
 offices:
 - classification: capitol
-  address: 1130 Longworth House Office Building Washington DC 20515-0923
+  address: 1130 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3001
+- classification: district
+  address: 111 E. Las Olas Blvd., Fifth Floor, Fort Lauderdale, FL 33301
+  voice: 754-240-6330
+- classification: district
+  address: 9500 W. Sample Road Suite 201, Coral Springs, FL 33065
+  voice: 754-240-6330
+- classification: district
+  address: Florida Atlantic University Administration Building 777 Glades Road Room
+    278, Boca Raton, FL 33431
+  voice: 754-240-6330
 links:
 - url: https://moskowitz.house.gov
   note: website
+- url: https://moskowitz.house.gov/
+other_names:
+- name: J. Moskowitz
+- name: J.E. Moskowitz
+- name: Moskowitz, J.
 ids:
   twitter: RepMoskowitz
 other_identifiers:
@@ -42,3 +55,11 @@ other_identifiers:
   identifier: '138155'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jared_Moskowitz
+- url: https://en.wikipedia.org/wiki/Jared_Moskowitz
+- url: https://jaredforflorida.com/about
+- url: https://justfacts.votesmart.org/candidate/138155/jared-moskowitz
+- url: https://moskowitz.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jared_moskowitz/456893
+- url: https://www.linkedin.com/in/jared-moskowitz-6a073410b
diff --git a/data/us/legislature/Jasmine-Crockett-fafd6715-85a1-509b-98d1-6df68904f028.yml b/data/us/legislature/Jasmine-Crockett-fafd6715-85a1-509b-98d1-6df68904f028.yml
index 3e95ddb1e2..3a61199124 100644
--- a/data/us/legislature/Jasmine-Crockett-fafd6715-85a1-509b-98d1-6df68904f028.yml
+++ b/data/us/legislature/Jasmine-Crockett-fafd6715-85a1-509b-98d1-6df68904f028.yml
@@ -2,27 +2,33 @@ id: ocd-person/fafd6715-85a1-509b-98d1-6df68904f028
 name: Jasmine Crockett
 given_name: Jasmine
 family_name: Crockett
-middle_name: Felicia
-gender: F
 birth_date: 1981-03-29
+gender: Female
+email: https://crockett.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001130.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-30
 offices:
 - classification: capitol
-  address: 1616 Longworth House Office Building Washington DC 20515-4330
+  address: 1616 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-8885
+- classification: district
+  address: 1825 Market Center Blvd. Suite 440, Dallas, TX 75207
+  voice: 214-922-8885
 links:
 - url: https://crockett.house.gov
   note: website
+- url: https://crockett.house.gov/
+other_names:
+- name: Crockett, J.
+- name: J. Crockett
+- name: J.F. Crockett
 ids:
   twitter: RepJasmine
 other_identifiers:
@@ -44,3 +50,11 @@ other_identifiers:
   identifier: '188486'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jasmine_Crockett
+- url: https://crockett.house.gov
+- url: https://en.wikipedia.org/wiki/Jasmine_Crockett
+- url: https://justfacts.votesmart.org/candidate/188486/jasmine-crockett
+- url: https://justfacts.votesmart.org/candidate/biography/188486/jasmine-crockett
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jasmine_crockett/456944
+- url: https://www.linkedin.com/in/jasmine-crockett-98435524
diff --git a/data/us/legislature/Jason-Crow-fb2f7d0c-f39b-50a6-8bdc-8bdc181683bc.yml b/data/us/legislature/Jason-Crow-fb2f7d0c-f39b-50a6-8bdc-8bdc181683bc.yml
index cd5b47781e..04815bb139 100644
--- a/data/us/legislature/Jason-Crow-fb2f7d0c-f39b-50a6-8bdc-8bdc181683bc.yml
+++ b/data/us/legislature/Jason-Crow-fb2f7d0c-f39b-50a6-8bdc-8bdc181683bc.yml
@@ -2,40 +2,43 @@ id: ocd-person/fb2f7d0c-f39b-50a6-8bdc-8bdc181683bc
 name: Jason Crow
 given_name: Jason
 family_name: Crow
-gender: M
 birth_date: 1979-03-15
+gender: Male
+email: https://crow.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001121.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-6
 offices:
 - classification: capitol
-  address: 1323 Longworth House Office Building Washington DC 20515-0606
+  address: 1323 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7882
 - classification: district
-  address: 3300 S Parker Rd Suite 100; Aurora, CO 80014-3518
+  address: 2170 S. Parker Road Suite 280, Aurora, CO 80231
   voice: 720-748-7514
-  name: 'District Office #1'
 links:
 - url: https://crow.house.gov
   note: website
+- url: https://crow.house.gov/
+other_names:
+- name: Crow, J.
+- name: J. Crow
+- name: J.A.U. Crow
 ids:
   twitter: RepJasonCrow
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: kg:/g/11gzqdw_wg
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jason_Crow
+- url: https://crow.house.gov
+- url: https://en.wikipedia.org/wiki/Jason_Crow
+- url: https://justfacts.votesmart.org/candidate/biography/180218/jason-crow
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jason_crow/412762
+- url: https://www.linkedin.com/in/jason-crow-a660074
diff --git a/data/us/legislature/Jason-Smith-559a5a0c-4b35-56f0-aa59-76c98e6cfb45.yml b/data/us/legislature/Jason-Smith-559a5a0c-4b35-56f0-aa59-76c98e6cfb45.yml
index da76adfeef..74eada9111 100644
--- a/data/us/legislature/Jason-Smith-559a5a0c-4b35-56f0-aa59-76c98e6cfb45.yml
+++ b/data/us/legislature/Jason-Smith-559a5a0c-4b35-56f0-aa59-76c98e6cfb45.yml
@@ -2,82 +2,80 @@ id: ocd-person/559a5a0c-4b35-56f0-aa59-76c98e6cfb45
 name: Jason Smith
 given_name: Jason
 family_name: Smith
-middle_name: T.
-gender: M
 birth_date: 1980-06-16
+gender: Male
+email: https://jasonsmith.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/S001195.jpg
 party:
-- start_date: '2013-06-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-06-04'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-06-04
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-8
 offices:
 - classification: capitol
-  address: 1011 Longworth House Office Building Washington DC 20515-2508
+  address: 1011 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4404
+  fax: 202-226-0326
 - classification: district
-  address: 2502 Tanner Dr. Suite 205; Cape Girardeau, MO 63703
-  voice: 573-335-0101
-  fax: 573-335-1931
-  name: 'District Office #1'
-- classification: district
-  address: 22 E. Columbia St.; Farmington, MO 63640
+  address: 22 E. Columbia St., Farmington, MO 63640
   voice: 573-756-9755
   fax: 573-756-9762
-  name: 'District Office #2'
 - classification: district
-  address: 2725 N. Westwood Blvd. Suite 5A; Poplar Bluff, MO 63901
-  voice: 573-609-2996
-  name: 'District Office #3'
+  address: 2502 Tanner Drive Suite 205, Cape Girardeau, MO 63703
+  voice: 573-335-0101
+  fax: 573-335-1931
 - classification: district
-  address: 830A S. Bishop; Rolla, MO 65401
-  voice: 573-364-2455
-  fax: 573-364-1053
-  name: 'District Office #4'
+  address: 2725 N. Westwood Blvd. Suite 5A, Poplar Bluff, MO 63901
+  voice: 573-609-2996
 - classification: district
-  address: 35 Court Sq. Suite 300; West Plains, MO 65775
+  address: 35 Court Square Suite 300, West Plains, MO 65775
   voice: 417-255-1515
   fax: 417-255-2009
-  name: 'District Office #5'
+- classification: district
+  address: 830A S. Bishop Ave., Rolla, MO 65401
+  voice: 573-364-2455
+  fax: 573-364-1053
 links:
 - url: https://jasonsmith.house.gov
   note: website
+- url: https://jasonsmith.house.gov/
+other_names:
+- name: J. Smith
+- name: J.T. Smith
+- name: Smith (MO)
+- name: Smith, J.
 ids:
   twitter: RepJasonSmith
   youtube: UCzj9-27Lr4gcqopmZAobXXg
   facebook: repjasonsmith
-other_names:
-- name: Smith (MO)
 other_identifiers:
 - scheme: bioguide
   identifier: S001195
@@ -107,3 +105,9 @@ other_identifiers:
   identifier: kg:/m/0g9yj_2
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jason_Smith_(Missouri_representative)
+- url: https://en.wikipedia.org/wiki/Jason_T._Smith
+- url: https://jasonsmith.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/59318/jason-smith
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jason_smith/412596
diff --git a/data/us/legislature/Jay-Obernolte-d78f994b-01dc-5dfb-a08f-fc2ca2cef7ec.yml b/data/us/legislature/Jay-Obernolte-d78f994b-01dc-5dfb-a08f-fc2ca2cef7ec.yml
index 1379211bea..fa45ed2602 100644
--- a/data/us/legislature/Jay-Obernolte-d78f994b-01dc-5dfb-a08f-fc2ca2cef7ec.yml
+++ b/data/us/legislature/Jay-Obernolte-d78f994b-01dc-5dfb-a08f-fc2ca2cef7ec.yml
@@ -2,32 +2,38 @@ id: ocd-person/d78f994b-01dc-5dfb-a08f-fc2ca2cef7ec
 name: Jay Obernolte
 given_name: Jay
 family_name: Obernolte
-middle_name: Phillip
-gender: M
 birth_date: 1970-08-18
+gender: Male
+email: https://obernolte.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/O000019.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-23
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-23
+  district: CA-8
 offices:
 - classification: capitol
-  address: 1029 Longworth House Office Building Washington DC 20515-0523
+  address: 1029 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5861
+- classification: district
+  address: 9700 7th Ave. Suite 201, Hesperia, CA 92345
+  voice: 760-247-1815
 links:
 - url: https://obernolte.house.gov
   note: website
+- url: https://obernolte.house.gov/
+other_names:
+- name: J. Obernolte
+- name: J.P. Obernolte
+- name: Obernolte, J.
 ids:
   twitter: JayObernolte
 other_identifiers:
@@ -49,3 +55,10 @@ other_identifiers:
   identifier: Jay Obernolte
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jay_Obernolte
+- url: https://en.wikipedia.org/wiki/Jay_Obernolte
+- url: https://justfacts.votesmart.org/candidate/biography/151831/jay-obernolte
+- url: https://obernolte.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jay_obernolte/456801
+- url: https://www.linkedin.com/in/jay-obernolte-b6b587a4
diff --git a/data/us/legislature/Jeanne-Shaheen-6d497134-2c53-5987-add8-6fffeaa96cda.yml b/data/us/legislature/Jeanne-Shaheen-6d497134-2c53-5987-add8-6fffeaa96cda.yml
index 6adaf96ba6..0fbdfd6d0f 100644
--- a/data/us/legislature/Jeanne-Shaheen-6d497134-2c53-5987-add8-6fffeaa96cda.yml
+++ b/data/us/legislature/Jeanne-Shaheen-6d497134-2c53-5987-add8-6fffeaa96cda.yml
@@ -2,68 +2,65 @@ id: ocd-person/6d497134-2c53-5987-add8-6fffeaa96cda
 name: Jeanne Shaheen
 given_name: Jeanne
 family_name: Shaheen
-gender: F
 birth_date: 1947-01-28
+gender: Female
+email: https://www.shaheen.senate.gov/contact/contact-jeanne
 image: https://theunitedstates.io/images/congress/450x550/S001181.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Hampshire
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Hampshire
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Hampshire
 offices:
 - classification: capitol
-  address: 506 Hart Senate Office Building Washington DC 20510
+  address: 506 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2841
 - classification: district
-  address: 961 Main St.; Berlin, NH 03570
-  voice: 603-752-6300
-  name: 'District Office #1'
+  address: 12 Gilbo Ave. Suite C, Keene, NH 03431
+  voice: 603-358-6604
 - classification: district
-  address: 50 Opera House Sq.; Claremont, NH 03743
-  voice: 603-542-4872
-  name: 'District Office #2'
+  address: 2 Wall St. Suite 220, Manchester, NH 03101
+  voice: 603-647-7500
 - classification: district
-  address: 340 Central Ave. Suite 205; Dover, NH 03820
+  address: 340 Central Ave. Suite 205, Dover, NH 03820
   voice: 603-750-3004
-  name: 'District Office #3'
 - classification: district
-  address: 12 Gilbo Ave. Suite C; Keene, NH 03431
-  voice: 603-358-6604
-  name: 'District Office #4'
-- classification: district
-  address: 2 Wall St. Suite 220; Manchester, NH 03101
-  voice: 603-647-7500
-  name: 'District Office #5'
+  address: 50 Opera House Square, Claremont, NH 03473
+  voice: 603-542-4872
 - classification: district
-  address: 60 Main St. Suite 217; Nashua, NH 03060
+  address: 60 Main St. Suite 217, Nashua, NH 03060
   voice: 603-883-0196
-  name: 'District Office #6'
+- classification: district
+  address: 961 Main St., Berlin, NH 03570
+  voice: 603-752-6300
 links:
 - url: https://www.shaheen.senate.gov
   note: website
 - url: https://www.shaheen.senate.gov/contact/contact-jeanne
   note: contact form
+- url: https://www.shaheen.senate.gov/
+other_names:
+- name: C.J.B. Shaheen
+- name: J. Shaheen
+- name: Shaheen (D-NH)
+- name: Shaheen, J.
 ids:
   twitter: SenatorShaheen
   youtube: UCjLZAZMbDrybHyttdEC9LFA
   facebook: SenatorShaheen
-other_names:
-- name: Shaheen (D-NH)
 other_identifiers:
 - scheme: bioguide
   identifier: S001181
@@ -97,3 +94,9 @@ other_identifiers:
   identifier: kg:/m/01rrm2
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jeanne_Shaheen
+- url: https://en.wikipedia.org/wiki/Jeanne_Shaheen
+- url: https://justfacts.votesmart.org/candidate/1663/jeanne-shaheen
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jeanne_shaheen/412323
+- url: https://www.shaheen.senate.gov
diff --git a/data/us/legislature/Jeff-Duncan-5c67147e-00d5-5430-b1c1-59a6da4269d6.yml b/data/us/legislature/Jeff-Duncan-5c67147e-00d5-5430-b1c1-59a6da4269d6.yml
index 1e2997265c..092972fafd 100644
--- a/data/us/legislature/Jeff-Duncan-5c67147e-00d5-5430-b1c1-59a6da4269d6.yml
+++ b/data/us/legislature/Jeff-Duncan-5c67147e-00d5-5430-b1c1-59a6da4269d6.yml
@@ -2,66 +2,69 @@ id: ocd-person/5c67147e-00d5-5430-b1c1-59a6da4269d6
 name: Jeff Duncan
 given_name: Jeff
 family_name: Duncan
-gender: M
 birth_date: 1966-01-07
+gender: Male
+email: https://jeffduncan.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/D000615.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-3
 offices:
 - classification: capitol
-  address: 2229 Rayburn House Office Building Washington DC 20515-4003
+  address: 2229 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5301
+  fax: 202-225-3216
 - classification: district
-  address: 303 W. Beltline Blvd.; Anderson, SC 29625
-  voice: 864-224-7401
-  fax: 864-225-7049
-  name: 'District Office #1'
-- classification: district
-  address: 100 Plaza Circle Suite A1; Clinton, SC 29325
+  address: 100 Plaza Circle Suite A1, Clinton, SC 29325
   voice: 864-681-1028
   fax: 864-681-1030
-  name: 'District Office #2'
+- classification: district
+  address: 303 W. Beltline Blvd., Anderson, SC 29625
+  voice: 864-224-7401
+  fax: 864-225-7049
 links:
 - url: https://jeffduncan.house.gov
   note: website
+- url: https://jeffduncan.house.gov/
+other_names:
+- name: Duncan, J.
+- name: J. Duncan
+- name: J.D. Duncan
 ids:
   twitter: RepJeffDuncan
   youtube: UC1tuXL6ymImdpKYGEAH83QA
@@ -97,3 +100,10 @@ other_identifiers:
   identifier: kg:/m/0ddgp1k
 sources:
 - url: https://theunitedstates.io/
+- url: https://en.wikipedia.org/wiki/Jeff_Duncan_(politician)
+- url: https://jeffduncan.house.gov
+- url: https://jeffduncan.house.gov
+- url: https://justfacts.votesmart.org/candidate/47967/jeff-duncan
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jeff_duncan/412472
+- url: https://www.linkedin.com/in/jeff-duncan-86580a9
diff --git a/data/us/legislature/Jeff-Jackson-4f9693d4-e175-536f-bd51-e884f84b9a6d.yml b/data/us/legislature/Jeff-Jackson-4f9693d4-e175-536f-bd51-e884f84b9a6d.yml
index 791296ef62..7374f5e0fe 100644
--- a/data/us/legislature/Jeff-Jackson-4f9693d4-e175-536f-bd51-e884f84b9a6d.yml
+++ b/data/us/legislature/Jeff-Jackson-4f9693d4-e175-536f-bd51-e884f84b9a6d.yml
@@ -1,30 +1,38 @@
 id: ocd-person/4f9693d4-e175-536f-bd51-e884f84b9a6d
 name: Jeff Jackson
-given_name: Jeffrey
+given_name: Jeff
 family_name: Jackson
-middle_name: Neale
-gender: M
 birth_date: 1982-09-12
+gender: Male
+email: https://jeffjackson.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/J000308.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-14
 offices:
 - classification: capitol
-  address: 1318 Longworth House Office Building Washington DC 20515-0001
+  address: 1318 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5634
+- classification: district
+  address: 128 W. Main Ave., Gastonia, NC 28052
+  voice: 980-460-8110
+- classification: district
+  address: 700 Parkwood Ave., Charlotte, NC 28205
+  voice: 980-500-7100
 links:
 - url: https://jeffjackson.house.gov
   note: website
+- url: https://jeffjackson.house.gov/
 other_names:
+- name: J. Jackson
+- name: J.N. Jackson
 - name: Jackson (NC)
+- name: Jackson, J.
 other_identifiers:
 - scheme: bioguide
   identifier: J000308
@@ -42,3 +50,10 @@ other_identifiers:
   identifier: '153729'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jeff_Jackson
+- url: https://en.wikipedia.org/wiki/Jeff_Jackson_(politician)
+- url: https://jeffjackson.house.gov
+- url: https://justfacts.votesmart.org/candidate/153729/jeff-jackson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jeffrey_jackson/456916
+- url: https://www.linkedin.com/in/jeff-jackson-00529826
diff --git a/data/us/legislature/Jeff-Merkley-96291b83-ea59-594a-97cf-630189e0b8ed.yml b/data/us/legislature/Jeff-Merkley-96291b83-ea59-594a-97cf-630189e0b8ed.yml
index e2c444212e..6e716c53f8 100644
--- a/data/us/legislature/Jeff-Merkley-96291b83-ea59-594a-97cf-630189e0b8ed.yml
+++ b/data/us/legislature/Jeff-Merkley-96291b83-ea59-594a-97cf-630189e0b8ed.yml
@@ -2,69 +2,67 @@ id: ocd-person/96291b83-ea59-594a-97cf-630189e0b8ed
 name: Jeff Merkley
 given_name: Jeff
 family_name: Merkley
-gender: M
 birth_date: 1956-10-24
+gender: Male
+email: https://www.merkley.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001176.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oregon
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oregon
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Oregon
 offices:
 - classification: capitol
-  address: 531 Hart Senate Office Building Washington DC 20510
+  address: 531 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3753
+  fax: 202-228-3997
 - classification: district
-  address: 131 NW. Hawthorne Ave. Suite 208; Bend, OR 97701
-  voice: 541-318-1298
-  name: 'District Office #1'
+  address: 10 S. Bartlett St. Suite 201, Medford, OR 97501
+  voice: 541-608-9102
 - classification: district
-  address: 405 E. 8th Ave. Suite 2010; Eugene, OR 97401
-  voice: 541-465-6750
-  name: 'District Office #2'
+  address: 121 SW Salmon St. Suite 1400, Portland, OR 97204
+  voice: 503-326-3386
+  fax: 202-224-2073
 - classification: district
-  address: 10 S. Bartlett St. Suite 201; Medford, OR 97501
-  voice: 541-608-9102
-  name: 'District Office #3'
+  address: 131 NW Hawthorne Ave. Suite 208, Bend, OR 97703
+  voice: 541-318-1298
 - classification: district
-  address: 310 SE. Second St. Suite 105; Pendleton, OR 97801
+  address: 1705 Main St. Suite 504, Baker City, OR 97814
   voice: 541-278-1129
-  name: 'District Office #4'
 - classification: district
-  address: 121 SW Salmon St. Suite 1400; Portland, OR 97204
-  voice: 503-326-3386
-  fax: 503-326-2900
-  name: 'District Office #5'
+  address: 405 E. 8th Ave. Suite 2010, Eugene, OR 97401
+  voice: 541-465-6750
 - classification: district
-  address: 161 High St. SE Suite 250; Salem, OR 97301
+  address: 500 Liberty St. SE Suite 320, Salem, OR 97301
   voice: 503-362-8102
-  name: 'District Office #6'
 links:
 - url: https://www.merkley.senate.gov
   note: website
 - url: https://www.merkley.senate.gov/contact/
   note: contact form
+- url: https://www.merkley.senate.gov/
+other_names:
+- name: J. Merkley
+- name: J.A. Merkley
+- name: Merkley (D-OR)
+- name: Merkley, J.
 ids:
   twitter: SenJeffMerkley
   youtube: UCRoXttCJhMnLVCxCaa6VnNQ
   facebook: jeffmerkley
-other_names:
-- name: Merkley (D-OR)
 other_identifiers:
 - scheme: bioguide
   identifier: M001176
@@ -96,3 +94,9 @@ other_identifiers:
   identifier: kg:/m/026k60f
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jeff_Merkley
+- url: https://en.wikipedia.org/wiki/Jeff_Merkley
+- url: https://justfacts.votesmart.org/candidate/23644/jeff-merkley
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jeff_merkley/412325
+- url: https://www.merkley.senate.gov
diff --git a/data/us/legislature/Jefferson-Van-Drew-a7706596-7110-5866-935b-b44668b92af1.yml b/data/us/legislature/Jefferson-Van-Drew-a7706596-7110-5866-935b-b44668b92af1.yml
index 30d17a7389..1b1ac0b466 100644
--- a/data/us/legislature/Jefferson-Van-Drew-a7706596-7110-5866-935b-b44668b92af1.yml
+++ b/data/us/legislature/Jefferson-Van-Drew-a7706596-7110-5866-935b-b44668b92af1.yml
@@ -1,41 +1,45 @@
 id: ocd-person/a7706596-7110-5866-935b-b44668b92af1
-name: Jefferson Van Drew
-given_name: Jefferson
+name: Jeff Van Drew
+given_name: Jeff
 family_name: Van Drew
-gender: M
 birth_date: 1953-02-23
+gender: Male
+email: https://vandrew.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/V000133.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-2
 offices:
 - classification: capitol
-  address: 2447 Rayburn House Office Building Washington DC 20515-3002
+  address: 2447 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6572
 - classification: district
-  address: 5914 Main St Suite 103; Mays Landing, NJ 08330-1751
+  address: 1001 Tilton Road Suite 101, Northfield, NJ 08225
   voice: 609-625-5008
-  name: 'District Office #1'
 links:
 - url: https://vandrew.house.gov
   note: website
+- url: https://vandrew.house.gov/
+other_names:
+- name: J. Van Drew
+- name: J.H. Van Drew
+- name: Jefferson Van Drew
+- name: Van Drew, J.
 ids:
   twitter: Congressman_JVD
 other_identifiers:
@@ -61,3 +65,12 @@ other_identifiers:
   identifier: Jeff Van Drew
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jeff_Van_Drew
+- url: https://en.wikipedia.org/wiki/Jeff_Van_Drew
+- url: https://justfacts.votesmart.org/candidate/biography/24685/jeff-van-drew
+- url: https://theunitedstates.io
+- url: https://vandrew.house.gov
+- url: https://vandrew.house.gov/about
+- url: https://vandrewforcongress.com/meet-jeff
+- url: https://www.govtrack.us/congress/members/jefferson_van_drew/412796
+- url: https://www.linkedin.com/in/jeffvandrew
diff --git a/data/us/legislature/Jennifer-Kiggans-130d2a3b-6ca1-560e-b0cd-a7c08366cff3.yml b/data/us/legislature/Jennifer-Kiggans-130d2a3b-6ca1-560e-b0cd-a7c08366cff3.yml
index 816ab61e85..cf7b4babfa 100644
--- a/data/us/legislature/Jennifer-Kiggans-130d2a3b-6ca1-560e-b0cd-a7c08366cff3.yml
+++ b/data/us/legislature/Jennifer-Kiggans-130d2a3b-6ca1-560e-b0cd-a7c08366cff3.yml
@@ -1,31 +1,43 @@
 id: ocd-person/130d2a3b-6ca1-560e-b0cd-a7c08366cff3
-name: Jennifer Kiggans
-given_name: Jennifer
+name: Jen Kiggans
+given_name: Jen
 family_name: Kiggans
-middle_name: Ann
-gender: F
 birth_date: 1971-06-18
+gender: Female
+email: https://kiggans.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/K000399.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-2
 offices:
 - classification: capitol
-  address: 1037 Longworth House Office Building Washington DC 20515-4602
+  address: 1037 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4215
+- classification: district
+  address: 130 S. Saratoga St. Suite A, Suffolk, VA 23434
+  voice: 757-942-6050
+- classification: district
+  address: 25020 Shore Parkway Suite 1B, Onley, VA 23418
+  voice: 757-666-6020
+- classification: district
+  address: 283 Constitution Drive, Suite 900, Virginia Beach, VA 23462
+  voice: 757-364-7650
 links:
 - url: https://kiggans.house.gov
   note: website
+- url: https://kiggans.house.gov/
 other_names:
+- name: J. Kiggans
+- name: J.A. Kiggans
 - name: Jennifer A. Kiggans
+- name: Jennifer Kiggans
 - name: Kiggans (VA)
+- name: Kiggans, J.
 other_identifiers:
 - scheme: bioguide
   identifier: K000399
@@ -45,3 +57,8 @@ other_identifiers:
   identifier: '186387'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jennifer_Kiggans
+- url: https://en.wikipedia.org/wiki/Jen_Kiggans
+- url: https://kiggans.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/jennifer-kiggans-5356523b
diff --git a/data/us/legislature/Jennifer-L-McClellan-6d89e5cc-c605-55ff-ba4d-b3d58d6ac1af.yml b/data/us/legislature/Jennifer-L-McClellan-6d89e5cc-c605-55ff-ba4d-b3d58d6ac1af.yml
index 475b9c543a..14ed574abc 100644
--- a/data/us/legislature/Jennifer-L-McClellan-6d89e5cc-c605-55ff-ba4d-b3d58d6ac1af.yml
+++ b/data/us/legislature/Jennifer-L-McClellan-6d89e5cc-c605-55ff-ba4d-b3d58d6ac1af.yml
@@ -1,27 +1,36 @@
 id: ocd-person/6d89e5cc-c605-55ff-ba4d-b3d58d6ac1af
-name: Jennifer L. McClellan
-given_name: Jennifer
+name: Jenn McClellan
+given_name: Jenn
 family_name: McClellan
-gender: F
 birth_date: 1972-12-28
+gender: Female
+email: https://mcclellan.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001227.jpg
 party:
-- start_date: '2023-03-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-03-07'
-  end_date: '2025-01-03'
+- start_date: 2023-03-07
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-4
 offices:
 - classification: capitol
-  address: 2417 Rayburn House Office Building Washington DC 20515-4604
+  address: 11 S. 12th St. Suite 401, Richmond, VA 23219
+  voice: 804-486-1840
+- classification: capitol
+  address: 2417 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6365
+  fax: 202-226-1170
 links:
 - url: https://mcclellan.house.gov
   note: website
+- url: https://mcclellan.house.gov/
+other_names:
+- name: J. McClellan
+- name: J.L. McClellan
+- name: Jennifer L. McClellan
+- name: McClellan, J.
 other_identifiers:
 - scheme: bioguide
   identifier: M001227
@@ -41,3 +50,8 @@ other_identifiers:
   identifier: '58655'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jenn_McClellan
+- url: https://en.wikipedia.org/wiki/Jennifer_McClellan
+- url: https://mcclellan.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/jennifer-mcclellan-85533ba
diff --git a/data/us/legislature/Jennifer-Wexton-660e8554-8d00-501a-bd27-e65689d39837.yml b/data/us/legislature/Jennifer-Wexton-660e8554-8d00-501a-bd27-e65689d39837.yml
index a096c28a44..fc2fe73c00 100644
--- a/data/us/legislature/Jennifer-Wexton-660e8554-8d00-501a-bd27-e65689d39837.yml
+++ b/data/us/legislature/Jennifer-Wexton-660e8554-8d00-501a-bd27-e65689d39837.yml
@@ -2,40 +2,47 @@ id: ocd-person/660e8554-8d00-501a-bd27-e65689d39837
 name: Jennifer Wexton
 given_name: Jennifer
 family_name: Wexton
-gender: F
 birth_date: 1968-05-27
+gender: Female
+email: https://wexton.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000825.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-10
 offices:
 - classification: capitol
-  address: 1210 Longworth House Office Building Washington DC 20515-4610
+  address: 1210 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5136
+  fax: 202-225-0437
 - classification: district
-  address: 21351 Gentry Dr Suite 140; Sterling, VA 20166-8501
+  address: 210 Wirt St. SW Unit 102, Leesburg, VA 20175
+  voice: 703-236-1300
+- classification: district
+  address: 9408 Grant Ave. Unit 403, Manassas, VA 20110
   voice: 703-234-3800
-  name: 'District Office #1'
 links:
 - url: https://wexton.house.gov
   note: website
+- url: https://wexton.house.gov/
+other_names:
+- name: J. Wexton
+- name: J.L.T. Wexton
+- name: Wexton, J.
 ids:
   twitter: RepWexton
 other_identifiers:
@@ -61,3 +68,8 @@ other_identifiers:
   identifier: Jennifer Wexton
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jennifer_Wexton
+- url: https://en.wikipedia.org/wiki/Jennifer_Wexton
+- url: https://justfacts.votesmart.org/candidate/biography/147013/jennifer-wexton
+- url: https://theunitedstates.io
+- url: https://wexton.house.gov
diff --git a/data/us/legislature/Jenniffer-Gonzlez-Coln-3f563cbe-7057-5771-b8d0-6e2e063da96f.yml b/data/us/legislature/Jenniffer-Gonzlez-Coln-3f563cbe-7057-5771-b8d0-6e2e063da96f.yml
index 5a5b77e96a..05972a1cf9 100644
--- a/data/us/legislature/Jenniffer-Gonzlez-Coln-3f563cbe-7057-5771-b8d0-6e2e063da96f.yml
+++ b/data/us/legislature/Jenniffer-Gonzlez-Coln-3f563cbe-7057-5771-b8d0-6e2e063da96f.yml
@@ -1,42 +1,48 @@
 id: ocd-person/3f563cbe-7057-5771-b8d0-6e2e063da96f
-name: "Jenniffer Gonz\xE1lez-Col\xF3n"
+name: "Jenniffer Gonz\xE1lez"
 given_name: Jenniffer
-family_name: "Gonz\xE1lez-Col\xF3n"
-gender: F
+family_name: "Gonz\xE1lez"
 birth_date: 1976-08-05
+gender: Female
+email: https://gonzalez-colon.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000582.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PR-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: PR-At-Large
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PR-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PR-AL
 offices:
 - classification: capitol
-  address: 2338 Rayburn House Office Building Washington DC 20515-5401
+  address: 2338 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2615
+  fax: 202-225-2154
 - classification: district
-  address: P.O. Box 9023958; San Juan, PR 00902-3958
+  address: Edificio Antigua Escuela, Medicina Tropical P.O. Box 9023958, San Juan,
+    PR 00902
   voice: 787-723-6333
-  fax: 787-729-7738
-  name: 'District Office #1'
+  fax: 787-729-6824
 links:
 - url: https://gonzalez-colon.house.gov
   note: website
+- url: https://gonzalez-colon.house.gov/
+other_names:
+- name: "Gonz\xE1lez, J."
+- name: "J. Gonz\xE1lez"
+- name: "J.A. Gonz\xE1lez"
+- name: "Jenniffer Gonz\xE1lez-Col\xF3n"
 ids:
   twitter: RepJenniffer
   youtube: UCZj99h3-GNKjGGeyp7AJeXw
@@ -62,3 +68,7 @@ other_identifiers:
   identifier: '67353'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jennifer_Gonzalez_Colon
+- url: https://en.wikipedia.org/wiki/Jenniffer_Gonz%C3%A1lez
+- url: https://gonzalez-colon.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Jerrold-Nadler-d6cd4f62-7c5f-5595-ac5e-4e40741e5f3b.yml b/data/us/legislature/Jerrold-Nadler-d6cd4f62-7c5f-5595-ac5e-4e40741e5f3b.yml
index 6ce1f05d3d..61e78348ca 100644
--- a/data/us/legislature/Jerrold-Nadler-d6cd4f62-7c5f-5595-ac5e-4e40741e5f3b.yml
+++ b/data/us/legislature/Jerrold-Nadler-d6cd4f62-7c5f-5595-ac5e-4e40741e5f3b.yml
@@ -1,116 +1,118 @@
 id: ocd-person/d6cd4f62-7c5f-5595-ac5e-4e40741e5f3b
-name: Jerrold Nadler
-given_name: Jerrold
+name: Jerry Nadler
+given_name: Jerry
 family_name: Nadler
-middle_name: L.
-gender: M
 birth_date: 1947-06-13
+gender: Male
+email: https://nadler.house.gov/forms/writeyourrep/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/N000002.jpg
 party:
-- start_date: '1992-11-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1992-11-03'
-  end_date: '1993-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-17
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+  district: NY-12
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-8
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: NY-10
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-8
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: NY-10
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-8
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: NY-10
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-8
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: NY-10
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-8
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: NY-10
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: NY-8
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: NY-8
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: NY-8
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NY-8
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-8
+- start_date: 1992-11-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
+  district: NY-17
 offices:
 - classification: capitol
-  address: 2132 Rayburn House Office Building Washington DC 20515-3212
+  address: 2132 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5635
 - classification: district
-  address: 6605 Fort Hamilton Pkwy.; Brooklyn, NY 11219
-  voice: 718-373-3198
-  name: 'District Office #1'
-- classification: district
-  address: 201 Varick St. Suite 669; New York, NY 10014
+  address: 201 Varick St. Suite 669, New York, NY 10014
   voice: 212-367-7350
-  name: 'District Office #2'
+- classification: district
+  address: 6605 Fort Hamilton Parkway, Brooklyn, NY 11219
+  voice: 718-373-3198
 links:
 - url: https://nadler.house.gov
   note: website
+- url: https://nadler.house.gov/
+other_names:
+- name: J. Nadler
+- name: J.L. Nadler
+- name: Jerrold Nadler
+- name: Nadler, J.
 ids:
   twitter: RepJerryNadler
   youtube: UCQKj0qU1e7o2f5ftSh-c9aQ
@@ -146,3 +148,9 @@ other_identifiers:
   identifier: Jerrold Nadler
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jerrold_Nadler
+- url: https://en.wikipedia.org/wiki/Jerry_Nadler
+- url: https://justfacts.votesmart.org/candidate/26980/jerry-nadler
+- url: https://nadler.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jerrold_nadler/400289
diff --git a/data/us/legislature/Jerry-L-Carl-6813a4c1-4353-5517-9314-5d36ecebabfd.yml b/data/us/legislature/Jerry-L-Carl-6813a4c1-4353-5517-9314-5d36ecebabfd.yml
index 6acf7290c3..aebb891bed 100644
--- a/data/us/legislature/Jerry-L-Carl-6813a4c1-4353-5517-9314-5d36ecebabfd.yml
+++ b/data/us/legislature/Jerry-L-Carl-6813a4c1-4353-5517-9314-5d36ecebabfd.yml
@@ -1,33 +1,44 @@
 id: ocd-person/6813a4c1-4353-5517-9314-5d36ecebabfd
-name: Jerry L. Carl
+name: Jerry Carl
 given_name: Jerry
 family_name: Carl
-middle_name: Lee
-gender: M
 birth_date: 1958-06-17
+gender: Male
+email: https://carl.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001054.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-1
 offices:
 - classification: capitol
-  address: 1330 Longworth House Office Building Washington DC 20515-0101
+  address: 1330 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4931
+  fax: 202-225-0562
+- classification: district
+  address: 41 W. I-65 Service Road Suite 305, Mobile, AL 36608
+  voice: 251-283-6280
+- classification: district
+  address: 502 W. Lee Ave., Summerdale, AL 36580
+  voice: 251-677-6630
 links:
 - url: https://carl.house.gov
   note: website
+- url: https://carl.house.gov/
+other_names:
+- name: Carl, J.
+- name: J. Carl
+- name: J.L. Carl
+- name: Jerry L. Carl
 ids:
   twitter: RepJerryCarl
 other_identifiers:
@@ -47,3 +58,10 @@ other_identifiers:
   identifier: kg:/g/11j2j1brnb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jerry_Carl
+- url: https://carl.house.gov
+- url: https://en.wikipedia.org/wiki/Jerry_Carl
+- url: https://justfacts.votesmart.org/candidate/biography/143749/jerry-carl
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jerry_carl/456799
+- url: https://www.linkedin.com/in/jerry-carl-844a4074
diff --git a/data/us/legislature/Jerry-Moran-00c39487-8eec-5494-af5e-96e9b025a39b.yml b/data/us/legislature/Jerry-Moran-00c39487-8eec-5494-af5e-96e9b025a39b.yml
index 44aa39adf1..2e6e52ab3a 100644
--- a/data/us/legislature/Jerry-Moran-00c39487-8eec-5494-af5e-96e9b025a39b.yml
+++ b/data/us/legislature/Jerry-Moran-00c39487-8eec-5494-af5e-96e9b025a39b.yml
@@ -2,104 +2,106 @@ id: ocd-person/00c39487-8eec-5494-af5e-96e9b025a39b
 name: Jerry Moran
 given_name: Jerry
 family_name: Moran
-gender: M
 birth_date: 1954-05-29
+gender: Male
+email: https://www.moran.senate.gov/public/index.cfm/e-mail-jerry
 image: https://theunitedstates.io/images/congress/450x550/M000934.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Kansas
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Kansas
+- start_date: 2011-01-05
+  end_date: 2017-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Kansas
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Kansas
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Kansas
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Kansas
 offices:
 - classification: capitol
-  address: 521 Dirksen Senate Office Building Washington DC 20510
+  address: 521 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-6521
+  fax: 202-228-6998
+- classification: district
+  address: 100 N. Broadway St. Suite 210, Wichita, KS 67202
+  voice: 316-269-9257
+  fax: 202-228-6472
 - classification: district
-  address: 1200 Main St. Suite 402; Hays, KS 67601
+  address: 1200 Main St., Suite 402, Hays, KS 67601
   voice: 785-628-6401
   fax: 785-628-3791
-  name: 'District Office #1'
 - classification: district
-  address: 923 Westport Pl. Suite 210; Manhattan, KS 66502
+  address: 1511 E. Fulton Terrace Suite 1511-2, Garden City, KS 67846
+  voice: 620-260-3025
+- classification: district
+  address: 1880 Kimball Ave. Suite 270, Manhattan, KS 66502
   voice: 785-539-8973
   fax: 785-587-0789
-  name: 'District Office #2'
 - classification: district
-  address: 23600 College Blvd. Suite 201; Olathe, KS 66061
+  address: 23600 College Blvd., Suite 201, Olathe, KS 66061
   voice: 913-393-0711
   fax: 913-768-1366
-  name: 'District Office #3'
 - classification: district
-  address: 306 N. Broadway Suite 125; Pittsburg, KS 66762
+  address: 306 N. Broadway St., Suite 125, Pittsburg, KS 66762
   voice: 620-232-2286
   fax: 620-232-2284
-  name: 'District Office #4'
-- classification: district
-  address: 100 North Broadway Suite 210; Wichita, KS 67202
-  voice: 316-269-9259
-  fax: 316-269-9257
-  name: 'District Office #5'
 links:
 - url: https://www.moran.senate.gov
   note: website
 - url: https://www.moran.senate.gov/public/index.cfm/e-mail-jerry
   note: contact form
+- url: https://www.moran.senate.gov/
+other_names:
+- name: G.W. Moran
+- name: J. Moran
+- name: Moran (R-KS)
+- name: Moran, J.
 ids:
   twitter: JerryMoran
   youtube: UC1oRxeUPam6-53wPBZ3N02A
   facebook: jerrymoran
-other_names:
-- name: Moran (R-KS)
 other_identifiers:
 - scheme: bioguide
   identifier: M000934
@@ -135,3 +137,10 @@ other_identifiers:
   identifier: kg:/m/024s8t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jerry_Moran
+- url: https://en.wikipedia.org/wiki/Jerry_Moran
+- url: https://justfacts.votesmart.org/candidate/key-votes/542/jerry-moran
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jerry_moran/400284
+- url: https://www.linkedin.com/in/jerry-moran-08976974
+- url: https://www.moran.senate.gov
diff --git a/data/us/legislature/Jess-G-Chuy-Garca-f89c416f-c08d-5251-9a31-201a5265e283.yml b/data/us/legislature/Jess-G-Chuy-Garca-f89c416f-c08d-5251-9a31-201a5265e283.yml
index 87d4eac0d1..a1357f435d 100644
--- a/data/us/legislature/Jess-G-Chuy-Garca-f89c416f-c08d-5251-9a31-201a5265e283.yml
+++ b/data/us/legislature/Jess-G-Chuy-Garca-f89c416f-c08d-5251-9a31-201a5265e283.yml
@@ -1,44 +1,48 @@
 id: ocd-person/f89c416f-c08d-5251-9a31-201a5265e283
-name: "Jes\xFAs G. \"Chuy\" Garc\xEDa"
-given_name: "Jes\xFAs"
+name: "Chuy Garc\xEDa"
+given_name: Chuy
 family_name: "Garc\xEDa"
-middle_name: G.
-gender: M
 birth_date: 1956-04-12
+gender: Male
+email: https://chuygarcia.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/G000586.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-4
 offices:
 - classification: capitol
-  address: 1519 Longworth House Office Building Washington DC 20515-1304
+  address: 1519 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-8203
 - classification: district
-  address: 3240 W Fullerton Ave; Chicago, IL 60647-2512
+  address: 125 N. 19th Ave. Suite A, Melrose Park, IL 60160
   voice: 773-342-0774
-  name: 'District Office #1'
+- classification: district
+  address: 4376 S. Archer Ave., Chicago, IL 60632
+  voice: 773-475-0833
 links:
 - url: https://chuygarcia.house.gov
   note: website
 other_names:
+- name: "C. Garc\xEDa"
 - name: Garcia (IL)
+- name: "Garc\xEDa, C."
+- name: "J.G. Garc\xEDa"
+- name: "Jes\xFAs G. \"Chuy\" Garc\xEDa"
 ids:
   twitter: RepChuyGarcia
 other_identifiers:
@@ -64,3 +68,8 @@ other_identifiers:
   identifier: Jesus Garcia
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jesus_Garcia
+- url: https://chuygarcia.house.gov
+- url: https://en.wikipedia.org/wiki/Jes%c3%bas_%22Chuy%22_Garc%c3%ada
+- url: https://justfacts.votesmart.org/candidate/6261/chuy-garcia
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Jill-N-Tokuda-8bd432ce-3c98-5811-afd6-65f19c5ab6ba.yml b/data/us/legislature/Jill-N-Tokuda-8bd432ce-3c98-5811-afd6-65f19c5ab6ba.yml
index 6d40ee1796..2e5b8c64a1 100644
--- a/data/us/legislature/Jill-N-Tokuda-8bd432ce-3c98-5811-afd6-65f19c5ab6ba.yml
+++ b/data/us/legislature/Jill-N-Tokuda-8bd432ce-3c98-5811-afd6-65f19c5ab6ba.yml
@@ -1,28 +1,35 @@
 id: ocd-person/8bd432ce-3c98-5811-afd6-65f19c5ab6ba
-name: Jill N. Tokuda
+name: Jill Tokuda
 given_name: Jill
 family_name: Tokuda
-middle_name: Naomi
-gender: F
-birth_date: 1976-03-28
+birth_date: 1976-03-03
+gender: Female
+email: https://tokuda.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/T000487.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: HI-2
 offices:
 - classification: capitol
-  address: 1005 Longworth House Office Building Washington DC 20515-1102
+  address: 1005 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4906
+- classification: district
+  address: 700 Bishop St. Suite 1902, Honolulu, HI 96813
+  voice: 808-746-6220
 links:
 - url: https://tokuda.house.gov
   note: website
+- url: https://tokuda.house.gov/
+other_names:
+- name: J. Tokuda
+- name: J.N. Tokuda
+- name: Jill N. Tokuda
+- name: Tokuda, J.
 ids:
   twitter: RepJillTokuda
 other_identifiers:
@@ -42,3 +49,12 @@ other_identifiers:
   identifier: '68493'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jill_Tokuda
+- url: https://en.wikipedia.org/wiki/Jill_N._Tokuda
+- url: https://justfacts.votesmart.org/candidate/68493/jill-tokuda
+- url: https://justfacts.votesmart.org/candidate/biography/68493/jill-tokuda
+- url: https://theunitedstates.io
+- url: https://tokuda.house.gov
+- url: https://www.govtrack.us/congress/members/jill_tokuda/456897
+- url: https://www.linkedin.com/in/jill-tokuda-26b209173
+- url: https://www.linkedin.com/in/jill-tokuda-889b702
diff --git a/data/us/legislature/Jim-Banks-befb976c-1369-5d86-a53f-4aeebdf486cc.yml b/data/us/legislature/Jim-Banks-befb976c-1369-5d86-a53f-4aeebdf486cc.yml
index fa1a87996b..4ab83f7c62 100644
--- a/data/us/legislature/Jim-Banks-befb976c-1369-5d86-a53f-4aeebdf486cc.yml
+++ b/data/us/legislature/Jim-Banks-befb976c-1369-5d86-a53f-4aeebdf486cc.yml
@@ -2,45 +2,48 @@ id: ocd-person/befb976c-1369-5d86-a53f-4aeebdf486cc
 name: Jim Banks
 given_name: Jim
 family_name: Banks
-gender: M
 birth_date: 1979-07-16
+gender: Male
+email: https://banks.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001299.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-3
 offices:
 - classification: capitol
-  address: 2418 Rayburn House Office Building Washington DC 20515-1403
+  address: 2418 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4436
 - classification: district
-  address: 1300 S. Harrison St.; Fort Wayne, IN 46802
+  address: 1300 S. Harrison St., Fort Wayne, IN 46802
   voice: 260-702-4750
-  name: 'District Office #1'
 links:
 - url: https://banks.house.gov
   note: website
+- url: https://banks.house.gov/
+other_names:
+- name: Banks, J.
+- name: J. Banks
+- name: J.E. Banks
 ids:
   twitter: RepJimBanks
   youtube: UC_FR6TySW9uxvhjozkis6Xg
@@ -72,3 +75,10 @@ other_identifiers:
   identifier: '21702'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_Banks_(Indiana)
+- url: https://banks.house.gov
+- url: https://banks.house.gov/biography
+- url: https://banksforsenate.com/meet-jim
+- url: https://en.wikipedia.org/wiki/Jim_Banks
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jim_banks/412702
diff --git a/data/us/legislature/Jim-Costa-8d953afe-9b42-5c80-9f43-4ccf8af79513.yml b/data/us/legislature/Jim-Costa-8d953afe-9b42-5c80-9f43-4ccf8af79513.yml
index 25e49b1ebc..08fd48b087 100644
--- a/data/us/legislature/Jim-Costa-8d953afe-9b42-5c80-9f43-4ccf8af79513.yml
+++ b/data/us/legislature/Jim-Costa-8d953afe-9b42-5c80-9f43-4ccf8af79513.yml
@@ -2,79 +2,83 @@ id: ocd-person/8d953afe-9b42-5c80-9f43-4ccf8af79513
 name: Jim Costa
 given_name: Jim
 family_name: Costa
-gender: M
 birth_date: 1952-04-13
+gender: Male
+email: https://costa.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001059.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-20
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-21
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-20
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-16
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-20
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-16
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-20
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-16
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-16
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-16
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-20
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-20
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-20
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-21
+  district: CA-20
 offices:
 - classification: capitol
-  address: 2081 Rayburn House Office Building Washington DC 20515-0521
+  address: 2081 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3341
+  fax: 202-225-9308
 - classification: district
-  address: 855 M St. Suite 940; Fresno, CA 93721
+  address: 2440 Tulare St. Suite 420, Fresno, CA 93721
   voice: 559-495-1620
-  name: 'District Office #1'
+  fax: 559-495-1027
 - classification: district
-  address: 2222 M St. Suite 305; Merced, CA 95340
-  voice: 209-384-1620
-  name: 'District Office #2'
+  address: 425 E. Oak Ave. Suite 202, Visalia, CA 93291
+  voice: 559-749-9330
 links:
 - url: https://costa.house.gov
   note: website
+- url: https://costa.house.gov/
+other_names:
+- name: Costa, J.
+- name: J. Costa
+- name: J.M. Costa
 ids:
   twitter: RepJimCosta
   youtube: UCVgXX23eJEai6GiBOKO6dvA
@@ -110,3 +114,9 @@ other_identifiers:
   identifier: Jim Costa
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_Costa
+- url: https://costa.house.gov
+- url: https://en.wikipedia.org/wiki/Jim_Costa
+- url: https://justfacts.votesmart.org/candidate/3577/jim-costa
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jim_costa/400618
diff --git a/data/us/legislature/Jim-Jordan-bc5dadc9-a085-507e-82e1-1622d9a1fc90.yml b/data/us/legislature/Jim-Jordan-bc5dadc9-a085-507e-82e1-1622d9a1fc90.yml
index e2c9358b55..aa575fc6ed 100644
--- a/data/us/legislature/Jim-Jordan-bc5dadc9-a085-507e-82e1-1622d9a1fc90.yml
+++ b/data/us/legislature/Jim-Jordan-bc5dadc9-a085-507e-82e1-1622d9a1fc90.yml
@@ -2,80 +2,79 @@ id: ocd-person/bc5dadc9-a085-507e-82e1-1622d9a1fc90
 name: Jim Jordan
 given_name: Jim
 family_name: Jordan
-gender: M
 birth_date: 1964-02-17
+gender: Male
+email: https://jordan.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/J000289.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-4
 offices:
 - classification: capitol
-  address: 2056 Rayburn House Office Building Washington DC 20515-3504
+  address: 2056 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2676
+  fax: 202-226-0577
 - classification: district
-  address: 500 S. Sandusky Ave.; Bucyrus, OH 44820
-  voice: 419-663-1426
-  name: 'District Office #1'
+  address: 28 Park Ave. West Suite 100A, Mansfield, OH 44902
+  voice: 419-982-8045
+  fax: 419-668-3015
 - classification: district
-  address: 3121 W. Elm Plz.; Lima, OH 45805
+  address: 3121 W. Elm Plaza, Lima, OH 45805
   voice: 419-999-6455
   fax: 419-999-4238
-  name: 'District Office #2'
-- classification: district
-  address: 13 B E. Main St.; Norwalk, OH 44857
-  voice: 419-663-1426
-  fax: 419-668-3015
-  name: 'District Office #3'
 links:
 - url: https://jordan.house.gov
   note: website
+- url: https://jordan.house.gov/
+other_names:
+- name: J. Jordan
+- name: J.D. Jordan
+- name: Jordan, J.
 ids:
   twitter: Jim_Jordan
   youtube: UCPFBhS00ivPV585GlnNlyqA
@@ -111,3 +110,8 @@ other_identifiers:
   identifier: kg:/m/04l4x5
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jim_Jordan_(Ohio)
+- url: https://en.wikipedia.org/wiki/Jim_Jordan_%28Ohio_politician%29
+- url: https://jordan.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jim_jordan/412226
diff --git a/data/us/legislature/Jimmy-Gomez-20be777c-8a2b-54c6-9b54-df88ff19b8ae.yml b/data/us/legislature/Jimmy-Gomez-20be777c-8a2b-54c6-9b54-df88ff19b8ae.yml
index f2a5ba7404..fa665dce54 100644
--- a/data/us/legislature/Jimmy-Gomez-20be777c-8a2b-54c6-9b54-df88ff19b8ae.yml
+++ b/data/us/legislature/Jimmy-Gomez-20be777c-8a2b-54c6-9b54-df88ff19b8ae.yml
@@ -2,45 +2,48 @@ id: ocd-person/20be777c-8a2b-54c6-9b54-df88ff19b8ae
 name: Jimmy Gomez
 given_name: Jimmy
 family_name: Gomez
-gender: M
 birth_date: 1974-11-25
+gender: Male
+email: https://gomez.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000585.jpg
 party:
-- start_date: '2017-07-11'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-07-11'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-34
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-34
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-34
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-07-11
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-34
 offices:
 - classification: capitol
-  address: 506 Cannon House Office Building Washington DC 20515-0534
+  address: 506 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6235
 - classification: district
-  address: '350 S. Bixel St. #120; Los Angeles, CA 90017'
+  address: 350 S. Bixel St. Suite 120, Los Angeles, CA 90017
   voice: 213-481-1425
-  name: 'District Office #1'
+  fax: 213-481-1427
 links:
 - url: https://gomez.house.gov
   note: website
+- url: https://gomez.house.gov/
+other_names:
+- name: Gomez, J.
+- name: J. Gomez
 ids:
   twitter: RepJimmyGomez
   facebook: RepJimmyGomez
@@ -73,3 +76,11 @@ other_identifiers:
   identifier: '21754'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jimmy_Gomez
+- url: https://chci.org/staff-and-leadership/rep-jimmy-gomez-5
+- url: https://en.wikipedia.org/wiki/Jimmy_Gomez
+- url: https://gomez.house.gov
+- url: https://gomez.house.gov/biography
+- url: https://justfacts.votesmart.org/candidate/biography/138524/jimmy-gomez
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jimmy_gomez/412739
diff --git a/data/us/legislature/Jimmy-Panetta-946e688a-6b60-567e-bea7-893eb4364acc.yml b/data/us/legislature/Jimmy-Panetta-946e688a-6b60-567e-bea7-893eb4364acc.yml
index 03852e95d1..ffd12db52d 100644
--- a/data/us/legislature/Jimmy-Panetta-946e688a-6b60-567e-bea7-893eb4364acc.yml
+++ b/data/us/legislature/Jimmy-Panetta-946e688a-6b60-567e-bea7-893eb4364acc.yml
@@ -2,51 +2,60 @@ id: ocd-person/946e688a-6b60-567e-bea7-893eb4364acc
 name: Jimmy Panetta
 given_name: Jimmy
 family_name: Panetta
-gender: M
 birth_date: 1969-10-01
+gender: Male
+email: https://panetta.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/P000613.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-20
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-19
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-20
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-20
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
+  district: CA-20
 offices:
 - classification: capitol
-  address: 304 Cannon House Office Building Washington DC 20515-0519
+  address: 304 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2861
+  fax: 202-225-6791
 - classification: district
-  address: 100 W. Alisal St.; Salinas, CA 93901
+  address: 1200 Aguajito Road Suite 003, Monterey, CA 93940
   voice: 831-424-2229
-  fax: 831-424-7099
-  name: 'District Office #1'
+  fax: 831-429-1458
 - classification: district
-  address: 701 Ocean St. Room 318C; Santa Cruz, CA 95060
+  address: 701 Ocean St. Room 318C, Santa Cruz, CA 95060
   voice: 831-429-1976
-  fax: 831-424-7099
-  name: 'District Office #2'
+  fax: 831-429-1458
+- classification: district
+  address: 800 Pine St., Paso Robles, CA 93446
+  voice: 805-400-6535
+- classification: district
+  address: 841 Blossom Hill Road Suite 209, San Jose, CA 95123
+  voice: 408-960-0333
 links:
 - url: https://panetta.house.gov
   note: website
+- url: https://panetta.house.gov/
+other_names:
+- name: J. Panetta
+- name: J.V. Panetta
+- name: Panetta, J.
 ids:
   twitter: RepJimmyPanetta
   youtube: UCmw-aERG51C96edMDPN7fXQ
@@ -78,3 +87,8 @@ other_identifiers:
   identifier: Jimmy Panetta
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jimmy_Panetta
+- url: https://en.wikipedia.org/wiki/Jimmy_Panetta
+- url: https://justfacts.votesmart.org/candidate/biography/169078/jimmy-panetta
+- url: https://panetta.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Joaquin-Castro-d0fe7bc7-b883-5485-814f-f7cee999e409.yml b/data/us/legislature/Joaquin-Castro-d0fe7bc7-b883-5485-814f-f7cee999e409.yml
index 435052272c..65fda261b2 100644
--- a/data/us/legislature/Joaquin-Castro-d0fe7bc7-b883-5485-814f-f7cee999e409.yml
+++ b/data/us/legislature/Joaquin-Castro-d0fe7bc7-b883-5485-814f-f7cee999e409.yml
@@ -2,62 +2,64 @@ id: ocd-person/d0fe7bc7-b883-5485-814f-f7cee999e409
 name: Joaquin Castro
 given_name: Joaquin
 family_name: Castro
-gender: M
 birth_date: 1974-09-16
+gender: Male
+email: https://castro.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001091.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-20
 offices:
 - classification: capitol
-  address: 2241 Rayburn House Office Building Washington DC 20515-4320
+  address: 2241 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3236
+  fax: 202-225-1915
 - classification: district
-  address: 727 E. Chavez Blvd. Suite B-128; San Antonio, TX 78206
+  address: 727 E. Cesar E. Chavez Blvd. Suite B-128, San Antonio, TX 78206
   voice: 210-348-8216
   fax: 210-979-0737
-  name: 'District Office #1'
 links:
 - url: https://castro.house.gov
   note: website
+- url: https://castro.house.gov/
+other_names:
+- name: Castro (TX)
+- name: Castro, J.
+- name: J. Castro
 ids:
   twitter: JoaquinCastrotx
   youtube: UCsRxWnFdRiV2od1O5v5nEeQ
   facebook: '326420614138023'
-other_names:
-- name: Castro (TX)
 other_identifiers:
 - scheme: govtrack
   identifier: '412576'
@@ -87,3 +89,10 @@ other_identifiers:
   identifier: kg:/m/0bmclg
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joaquin_Castro
+- url: https://castro.house.gov
+- url: https://en.wikipedia.org/wiki/Joaqu%C3%ADn_Castro
+- url: https://justfacts.votesmart.org/candidate/biography/49227/joaquin-castro
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joaquin_castro/412576
+- url: https://www.linkedin.com/in/joaquin-castro-2626ab51
diff --git a/data/us/legislature/Jodey-C-Arrington-4938e6be-7c14-536d-a559-91c74fcc17db.yml b/data/us/legislature/Jodey-C-Arrington-4938e6be-7c14-536d-a559-91c74fcc17db.yml
index 1a32c9ad74..505cca6bea 100644
--- a/data/us/legislature/Jodey-C-Arrington-4938e6be-7c14-536d-a559-91c74fcc17db.yml
+++ b/data/us/legislature/Jodey-C-Arrington-4938e6be-7c14-536d-a559-91c74fcc17db.yml
@@ -1,53 +1,56 @@
 id: ocd-person/4938e6be-7c14-536d-a559-91c74fcc17db
-name: Jodey C. Arrington
+name: Jodey Arrington
 given_name: Jodey
 family_name: Arrington
-middle_name: C.
-gender: M
 birth_date: 1972-03-09
+gender: Male
+email: https://arrington.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/A000375.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-19
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-19
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-19
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-19
 offices:
 - classification: capitol
-  address: 1107 Longworth House Office Building Washington DC 20515-4319
+  address: 1107 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4005
+  fax: 202-225-9615
 - classification: district
-  address: 500 Chestnut St. Suite 819; Abilene, TX 79602
-  voice: 325-675-9779
-  fax: 325-675-5038
-  name: 'District Office #1'
-- classification: district
-  address: 1312 Texas Ave. Suite 219; Lubbock, TX 79401
+  address: 1312 Texas Ave. Suite 219, Lubbock, TX 79401
   voice: 806-763-1611
   fax: 806-767-9168
-  name: 'District Office #2'
+- classification: district
+  address: 500 Chestnut St. Suite 819, Abilene, TX 79602
+  voice: 325-675-9779
+  fax: 325-675-5038
 links:
 - url: https://arrington.house.gov
   note: website
+- url: https://arrington.house.gov/
+other_names:
+- name: Arrington, J.
+- name: J. Arrington
+- name: J.C. Arrington
+- name: Jodey C. Arrington
 ids:
   twitter: RepArrington
   facebook: JodeyArrington
@@ -78,3 +81,10 @@ other_identifiers:
   identifier: Jodey Arrington
 sources:
 - url: https://theunitedstates.io/
+- url: https://arrington.house.gov
+- url: https://ballotpedia.org/Jodey_Arrington
+- url: https://en.wikipedia.org/wiki/Jodey_Arrington
+- url: https://justfacts.votesmart.org/candidate/biography/155685/jodey-arrington
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jodey_arrington/412726
+- url: https://www.linkedin.com/in/jodeyarrington
diff --git a/data/us/legislature/Joe-Courtney-b34622c6-66c7-5f9a-822f-55e3f9ac3c73.yml b/data/us/legislature/Joe-Courtney-b34622c6-66c7-5f9a-822f-55e3f9ac3c73.yml
index 2912f56758..155704a39e 100644
--- a/data/us/legislature/Joe-Courtney-b34622c6-66c7-5f9a-822f-55e3f9ac3c73.yml
+++ b/data/us/legislature/Joe-Courtney-b34622c6-66c7-5f9a-822f-55e3f9ac3c73.yml
@@ -2,76 +2,79 @@ id: ocd-person/b34622c6-66c7-5f9a-822f-55e3f9ac3c73
 name: Joe Courtney
 given_name: Joe
 family_name: Courtney
-gender: M
 birth_date: 1953-04-06
+gender: Male
+email: https://courtney.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001069.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-2
 offices:
 - classification: capitol
-  address: 2449 Rayburn House Office Building Washington DC 20515-0702
+  address: 2449 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2076
+  fax: 202-225-4977
 - classification: district
-  address: 77 Hazard Ave. Unit J; Enfield, CT 06082
-  voice: 860-741-6011
-  fax: 860-741-6036
-  name: 'District Office #1'
-- classification: district
-  address: 55 Main St. Suite 250; Norwich, CT 06360
+  address: 55 Main St. Suite 250, Norwich, CT 06360
   voice: 860-886-0139
   fax: 860-886-2974
-  name: 'District Office #2'
+- classification: district
+  address: 77 Hazard Ave. Unit J, Enfield, CT 06082
+  voice: 860-741-6011
+  fax: 860-741-6036
 links:
 - url: https://courtney.house.gov
   note: website
+- url: https://courtney.house.gov/
+other_names:
+- name: Courtney, J.
+- name: J. Courtney
+- name: J.D. Courtney
 ids:
   twitter: RepJoeCourtney
   youtube: UCGVIfe1T2hO1Lx7ap5Wkv1w
@@ -107,3 +110,9 @@ other_identifiers:
   identifier: kg:/m/0700nd
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joe_Courtney
+- url: https://courtney.house.gov
+- url: https://en.wikipedia.org/wiki/Joe_Courtney_(politician)
+- url: https://justfacts.votesmart.org/candidate/30333/joe-courtney
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joe_courtney/412193
diff --git a/data/us/legislature/Joe-Manchin-III-3da2fb45-0c89-544c-b41d-888d623cf99c.yml b/data/us/legislature/Joe-Manchin-III-3da2fb45-0c89-544c-b41d-888d623cf99c.yml
index b7ffa1d22e..9a7560f7d4 100644
--- a/data/us/legislature/Joe-Manchin-III-3da2fb45-0c89-544c-b41d-888d623cf99c.yml
+++ b/data/us/legislature/Joe-Manchin-III-3da2fb45-0c89-544c-b41d-888d623cf99c.yml
@@ -1,64 +1,62 @@
 id: ocd-person/3da2fb45-0c89-544c-b41d-888d623cf99c
-name: Joe Manchin, III
+name: Joe Manchin
 given_name: Joe
 family_name: Manchin
-gender: M
 birth_date: 1947-08-24
+gender: Male
+email: https://www.manchin.senate.gov/contact-joe/email-joe
 image: https://theunitedstates.io/images/congress/450x550/M001183.jpg
 party:
-- start_date: '2010-11-15'
-  end_date: '2019-01-03'
-  name: Democratic
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Independent
+- name: Independent
 roles:
-- start_date: '2010-11-15'
-  end_date: '2013-01-03'
+- start_date: 2010-11-15
+  end_date: 2025-01-02
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: West Virginia
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: West Virginia
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2010-11-15
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: West Virginia
 offices:
 - classification: capitol
-  address: 306 Hart Senate Office Building Washington DC 20510
+  address: 306 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3954
+  fax: 202-228-0002
 - classification: district
-  address: 900 Pennsylvania Ave. Suite 629; Charleston, WV 25302
-  voice: 304-342-5855
-  fax: 304-343-7144
-  name: 'District Office #1'
-- classification: district
-  address: 230 Adams St.; Fairmont, WV 26554
+  address: 230 Adams St., Fairmont, WV 26554
   voice: 304-368-0567
   fax: 304-368-0198
-  name: 'District Office #2'
 - classification: district
-  address: 261 Aikens Ctr. Suite 305; Martinsburg, WV 25404
+  address: 261 Aikens Center Suite 305, Martinsburg, WV 25404
   voice: 304-264-4626
   fax: 304-262-3039
-  name: 'District Office #3'
+- classification: district
+  address: 900 Pennsylvania Ave. Suite 629, Charleston, WV 25302
+  voice: 304-342-5855
+  fax: 304-343-7144
 links:
 - url: https://www.manchin.senate.gov
   note: website
 - url: https://www.manchin.senate.gov/public/index.cfm/contact-form
   note: contact form
+- url: https://www.manchin.senate.gov/
+other_names:
+- name: J. Manchin
+- name: Joe Manchin, III
+- name: Joseph Manchin
+- name: Manchin (D-WV)
+- name: Manchin, J.
 ids:
   twitter: Sen_JoeManchin
   youtube: UCGyPK_ye2ptpzQgOjKIn7ag
   facebook: JoeManchinIII
-other_names:
-- name: Joseph Manchin
-- name: Manchin (D-WV)
 other_identifiers:
 - scheme: bioguide
   identifier: M001183
@@ -90,3 +88,8 @@ other_identifiers:
   identifier: kg:/m/04lc5t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joe_Manchin_III
+- url: https://en.wikipedia.org/wiki/Joe_Manchin
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joe_manchin/412391
+- url: https://www.manchin.senate.gov
diff --git a/data/us/legislature/Joe-Neguse-04243e35-118c-5541-a21e-763c594a083a.yml b/data/us/legislature/Joe-Neguse-04243e35-118c-5541-a21e-763c594a083a.yml
index eb42709cbe..225ca6a755 100644
--- a/data/us/legislature/Joe-Neguse-04243e35-118c-5541-a21e-763c594a083a.yml
+++ b/data/us/legislature/Joe-Neguse-04243e35-118c-5541-a21e-763c594a083a.yml
@@ -2,44 +2,49 @@ id: ocd-person/04243e35-118c-5541-a21e-763c594a083a
 name: Joe Neguse
 given_name: Joe
 family_name: Neguse
-gender: M
 birth_date: 1984-05-13
+gender: Male
+email: https://neguse.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/N000191.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-2
 offices:
 - classification: capitol
-  address: 2400 Rayburn House Office Building Washington DC 20515-0602
+  address: 2400 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2161
 - classification: district
-  address: 2503 Walnut St Suite 300; Boulder, CO 80302-5748
+  address: 1220 S. College Ave. Unit 100A, Fort Collins, CO 80524
+  voice: 970-372-3971
+- classification: district
+  address: 2503 Walnut St. Suite 300, Boulder, CO 80302
   voice: 303-335-1045
-  name: 'District Office #1'
 - classification: district
-  address: 1220 S College Ave Unit 100A; Fort Collins, CO 80524-3785
-  voice: 970-372-3971
-  name: 'District Office #2'
+  address: 620 E. Main St., Frisco, CO 80443
+  voice: 303-335-1045
 links:
 - url: https://neguse.house.gov
   note: website
+- url: https://neguse.house.gov/
+other_names:
+- name: J. Neguse
+- name: J.D. Neguse
+- name: Neguse, J.
 ids:
   twitter: RepJoeNeguse
 other_identifiers:
@@ -65,3 +70,8 @@ other_identifiers:
   identifier: kg:/g/11gnsnch0m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joe_Neguse
+- url: https://en.wikipedia.org/wiki/Joe_Neguse
+- url: https://neguse.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/joe-neguse-a7a333b
diff --git a/data/us/legislature/Joe-Wilson-af50abf4-b711-5bbc-a920-465e39c99f42.yml b/data/us/legislature/Joe-Wilson-af50abf4-b711-5bbc-a920-465e39c99f42.yml
index 5e29f6a855..6449510d07 100644
--- a/data/us/legislature/Joe-Wilson-af50abf4-b711-5bbc-a920-465e39c99f42.yml
+++ b/data/us/legislature/Joe-Wilson-af50abf4-b711-5bbc-a920-465e39c99f42.yml
@@ -2,98 +2,98 @@ id: ocd-person/af50abf4-b711-5bbc-a920-465e39c99f42
 name: Joe Wilson
 given_name: Joe
 family_name: Wilson
-middle_name: G.
-gender: M
 birth_date: 1947-07-31
+gender: Male
+email: https://joewilson.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/W000795.jpg
 party:
-- start_date: '2001-12-18'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2001-12-18'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-12-18
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-2
 offices:
 - classification: capitol
-  address: 1436 Longworth House Office Building Washington DC 20515-4002
+  address: 1436 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2452
 - classification: district
-  address: 1930 University Pky. Suite 1600; Aiken, SC 29801
-  voice: 803-642-6416
-  fax: 803-642-6418
-  name: 'District Office #1'
-- classification: district
-  address: 1700 Sunset Blvd. (US 378) Suite 1; West Columbia, SC 29169
+  address: 1700 Sunset Blvd. Suite 1, West Columbia, SC 29169
   voice: 803-939-0041
   fax: 803-939-0078
-  name: 'District Office #2'
+- classification: district
+  address: 1930 University Parkway Suite 1600, Aiken, SC 29801
+  voice: 803-642-6416
+  fax: 803-642-6418
 links:
 - url: https://joewilson.house.gov
   note: website
+- url: https://joewilson.house.gov/
+other_names:
+- name: A.G. Wilson
+- name: J. Wilson
+- name: Wilson (SC)
+- name: Wilson, J.
 ids:
   twitter: RepJoeWilson
   youtube: UC3aR1B8m7Z1uycO65yDnpCg
   facebook: JoeWilson
-other_names:
-- name: Wilson (SC)
 other_identifiers:
 - scheme: bioguide
   identifier: W000795
@@ -125,3 +125,9 @@ other_identifiers:
   identifier: kg:/m/03tll0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joe_Wilson_(South_Carolina)
+- url: https://en.wikipedia.org/wiki/Joe_Wilson_%28U.S._politician%29
+- url: https://joewilson.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/3985/joe-wilson-sr
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joe_wilson/400433
diff --git a/data/us/legislature/John-B-Larson-4d2b82fc-189e-5007-980f-64a85612afdb.yml b/data/us/legislature/John-B-Larson-4d2b82fc-189e-5007-980f-64a85612afdb.yml
index 9e67515bb8..490c822a85 100644
--- a/data/us/legislature/John-B-Larson-4d2b82fc-189e-5007-980f-64a85612afdb.yml
+++ b/data/us/legislature/John-B-Larson-4d2b82fc-189e-5007-980f-64a85612afdb.yml
@@ -1,99 +1,102 @@
 id: ocd-person/4d2b82fc-189e-5007-980f-64a85612afdb
-name: John B. Larson
+name: John Larson
 given_name: John
 family_name: Larson
-middle_name: B.
-gender: M
 birth_date: 1948-07-22
+gender: Male
+email: https://larson.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000557.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-1
 offices:
 - classification: capitol
-  address: 1501 Longworth House Office Building Washington DC 20515-0701
+  address: 1501 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2265
+  fax: 202-225-1031
 - classification: district
-  address: 221 Main St. 2nd Floor; Hartford, CT 06106
+  address: 361 Main St. 3rd Floor, East Hartford, CT 06118
   voice: 860-278-8888
   fax: 860-278-2111
-  name: 'District Office #1'
 links:
 - url: https://larson.house.gov
   note: website
+- url: https://larson.house.gov/
+other_names:
+- name: J. Larson
+- name: J.B. Larson
+- name: John B. Larson
+- name: Larson (CT)
+- name: Larson, J.
 ids:
   twitter: RepJohnLarson
   youtube: UCGPsvFF-9WfpdRSCcCrPLiQ
   facebook: RepJohnLarson
-other_names:
-- name: Larson (CT)
 other_identifiers:
 - scheme: bioguide
   identifier: L000557
@@ -125,3 +128,9 @@ other_identifiers:
   identifier: kg:/m/024zl9
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Larson_(Connecticut)
+- url: https://en.wikipedia.org/wiki/John_B._Larson
+- url: https://justfacts.votesmart.org/candidate/17188/john-larson
+- url: https://larson.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_larson/400233
diff --git a/data/us/legislature/John-Barrasso-80f88c07-5f6d-5ca3-8121-9202259a50f2.yml b/data/us/legislature/John-Barrasso-80f88c07-5f6d-5ca3-8121-9202259a50f2.yml
index a7d7ed915d..ab7ebf7528 100644
--- a/data/us/legislature/John-Barrasso-80f88c07-5f6d-5ca3-8121-9202259a50f2.yml
+++ b/data/us/legislature/John-Barrasso-80f88c07-5f6d-5ca3-8121-9202259a50f2.yml
@@ -2,65 +2,64 @@ id: ocd-person/80f88c07-5f6d-5ca3-8121-9202259a50f2
 name: John Barrasso
 given_name: John
 family_name: Barrasso
-middle_name: A.
-gender: M
 birth_date: 1952-07-21
+gender: Male
+email: https://www.barrasso.senate.gov/public/index.cfm/contact-form
 image: https://theunitedstates.io/images/congress/450x550/B001261.jpg
 party:
-- start_date: '2007-06-25'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-06-25'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wyoming
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wyoming
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-06-25
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wyoming
 offices:
 - classification: capitol
-  address: 307 Dirksen Senate Office Building Washington DC 20510
+  address: 2120 Capitol Ave. Suite 2013, Cheyenne, WY 82001
+  voice: 307-772-2451
+- classification: capitol
+  address: 307 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-6441
+  fax: 202-224-1724
 - classification: district
-  address: 100 E. B St. Suite 2004; Casper, WY 82601
+  address: 100 E. B St., Suite 2004, Casper, WY 82601
   voice: 307-261-6413
-  name: 'District Office #1'
-- classification: district
-  address: 2120 Capitol Ave. Suite 2013; Cheyenne, WY 82001
-  voice: 307-772-2451
-  name: 'District Office #2'
 - classification: district
-  address: 324 E. Washington Ave.; Riverton, WY 82501
+  address: 324 E. Washington Ave., Riverton, WY 82501
   voice: 307-856-6642
-  name: 'District Office #3'
 - classification: district
-  address: 1575 Dewar Drive Suite 218; Rock Springs, WY 82901
-  voice: 307-362-5012
-  name: 'District Office #4'
-- classification: district
-  address: 2 N. Main St. Suite 206; Sheridan, WY 82801
+  address: 51 Coffeen Ave. Suite 202, Sheridan, WY 82801
   voice: 307-672-6456
-  name: 'District Office #5'
+- classification: district
+  address: Commerce Bank of Wyoming 1575 Dewar Drive, Suite 218, Rock Springs, WY
+    82901
+  voice: 307-362-5012
 links:
 - url: https://www.barrasso.senate.gov
   note: website
 - url: https://www.barrasso.senate.gov/public/index.cfm/contact-form
   note: contact form
+- url: https://www.barrasso.senate.gov/
+other_names:
+- name: Barrasso (R-WY)
+- name: Barrasso, J.
+- name: J. Barrasso
+- name: J.A. Barrasso
 ids:
   twitter: SenJohnBarrasso
   youtube: UC80PfiCAB2Fe1MFayWlR6GQ
   facebook: johnbarrasso
-other_names:
-- name: Barrasso (R-WY)
 other_identifiers:
 - scheme: bioguide
   identifier: B001261
@@ -92,3 +91,10 @@ other_identifiers:
   identifier: kg:/m/02rsm32
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Barrasso
+- url: https://en.wikipedia.org/wiki/John_Barrasso
+- url: https://justfacts.votesmart.org/candidate/52662/john-barrasso
+- url: https://theunitedstates.io
+- url: https://www.barrasso.senate.gov
+- url: https://www.barrasso.senate.gov/public/index.cfm/biography
+- url: https://www.govtrack.us/congress/members/john_barrasso/412251
diff --git a/data/us/legislature/John-Boozman-b352dd8b-dd06-57b0-833a-2b0b3bd33ad6.yml b/data/us/legislature/John-Boozman-b352dd8b-dd06-57b0-833a-2b0b3bd33ad6.yml
index da780b25e0..6d2836cac4 100644
--- a/data/us/legislature/John-Boozman-b352dd8b-dd06-57b0-833a-2b0b3bd33ad6.yml
+++ b/data/us/legislature/John-Boozman-b352dd8b-dd06-57b0-833a-2b0b3bd33ad6.yml
@@ -2,104 +2,101 @@ id: ocd-person/b352dd8b-dd06-57b0-833a-2b0b3bd33ad6
 name: John Boozman
 given_name: John
 family_name: Boozman
-gender: M
 birth_date: 1950-12-10
+gender: Male
+email: https://www.boozman.senate.gov/public/index.cfm/e-mail-me
 image: https://theunitedstates.io/images/congress/450x550/B001236.jpg
 party:
-- start_date: '2001-11-29'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2001-11-29'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Arkansas
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Arkansas
+- start_date: 2011-01-05
+  end_date: 2017-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Arkansas
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2001-11-29
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Arkansas
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Arkansas
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Arkansas
 offices:
 - classification: capitol
-  address: 555 Dirksen Senate Office Building Washington DC 20510
+  address: 1401 W. Capitol Ave. Suite 155, Little Rock, AR 72201
+  voice: 501-372-7153
+  fax: 501-372-7163
+- classification: capitol
+  address: 555 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-4843
+  fax: 202-228-1371
+- classification: district
+  address: 1001 Highway 62 East Suite 11, Mountain Home, AR 72653
+  voice: 870-424-0129
+  fax: 870-424-0141
 - classification: district
-  address: 106 W. Main St. Suite 104; El Dorado, AR 71730
+  address: 106 W. Main St. Suite 104, El Dorado, AR 71730
   voice: 870-863-4641
   fax: 870-863-4105
-  name: 'District Office #1'
 - classification: district
-  address: 1120 Garrison Ave. Suite 2B; Fort Smith, AR 72901
+  address: 1120 Garrison Ave. Suite 2B, Fort Smith, AR 72901
   voice: 479-573-0189
   fax: 479-573-0553
-  name: 'District Office #2'
 - classification: district
-  address: 300 S. Church St. Suite 400; Jonesboro, AR 72401
-  voice: 870-268-6925
-  fax: 870-268-6887
-  name: 'District Office #3'
-- classification: district
-  address: 1401 W. Capitol Ave. Suite 155; Little Rock, AR 72201
-  voice: 501-372-7153
-  fax: 501-372-7163
-  name: 'District Office #4'
-- classification: district
-  address: 213 W. Monroe Suite N; Lowell, AR 72745
+  address: 213 W. Monroe Ave. Suite N, Lowell, AR 72745
   voice: 479-725-0400
   fax: 479-725-0408
-  name: 'District Office #5'
 - classification: district
-  address: 1001 Hwy 62 East Suite 11; Mountain Home, AR 72653
-  voice: 870-424-0129
-  fax: 870-424-0141
-  name: 'District Office #6'
+  address: 300 S. Church St. Suite 400, Jonesboro, AR 72401
+  voice: 870-268-6925
+  fax: 870-268-6887
 - classification: district
-  address: 620 E. 22nd St. Suite 204; Stuttgart, AR 72160
+  address: 620 E. 22nd St. Suite 204, Stuttgart, AR 72160
   voice: 870-672-6941
   fax: 870-672-6962
-  name: 'District Office #7'
 links:
 - url: https://www.boozman.senate.gov/public
   note: website
 - url: https://www.boozman.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.boozman.senate.gov/public/index.cfm/home
+other_names:
+- name: Boozman (R-AR)
+- name: Boozman, J.
+- name: J. Boozman
+- name: J.N. Boozman
 ids:
   twitter: JohnBoozman
   youtube: UC9vWHKL5OfIYh6kIV0rF2yw
   facebook: JohnBoozman
-other_names:
-- name: Boozman (R-AR)
 other_identifiers:
 - scheme: bioguide
   identifier: B001236
@@ -135,3 +132,9 @@ other_identifiers:
   identifier: kg:/m/024s3v
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Boozman
+- url: https://en.wikipedia.org/wiki/John_Boozman
+- url: https://justfacts.votesmart.org/candidate/27958/john-boozman
+- url: https://theunitedstates.io
+- url: https://www.boozman.senate.gov/public/index.cfm/home
+- url: https://www.govtrack.us/congress/members/john_boozman/400040
diff --git a/data/us/legislature/John-Cornyn-d274933a-e19d-5d3b-ab91-dc6611aaadd1.yml b/data/us/legislature/John-Cornyn-d274933a-e19d-5d3b-ab91-dc6611aaadd1.yml
index 44c25cb3ae..8ba962a5b4 100644
--- a/data/us/legislature/John-Cornyn-d274933a-e19d-5d3b-ab91-dc6611aaadd1.yml
+++ b/data/us/legislature/John-Cornyn-d274933a-e19d-5d3b-ab91-dc6611aaadd1.yml
@@ -2,89 +2,77 @@ id: ocd-person/d274933a-e19d-5d3b-ab91-dc6611aaadd1
 name: John Cornyn
 given_name: John
 family_name: Cornyn
-gender: M
 birth_date: 1952-02-02
+gender: Male
+email: https://www.cornyn.senate.gov/contact-john-cornyn/
 image: https://theunitedstates.io/images/congress/450x550/C001056.jpg
 party:
-- start_date: '2002-11-30'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2002-11-30'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2009-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2002-11-30
+  end_date: 2003-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
 offices:
 - classification: capitol
-  address: 517 Hart Senate Office Building Washington DC 20510
+  address: 517 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2934
 - classification: district
-  address: 221 W. Sixth St. Suite 1530; Austin, TX 78701
-  voice: 512-469-6034
-  fax: 512-469-6020
-  name: 'District Office #1'
-- classification: district
-  address: 5001 Spring Valley Rd. Suite 1125 E; Dallas, TX 75244
+  address: 5001 Spring Valley Road Suite 1125 East, Dallas, TX 75244
   voice: 972-239-1310
-  fax: 972-239-2110
-  name: 'District Office #2'
 - classification: district
-  address: 222 E. Van Buren Suite 404; Harlingen, TX 78550
-  voice: 956-423-0162
-  fax: 956-423-0193
-  name: 'District Office #3'
-- classification: district
-  address: 5300 Memorial Dr. Suite 980; Houston, TX 77007
+  address: 5300 Memorial Drive Suite 710, Houston, TX 77007
   voice: 713-572-3337
-  fax: 713-572-3777
-  name: 'District Office #4'
 - classification: district
-  address: 1500 Broadway Suite 1230; Lubbock, TX 79401
-  voice: 806-472-7533
-  fax: 806-472-7536
-  name: 'District Office #5'
-- classification: district
-  address: 600 Navarro Suite 210; San Antonio, TX 78205
+  address: 600 Navarro St. Suite 210, San Antonio, TX 78205
   voice: 210-224-7485
-  fax: 210-224-8569
-  name: 'District Office #6'
 - classification: district
-  address: 100 E. Ferguson St. Suite 1004; Tyler, TX 75702
+  address: 6770 W. Expressway 83 Suite 302, Harlingen, TX 78552
+  voice: 956-423-0162
+- classification: district
+  address: Chase Tower 221 W. 6th St., Suite 1530, Austin, TX 78701
+  voice: 512-469-6034
+- classification: district
+  address: Regions Bank Building 100 E. Ferguson St., Suite 1004, Tyler, TX 75702
   voice: 903-593-0902
-  fax: 903-593-0920
-  name: 'District Office #7'
+- classification: district
+  address: Wells Fargo Center 1500 Broadway St., Suite 1230, Lubbock, TX 79401
+  voice: 806-472-7533
 links:
 - url: https://www.cornyn.senate.gov
   note: website
 - url: https://www.cornyn.senate.gov/contact
   note: contact form
+- url: https://www.cornyn.senate.gov/
+other_names:
+- name: Cornyn (R-TX)
+- name: Cornyn, J.
+- name: J. Cornyn
 ids:
   twitter: JohnCornyn
   youtube: UCyQwLQavlOaJ64YuY_VMtiQ
   facebook: sen.johncornyn
-other_names:
-- name: Cornyn (R-TX)
 other_identifiers:
 - scheme: bioguide
   identifier: C001056
@@ -116,3 +104,11 @@ other_identifiers:
   identifier: kg:/m/01xcqs
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Cornyn
+- url: https://en.wikipedia.org/wiki/John_Cornyn
+- url: https://justfacts.votesmart.org/candidate/biography/15375/john-cornyn
+- url: https://theunitedstates.io
+- url: https://www.cornyn.senate.gov
+- url: https://www.cornyn.senate.gov/about/about-john-cornyn
+- url: https://www.govtrack.us/congress/members/john_cornyn/300027
+- url: https://www.johncornyn.com/meet-john
diff --git a/data/us/legislature/John-Fetterman-6f500f52-75ce-5cf0-afc6-5be71f0921d2.yml b/data/us/legislature/John-Fetterman-6f500f52-75ce-5cf0-afc6-5be71f0921d2.yml
index f8d536737c..e9ff5dc9f4 100644
--- a/data/us/legislature/John-Fetterman-6f500f52-75ce-5cf0-afc6-5be71f0921d2.yml
+++ b/data/us/legislature/John-Fetterman-6f500f52-75ce-5cf0-afc6-5be71f0921d2.yml
@@ -2,32 +2,50 @@ id: ocd-person/6f500f52-75ce-5cf0-afc6-5be71f0921d2
 name: John Fetterman
 given_name: John
 family_name: Fetterman
-middle_name: Karl
-gender: M
 birth_date: 1969-08-15
+gender: Male
+email: https://www.fetterman.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000479.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Pennsylvania
 offices:
 - classification: capitol
-  address: 142 Russell Senate Office Building Washington DC 20510
+  address: 142 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4254
+- classification: district
+  address: 1000 Liberty Ave. Suite 1811, Pittsburgh, PA 15222
+  voice: 412-803-3501
+- classification: district
+  address: 17 S. Park Row Suite B-120,, Erie, PA 16501
+  voice: 814-453-3010
+- classification: district
+  address: 200 Chestnut St. Suite 600, Philadelphia, PA 19106
+  voice: 215-241-1090
+- classification: district
+  address: 320 Market St. Suite 475E, Harrisburg, PA 17101
+  voice: 717-782-3951
+- classification: district
+  address: Stegmaier Federal Office Building 7 N. Wilkes-Barre Blvd., Suite 406, Wilkes-Barre,
+    PA 18702
+  voice: 507-820-4088
 links:
 - url: https://www.fetterman.senate.gov
   note: website
 - url: https://www.fetterman.senate.gov/contact/
   note: contact form
+- url: https://www.fetterman.senate.gov/
 other_names:
-- name: John K. Fetterman
 - name: Fetterman (D-PA)
+- name: Fetterman, J.
+- name: J. Fetterman
+- name: J.K. Fetterman
+- name: John K. Fetterman
 other_identifiers:
 - scheme: bioguide
   identifier: F000479
@@ -49,3 +67,9 @@ other_identifiers:
   identifier: John Fetterman
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Fetterman
+- url: https://en.wikipedia.org/wiki/John_Fetterman_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/166286/john-fetterman
+- url: https://theunitedstates.io
+- url: https://www.fetterman.senate.gov
+- url: https://www.govtrack.us/congress/members/john_fetterman/456877
diff --git a/data/us/legislature/John-Garamendi-d4381c32-b267-5e35-b118-c0da3a0a80a1.yml b/data/us/legislature/John-Garamendi-d4381c32-b267-5e35-b118-c0da3a0a80a1.yml
index cbe5af9fd0..b94dd4f621 100644
--- a/data/us/legislature/John-Garamendi-d4381c32-b267-5e35-b118-c0da3a0a80a1.yml
+++ b/data/us/legislature/John-Garamendi-d4381c32-b267-5e35-b118-c0da3a0a80a1.yml
@@ -2,71 +2,78 @@ id: ocd-person/d4381c32-b267-5e35-b118-c0da3a0a80a1
 name: John Garamendi
 given_name: John
 family_name: Garamendi
-gender: M
 birth_date: 1945-01-24
+gender: Male
+email: https://garamendi.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000559.jpg
 party:
-- start_date: '2009-11-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-11-03'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-10
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-10
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-3
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-10
+- start_date: 2009-11-03
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-8
+  district: CA-10
 offices:
 - classification: capitol
-  address: 2004 Rayburn House Office Building Washington DC 20515-0508
+  address: 2004 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1880
+  fax: 202-225-5914
+- classification: capitol
+  address: 440 Civic Center Plaza Second Floor, Richmond, CA 94804
+  voice: 510-620-1001
+  fax: 707-438-0523
 - classification: district
-  address: 412 G St.; Davis, CA 95616
-  voice: 530-753-5301
-  fax: 530-753-5614
-  name: 'District Office #1'
-- classification: district
-  address: 1261 Travis Blvd. Suite 130; Fairfield, CA 94533
+  address: 1261 Travis Blvd. Suite 180, Fairfield, CA 94533
   voice: 707-438-1822
   fax: 707-438-0523
-  name: 'District Office #2'
+- classification: district
+  address: '420 Virginia St. #1C, Vallejo, CA 94590'
+  voice: 707-645-1888
+  fax: 707-438-0523
 links:
 - url: https://garamendi.house.gov
   note: website
+- url: https://garamendi.house.gov/
+other_names:
+- name: Garamendi, J.
+- name: J. Garamendi
+- name: J.R. Garamendi
 ids:
   twitter: RepGaramendi
   youtube: UCRym1qsO72C39gX6pBu4icg
@@ -102,3 +109,11 @@ other_identifiers:
   identifier: John Garamendi
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Garamendi
+- url: https://en.wikipedia.org/wiki/John_Garamendi
+- url: https://garamendi.house.gov
+- url: https://garamendi.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/29664/john-garamendi
+- url: https://theunitedstates.io
+- url: https://www.garamendi.org/about
+- url: https://www.govtrack.us/congress/members/john_garamendi/412382
diff --git a/data/us/legislature/John-H-Rutherford-5ab7829c-a819-5616-ac0e-a0aaa359f493.yml b/data/us/legislature/John-H-Rutherford-5ab7829c-a819-5616-ac0e-a0aaa359f493.yml
index 1e87be197c..4d1a727c69 100644
--- a/data/us/legislature/John-H-Rutherford-5ab7829c-a819-5616-ac0e-a0aaa359f493.yml
+++ b/data/us/legislature/John-H-Rutherford-5ab7829c-a819-5616-ac0e-a0aaa359f493.yml
@@ -1,47 +1,50 @@
 id: ocd-person/5ab7829c-a819-5616-ac0e-a0aaa359f493
-name: John H. Rutherford
+name: John Rutherford
 given_name: John
 family_name: Rutherford
-middle_name: H.
-gender: M
 birth_date: 1952-09-02
+gender: Male
+email: https://rutherford.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/R000609.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: FL-5
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-5
+  district: FL-4
 offices:
 - classification: capitol
-  address: 1711 Longworth House Office Building Washington DC 20515-0905
+  address: 1711 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2501
 - classification: district
-  address: 4130 Salisbury Rd.; Jacksonville, FL 32216
+  address: 4130 Salisbury Road Suite 2500, Jacksonville, FL 32216
   voice: 904-831-5205
-  name: 'District Office #1'
 links:
 - url: https://rutherford.house.gov
   note: website
+- url: https://rutherford.house.gov/
+other_names:
+- name: J. Rutherford
+- name: J.H. Rutherford
+- name: John H. Rutherford
+- name: Rutherford, J.
 ids:
   twitter: RepRutherfordFL
   facebook: RepRutherfordFL
@@ -72,3 +75,8 @@ other_identifiers:
   identifier: John Rutherford (Florida)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Rutherford_(Florida)
+- url: https://en.wikipedia.org/wiki/John_Rutherford_(Florida_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/172542/john-rutherford
+- url: https://rutherford.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/John-Hoeven-18c027d3-52ca-5a48-a4d2-73167e382096.yml b/data/us/legislature/John-Hoeven-18c027d3-52ca-5a48-a4d2-73167e382096.yml
index 38f8f07c50..276420ddd4 100644
--- a/data/us/legislature/John-Hoeven-18c027d3-52ca-5a48-a4d2-73167e382096.yml
+++ b/data/us/legislature/John-Hoeven-18c027d3-52ca-5a48-a4d2-73167e382096.yml
@@ -2,66 +2,65 @@ id: ocd-person/18c027d3-52ca-5a48-a4d2-73167e382096
 name: John Hoeven
 given_name: John
 family_name: Hoeven
-gender: M
 birth_date: 1957-03-13
+gender: Male
+email: https://www.hoeven.senate.gov/contact/contact-the-senator
 image: https://theunitedstates.io/images/congress/450x550/H001061.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: North Dakota
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: North Dakota
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: North Dakota
 offices:
 - classification: capitol
-  address: 338 Russell Senate Office Building Washington DC 20510
+  address: 338 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-2551
 - classification: district
-  address: 220 E. Rosser Ave. Room 312; Bismarck, ND 58501
-  voice: 701-250-4618
-  fax: 701-250-4484
-  name: 'District Office #1'
+  address: 100 1st St. SW Suite 107, Minot, ND 58701
+  voice: 701-838-1361
+  fax: 701-838-1381
 - classification: district
-  address: 123 Broadway North Suite 201; Fargo, ND 58102
+  address: 123 Broadway North Suite 201, Fargo, ND 58102
   voice: 701-239-5389
   fax: 202-228-5112
-  name: 'District Office #2'
 - classification: district
-  address: 102 N. Fourth St. Room 108; Grand Forks, ND 58203
-  voice: 701-746-8972
-  name: 'District Office #3'
+  address: 204 N. Main St. Suite 516, Watford City, ND 58854
+  voice: 701-609-2727
 - classification: district
-  address: 100 1st St. SW Suite 107; Minot, ND 58701
-  voice: 701-838-1361
-  fax: 701-838-1381
-  name: 'District Office #4'
+  address: Federal Building 102 N. 4th St., Room 108, Grand Forks, ND 58203
+  voice: 701-746-8972
 - classification: district
-  voice: 701-609-2727
-  name: 'District Office #5'
+  address: U.S. Federal Building 220 E. Rosser Ave., Room 312, Bismarck, ND 58501
+  voice: 701-250-4618
+  fax: 701-250-4484
 links:
 - url: https://www.hoeven.senate.gov
   note: website
 - url: https://www.hoeven.senate.gov/contact/contact-the-senator
   note: contact form
+- url: https://www.hoeven.senate.gov/
+other_names:
+- name: Hoeven (R-ND)
+- name: Hoeven, J.
+- name: J. Hoeven
+- name: J.H. Hoeven
 ids:
   twitter: SenJohnHoeven
   youtube: UC1kQIC2Q_Fq9_NRqdb6eHiw
   facebook: SenatorJohnHoeven
-other_names:
-- name: Hoeven (R-ND)
 other_identifiers:
 - scheme: bioguide
   identifier: H001061
@@ -93,3 +92,11 @@ other_identifiers:
   identifier: kg:/m/01qb45
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Hoeven
+- url: https://en.wikipedia.org/wiki/John_Hoeven
+- url: https://justfacts.votesmart.org/candidate/41788/john-hoeven
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_hoeven/412494
+- url: https://www.hoeven.senate.gov
+- url: https://www.hoeven.senate.gov/about/biography
+- url: https://www.hoevenforsenate.com/about
diff --git a/data/us/legislature/John-James-f32918a9-b738-5f20-8c3e-f95c7fda80cb.yml b/data/us/legislature/John-James-f32918a9-b738-5f20-8c3e-f95c7fda80cb.yml
index bc38160a1f..f26d460f2a 100644
--- a/data/us/legislature/John-James-f32918a9-b738-5f20-8c3e-f95c7fda80cb.yml
+++ b/data/us/legislature/John-James-f32918a9-b738-5f20-8c3e-f95c7fda80cb.yml
@@ -2,27 +2,33 @@ id: ocd-person/f32918a9-b738-5f20-8c3e-f95c7fda80cb
 name: John James
 given_name: John
 family_name: James
-middle_name: Edwards
-gender: M
 birth_date: 1981-06-08
+gender: Male
+email: https://james.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/J000307.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-10
 offices:
 - classification: capitol
-  address: 1319 Longworth House Office Building Washington DC 20515-2210
+  address: 1319 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4961
+- classification: district
+  address: 30500 Van Dyke Ave. Suite 306, Warren, MI 48093
+  voice: 586-498-7122
 links:
 - url: https://james.house.gov
   note: website
+- url: https://james.house.gov/
+other_names:
+- name: J. James
+- name: J.E. James
+- name: James, J.
 other_identifiers:
 - scheme: bioguide
   identifier: J000307
@@ -44,3 +50,9 @@ other_identifiers:
   identifier: '181062'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_James_(Michigan)
+- url: https://en.wikipedia.org/wiki/John_E._James
+- url: https://james.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/181062/john-james
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/john-james-29732757
diff --git a/data/us/legislature/John-Joyce-50b75c29-4e98-5622-b60f-59485dcc1141.yml b/data/us/legislature/John-Joyce-50b75c29-4e98-5622-b60f-59485dcc1141.yml
index 0c53239231..98408a629a 100644
--- a/data/us/legislature/John-Joyce-50b75c29-4e98-5622-b60f-59485dcc1141.yml
+++ b/data/us/legislature/John-Joyce-50b75c29-4e98-5622-b60f-59485dcc1141.yml
@@ -2,51 +2,55 @@ id: ocd-person/50b75c29-4e98-5622-b60f-59485dcc1141
 name: John Joyce
 given_name: John
 family_name: Joyce
-gender: M
 birth_date: 1957-02-08
+gender: Male
+email: https://johnjoyce.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/J000302.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-13
 offices:
 - classification: capitol
-  address: 152 Cannon House Office Building Washington DC 20515-3813
+  address: 152 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2431
 - classification: district
-  address: 5414 6th Ave; Altoona, PA 16602-1203
-  voice: 814-656-6081
-  name: 'District Office #1'
-- classification: district
-  address: 100 Lincoln Way E B; Chambersburg, PA 17201-2291
+  address: 100 Lincoln Way East Suite B, Chambersburg, PA 17201
   voice: 717-753-6344
-  name: 'District Office #2'
 - classification: district
-  address: 451 Stoystown Rd Suite 102; Somerset, PA 15501-6927
-  name: 'District Office #3'
+  address: 1397 Eisenhower Blvd. Suite 302, Johnstown, PA 15904
+  voice: 814-485-6020
+- classification: district
+  address: 282 W. King St., Abbottstown, PA 17301
+  voice: 717-357-6320
+- classification: district
+  address: 5414 6th Ave., Altoona, PA 16602
+  voice: 814-656-6081
 links:
 - url: https://johnjoyce.house.gov
   note: website
-ids:
-  twitter: RepJohnJoyce
+- url: https://johnjoyce.house.gov/
 other_names:
+- name: J. Joyce
+- name: J.P. Joyce
 - name: Joyce (PA)
+- name: Joyce, J.
+ids:
+  twitter: RepJohnJoyce
 other_identifiers:
 - scheme: bioguide
   identifier: J000302
@@ -70,3 +74,11 @@ other_identifiers:
   identifier: '178911'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Joyce_(Pennsylvania)
+- url: https://en.wikipedia.org/wiki/John_Joyce_(American_politician)
+- url: https://johnjoyce.house.gov
+- url: https://johnjoyce.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/178911/john-joyce
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_joyce/412812
+- url: https://www.johnjoyceforcongress.com/about-john
diff --git a/data/us/legislature/John-Kennedy-7a996578-ee76-59c8-856c-4f63861a62da.yml b/data/us/legislature/John-Kennedy-7a996578-ee76-59c8-856c-4f63861a62da.yml
index b195aaf7ac..0080c2db2f 100644
--- a/data/us/legislature/John-Kennedy-7a996578-ee76-59c8-856c-4f63861a62da.yml
+++ b/data/us/legislature/John-Kennedy-7a996578-ee76-59c8-856c-4f63861a62da.yml
@@ -1,76 +1,71 @@
 id: ocd-person/7a996578-ee76-59c8-856c-4f63861a62da
-name: John Kennedy
-given_name: John
+name: John Neely Kennedy
+given_name: John Neely
 family_name: Kennedy
-middle_name: Neely
-gender: M
 birth_date: 1951-11-21
+gender: Male
+email: https://www.kennedy.senate.gov/public/email-me
 image: https://theunitedstates.io/images/congress/450x550/K000393.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Louisiana
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Louisiana
 offices:
 - classification: capitol
-  address: 437 Russell Senate Office Building Washington DC 20510
+  address: 437 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4623
+  fax: 202-228-0447
 - classification: district
-  address: 6501 Coliseum Blvd Suite 700A; Alexandria, LA 71303
-  voice: 318-445-2892
-  name: 'District Office #1'
-- classification: district
-  address: 7932 Wrenwood Blvd Suite A & B; Baton Rouge, LA 70809
-  voice: 225-926-8033
-  name: 'District Office #2'
+  address: 1651 Louisville Ave. Suite 148, Monroe, LA 71201
+  voice: 318-361-1489
 - classification: district
-  address: 8026 Main St Suite 700; Houma, LA 70360
-  voice: 985-851-0956
-  name: 'District Office #3'
+  address: 21490 Koop Drive Building A, Mandeville, LA 70471
+  voice: 985-809-8153
 - classification: district
-  address: 101 La Rue France Suite 503; Lafayette, LA 70508
+  address: 315 S. College Road Suite 140, Lafayette, LA 70503
   voice: 337-269-5980
-  name: 'District Office #4'
 - classification: district
-  address: 1 Lakeshore Dr. Suite 530; Lake Charles, LA 70629
-  voice: 337-436-6255
-  name: 'District Office #5'
+  address: 401 Market St. Suite 1050, Shreveport, LA 71101
+  voice: 318-670-5192
 - classification: district
-  address: 21490 Koop Dr.; Mandeville, LA 70471
-  voice: 985-809-8153
-  name: 'District Office #6'
+  address: 500 Poydras St. Suite 364, New Orleans, LA 70113
+  voice: 504-581-6190
 - classification: district
-  address: 1651 Louisville Ave. Suite 148; Monroe, LA 71201
-  voice: 318-361-1489
-  name: 'District Office #7'
+  address: 7932 Wrenwood Blvd. Suite A and B, Baton Rouge, LA 70809
+  voice: 225-926-8033
 - classification: district
-  address: 500 Poydras St. Suite 364; New Orleans, LA 70113
-  voice: 504-581-6190
-  name: 'District Office #8'
+  address: 814 W. McNeese St. Suite 213, Lake Charles, LA 70605
+  voice: 337-573-6800
 - classification: district
-  address: 401 Market St. Suite 1050; Shreveport, LA 71101
-  voice: 318-670-5192
-  name: 'District Office #9'
+  address: England Airpark 1611 Arnold Drive, Suite 126, Alexandria, LA 71303
+  voice: 318-445-2892
+- classification: district
+  address: Government Towers 8026 Main St., Suite 700, Houma, LA 70360
+  voice: 985-851-0956
 links:
 - url: https://www.kennedy.senate.gov/public
   note: website
 - url: https://www.kennedy.senate.gov/public/email-me
   note: contact form
+- url: https://www.kennedy.senate.gov/public/
+other_names:
+- name: J. Kennedy
+- name: J.N. Kennedy
+- name: John Kennedy
+- name: Kennedy (R-LA)
+- name: Kennedy, J.
 ids:
   twitter: SenJohnKennedy
   facebook: JohnKennedyLouisiana
-other_names:
-- name: Kennedy (R-LA)
 other_identifiers:
 - scheme: bioguide
   identifier: K000393
@@ -100,3 +95,9 @@ other_identifiers:
   identifier: '41703'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Neely_Kennedy
+- url: https://en.wikipedia.org/wiki/John_Neely_Kennedy
+- url: https://justfacts.votesmart.org/candidate/35496/john-kennedy
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_kennedy/412679
+- url: https://www.kennedy.senate.gov/public
diff --git a/data/us/legislature/John-P-Sarbanes-a1232c4d-25eb-555a-85a3-b2e168a086c1.yml b/data/us/legislature/John-P-Sarbanes-a1232c4d-25eb-555a-85a3-b2e168a086c1.yml
index 6eb142fc5c..1ecef034a6 100644
--- a/data/us/legislature/John-P-Sarbanes-a1232c4d-25eb-555a-85a3-b2e168a086c1.yml
+++ b/data/us/legislature/John-P-Sarbanes-a1232c4d-25eb-555a-85a3-b2e168a086c1.yml
@@ -1,82 +1,80 @@
 id: ocd-person/a1232c4d-25eb-555a-85a3-b2e168a086c1
-name: John P. Sarbanes
+name: John Sarbanes
 given_name: John
 family_name: Sarbanes
-middle_name: P.
-gender: M
 birth_date: 1962-05-22
+gender: Male
+email: https://sarbanes.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001168.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-3
 offices:
 - classification: capitol
-  address: 2370 Rayburn House Office Building Washington DC 20515-2003
+  address: 2370 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4016
+  fax: 202-225-9219
 - classification: district
-  address: 44 Calvert St. Suite 349; Annapolis, MD 21401
+  address: 6751 Columbia Gateway Drive Suite 250, Columbia, MD 21046
+  voice: 410-832-8890
+- classification: district
+  address: Arundel Center 44 Calvert St., Suite 349, Annapolis, MD 21401
   voice: 410-295-1679
   fax: 410-295-1682
-  name: 'District Office #1'
-- classification: district
-  address: 14906 Old Columbia Pike; Burtonsville, MD 20866
-  voice: 301-421-4078
-  name: 'District Office #2'
-- classification: district
-  address: 600 Baltimore Ave. Suite 303; Towson, MD 21204
-  voice: 410-832-8890
-  fax: 410-832-8898
-  name: 'District Office #3'
 links:
 - url: https://sarbanes.house.gov
   note: website
+- url: https://sarbanes.house.gov/
+other_names:
+- name: J. Sarbanes
+- name: J.P.S. Sarbanes
+- name: John P. Sarbanes
+- name: Sarbanes, J.
 ids:
   twitter: RepSarbanes
   youtube: UCCypi0IDTr-XxlAXsJCdBZQ
@@ -112,3 +110,10 @@ other_identifiers:
   identifier: John Sarbanes
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Sarbanes
+- url: https://en.wikipedia.org/wiki/John_Sarbanes
+- url: https://justfacts.votesmart.org/candidate/66575/john-sarbanes
+- url: https://sarbanes.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_sarbanes/412212
+- url: https://www.linkedin.com/in/johnsarbanes
diff --git a/data/us/legislature/John-R-Carter-7b014168-dc13-5568-96df-8c7cbb335268.yml b/data/us/legislature/John-R-Carter-7b014168-dc13-5568-96df-8c7cbb335268.yml
index 3db4f38f03..4a359f037e 100644
--- a/data/us/legislature/John-R-Carter-7b014168-dc13-5568-96df-8c7cbb335268.yml
+++ b/data/us/legislature/John-R-Carter-7b014168-dc13-5568-96df-8c7cbb335268.yml
@@ -1,92 +1,93 @@
 id: ocd-person/7b014168-dc13-5568-96df-8c7cbb335268
-name: John R. Carter
+name: John Carter
 given_name: John
 family_name: Carter
-middle_name: R.
-gender: M
 birth_date: 1941-11-06
+gender: Male
+email: https://carter.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001051.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-31
 offices:
 - classification: capitol
-  address: 2208 Rayburn House Office Building Washington DC 20515-4331
+  address: 2208 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3864
 - classification: district
-  address: 1717 North IH 35 Suite 303; Round Rock, TX 78664
-  voice: 512-246-1600
-  name: 'District Office #1'
-- classification: district
-  address: 6544 S General Bruce Dr B; Temple, TX 76502
+  address: '2180 N. Main St. Suite #I-10, Belton, TX 76513'
   voice: 254-933-1392
-  name: 'District Office #2'
+- classification: district
+  address: 4411 S. I-35 Suite 115, Georgetown, TX 78626
+  voice: 512-591-9061
 links:
 - url: https://carter.house.gov
   note: website
+- url: https://carter.house.gov/
+other_names:
+- name: Carter (TX)
+- name: Carter, J.
+- name: J. Carter
+- name: J.R. Carter
+- name: John R. Carter
 ids:
   twitter: JudgeCarter
   youtube: UC9pkaOrhPfouzkJ8oAdI-1w
   facebook: judgecarter
-other_names:
-- name: Carter (TX)
 other_identifiers:
 - scheme: bioguide
   identifier: C001051
@@ -118,3 +119,9 @@ other_identifiers:
   identifier: kg:/m/04m7rg
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Carter_(Texas)
+- url: https://carter.house.gov
+- url: https://en.wikipedia.org/wiki/John_Carter_(Texas_politician)
+- url: https://justfacts.votesmart.org/candidate/49296/john-carter
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_carter/400068
diff --git a/data/us/legislature/John-R-Curtis-7cc5139d-8e53-560c-9828-926395e1552d.yml b/data/us/legislature/John-R-Curtis-7cc5139d-8e53-560c-9828-926395e1552d.yml
index 59c9b1f957..0685373122 100644
--- a/data/us/legislature/John-R-Curtis-7cc5139d-8e53-560c-9828-926395e1552d.yml
+++ b/data/us/legislature/John-R-Curtis-7cc5139d-8e53-560c-9828-926395e1552d.yml
@@ -1,47 +1,49 @@
 id: ocd-person/7cc5139d-8e53-560c-9828-926395e1552d
-name: John R. Curtis
+name: John Curtis
 given_name: John
 family_name: Curtis
-middle_name: R.
-gender: M
 birth_date: 1960-05-10
+gender: Male
+email: https://curtis.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001114.jpg
 party:
-- start_date: '2017-11-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-11-13'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-11-13
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: UT-3
 offices:
 - classification: capitol
-  address: 2323 Rayburn House Office Building Washington DC 20515-4403
+  address: 2323 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-7751
 - classification: district
-  address: 51 South University Avenue Suite 318; Provo, UT 84601
-  voice: 801-851-2500
-  name: 'District Office #1'
+  address: 3549 N. University Ave. Suite 275, Provo, UT 84604
+  voice: 801-922-5400
 links:
 - url: https://curtis.house.gov
   note: website
+other_names:
+- name: Curtis, J.
+- name: J. Curtis
+- name: J.R. Curtis
+- name: John R. Curtis
 ids:
   twitter: RepJohnCurtis
   youtube: UChAQ4MD-HigmGnImSoAKBVA
@@ -71,3 +73,10 @@ other_identifiers:
   identifier: '21755'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Curtis_(Utah)
+- url: https://curtis.house.gov
+- url: https://en.wikipedia.org/wiki/John_Curtis_(Utah_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/123390/john-curtis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_curtis/412740
+- url: https://www.linkedin.com/in/john-r-curtis
diff --git a/data/us/legislature/John-R-Moolenaar-cb38b814-2794-505a-9232-f1bd56ca3ca0.yml b/data/us/legislature/John-R-Moolenaar-cb38b814-2794-505a-9232-f1bd56ca3ca0.yml
index 0c44357a48..b40473cb08 100644
--- a/data/us/legislature/John-R-Moolenaar-cb38b814-2794-505a-9232-f1bd56ca3ca0.yml
+++ b/data/us/legislature/John-R-Moolenaar-cb38b814-2794-505a-9232-f1bd56ca3ca0.yml
@@ -1,58 +1,60 @@
 id: ocd-person/cb38b814-2794-505a-9232-f1bd56ca3ca0
-name: John R. Moolenaar
+name: John Moolenaar
 given_name: John
 family_name: Moolenaar
-middle_name: R.
-gender: M
 birth_date: 1961-05-08
+gender: Male
+email: https://moolenaar.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001194.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: MI-2
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-2
+  district: MI-4
 offices:
 - classification: capitol
-  address: 246 Cannon House Office Building Washington DC 20515-2202
+  address: 246 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3561
+  fax: 202-225-9679
 - classification: district
-  address: 201 N. Mitchell St. Suite 301; Cadillac, MI 49601
-  voice: 231-942-5070
-  fax: 231-876-9505
-  name: 'District Office #1'
+  address: 431 N. McEwan St., Clare, MI 48617
+  voice: 989-802-6040
+  fax: 989-418-5030
 - classification: district
-  address: 200 E. Main St. Suite 230; Midland, MI 48640
-  voice: 989-631-2552
-  fax: 989-631-6271
-  name: 'District Office #2'
+  address: 8980 N. Rodgers Court Suite H, Caledonia, MI 49316
+  voice: 616-528-7100
 links:
 - url: https://moolenaar.house.gov
   note: website
+- url: https://moolenaar.house.gov/
+other_names:
+- name: J. Moolenaar
+- name: J.R. Moolenaar
+- name: John R. Moolenaar
+- name: Moolenaar, J.
 ids:
   twitter: RepMoolenaar
   youtube: UCnMvVN4a8roZu4crE0UW2DA
@@ -86,3 +88,9 @@ other_identifiers:
   identifier: John Moolenaar
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Moolenaar
+- url: https://en.wikipedia.org/wiki/John_Moolenaar
+- url: https://justfacts.votesmart.org/candidate/biography/37676/john-moolenaar
+- url: https://moolenaar.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_moolenaar/412634
diff --git a/data/us/legislature/John-S-Duarte-b8e3fe12-d102-5c54-a4d2-be9d6a3f73f9.yml b/data/us/legislature/John-S-Duarte-b8e3fe12-d102-5c54-a4d2-be9d6a3f73f9.yml
index 2f5a417d4a..f1bf7b7ba7 100644
--- a/data/us/legislature/John-S-Duarte-b8e3fe12-d102-5c54-a4d2-be9d6a3f73f9.yml
+++ b/data/us/legislature/John-S-Duarte-b8e3fe12-d102-5c54-a4d2-be9d6a3f73f9.yml
@@ -1,27 +1,35 @@
 id: ocd-person/b8e3fe12-d102-5c54-a4d2-be9d6a3f73f9
-name: John S. Duarte
+name: John Duarte
 given_name: John
 family_name: Duarte
-gender: M
-birth_date: 1966-09-06
+birth_date: 1966-09-09
+gender: Male
+email: https://duarte.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/D000633.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-13
 offices:
 - classification: capitol
-  address: 1535 Longworth House Office Building Washington DC 20515-0513
+  address: 1535 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-1947
+- classification: district
+  address: 90 S. 1st St., Turlock, CA 95380
+  voice: 209-226-6880
 links:
 - url: https://duarte.house.gov
   note: website
+- url: https://duarte.house.gov/
+other_names:
+- name: Duarte, J.
+- name: J. Duarte
+- name: J.S. Duarte
+- name: John S. Duarte
 other_identifiers:
 - scheme: bioguide
   identifier: D000633
@@ -39,3 +47,9 @@ other_identifiers:
   identifier: '204965'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Duarte
+- url: https://duarte.house.gov
+- url: https://en.wikipedia.org/wiki/John_Duarte_(politician)
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/john-duarte-08585112
+- url: https://www.linkedin.com/in/john-duarte-6b4b46235
diff --git a/data/us/legislature/John-Thune-342214ae-2e66-50a4-9a10-acc467bd5d98.yml b/data/us/legislature/John-Thune-342214ae-2e66-50a4-9a10-acc467bd5d98.yml
index d23ba5cf3f..2c278e0a6a 100644
--- a/data/us/legislature/John-Thune-342214ae-2e66-50a4-9a10-acc467bd5d98.yml
+++ b/data/us/legislature/John-Thune-342214ae-2e66-50a4-9a10-acc467bd5d98.yml
@@ -2,75 +2,79 @@ id: ocd-person/342214ae-2e66-50a4-9a10-acc467bd5d98
 name: John Thune
 given_name: John
 family_name: Thune
-gender: M
 birth_date: 1961-01-07
+gender: Male
+email: https://www.thune.senate.gov/public/index.cfm/contact
 image: https://theunitedstates.io/images/congress/450x550/T000250.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SD-AL
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SD-AL
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SD-AL
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2005-01-04
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
+- start_date: 2001-01-03
+  end_date: 2003-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SD-AL
+- start_date: 1999-01-06
+  end_date: 2001-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SD-AL
+- start_date: 1997-01-07
+  end_date: 1999-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SD-AL
 offices:
 - classification: capitol
-  address: 511 Dirksen Senate Office Building Washington DC 20510
+  address: 511 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-2321
+  fax: 202-228-5429
 - classification: district
-  address: 320 S. 1st St. Suite 101; Aberdeen, SD 57401
+  address: 205 6th Ave. SE Suite 202, Aberdeen, SD 57401
   voice: 605-225-8823
-  name: 'District Office #1'
+  fax: 605-225-8468
 - classification: district
-  address: 246 Founders Park Dr. Suite 102; Rapid City, SD 57701
+  address: 246 Founders Park Drive Suite 102, Rapid City, SD 57701
   voice: 605-348-7551
-  name: 'District Office #2'
+  fax: 605-348-7208
 - classification: district
-  address: 5015 S. Bur Oak Place; Sioux Falls, SD 57108
+  address: 5015 S. Bur Oak Place, Sioux Falls, SD 57108
   voice: 605-334-9596
-  name: 'District Office #3'
+  fax: 605-334-2591
 links:
 - url: https://www.thune.senate.gov
   note: website
 - url: https://www.thune.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.thune.senate.gov/
+other_names:
+- name: J. Thune
+- name: J.R. Thune
+- name: Thune (R-SD)
+- name: Thune, J.
 ids:
   twitter: SenJohnThune
   youtube: UCRu6lpRfxhkDGUrKDgQNZYQ
-other_names:
-- name: Thune (R-SD)
 other_identifiers:
 - scheme: bioguide
   identifier: T000250
@@ -106,3 +110,9 @@ other_identifiers:
   identifier: kg:/m/03ybyn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Thune
+- url: https://en.wikipedia.org/wiki/John_Thune
+- url: https://justfacts.votesmart.org/candidate/biography/398/john-thune
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_thune/400546
+- url: https://www.thune.senate.gov
diff --git a/data/us/legislature/John-W-Hickenlooper-e4ea61a6-63ea-53e6-b61e-4c735a0b7818.yml b/data/us/legislature/John-W-Hickenlooper-e4ea61a6-63ea-53e6-b61e-4c735a0b7818.yml
index 8c59200ce4..4e72566e31 100644
--- a/data/us/legislature/John-W-Hickenlooper-e4ea61a6-63ea-53e6-b61e-4c735a0b7818.yml
+++ b/data/us/legislature/John-W-Hickenlooper-e4ea61a6-63ea-53e6-b61e-4c735a0b7818.yml
@@ -1,34 +1,60 @@
 id: ocd-person/e4ea61a6-63ea-53e6-b61e-4c735a0b7818
-name: John W. Hickenlooper
+name: John Hickenlooper
 given_name: John
 family_name: Hickenlooper
-middle_name: Wright
-gender: M
 birth_date: 1952-02-07
+gender: Male
+email: https://www.hickenlooper.senate.gov/email-john/
 image: https://theunitedstates.io/images/congress/450x550/H000273.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Colorado
 offices:
 - classification: capitol
-  address: 374 Russell Senate Office Building Washington DC 20510
+  address: 374 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5941
+- classification: district
+  address: 102 S. Tejon St. Suite 930, Colorado Springs, CO 80903
+  voice: 719-632-6706
+- classification: district
+  address: 1402 Blake Ave. Suite 109A, Glenwood Springs, CO 81601
+  voice: 970-989-7075
+- classification: district
+  address: 201 S. College Ave. Suite 200, Fort Collins, CO 80524
+  voice: 970-484-3502
+- classification: district
+  address: 801 8th St. Suite 140A, Greeley, CO 80631
+  voice: 970-352-5546
+- classification: district
+  address: Byron Rogers Federal Building 1961 Stout St., Suite 12-300, Denver, CO
+    80294
+  voice: 303-244-1628
+- classification: district
+  address: The Smiley Building 1309 E. 3rd Ave., Suite 104, Durango, CO 81301
+  voice: 970-880-7236
+- classification: district
+  address: Wayne Aspinall Federal Building 400 Rood Ave., Suite 220, Grand Junction,
+    CO 81501
+  voice: 970-822-4530
 links:
 - url: https://www.hickenlooper.senate.gov
   note: website
 - url: https://www.hickenlooper.senate.gov/contact/
   note: contact form
-ids:
-  twitter: SenatorHick
+- url: https://www.hickenlooper.senate.gov/
 other_names:
 - name: Hickenlooper (D-CO)
+- name: Hickenlooper, J.
+- name: J. Hickenlooper
+- name: J.W. Hickenlooper
+- name: John W. Hickenlooper
+ids:
+  twitter: SenatorHick
 other_identifiers:
 - scheme: bioguide
   identifier: H000273
@@ -50,3 +76,11 @@ other_identifiers:
   identifier: John Hickenlooper
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Hickenlooper
+- url: https://en.wikipedia.org/wiki/John_Hickenlooper
+- url: https://hickenlooper.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/71547/john-hickenlooper
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_hickenlooper/456797
+- url: https://www.hickenlooper.senate.gov
+- url: https://www.linkedin.com/in/john-hickenlooper-4880b793
diff --git a/data/us/legislature/John-W-Rose-a30feb1f-c9fe-5612-808e-8fe5a55b76dc.yml b/data/us/legislature/John-W-Rose-a30feb1f-c9fe-5612-808e-8fe5a55b76dc.yml
index 5f9676632f..ca77746635 100644
--- a/data/us/legislature/John-W-Rose-a30feb1f-c9fe-5612-808e-8fe5a55b76dc.yml
+++ b/data/us/legislature/John-W-Rose-a30feb1f-c9fe-5612-808e-8fe5a55b76dc.yml
@@ -1,48 +1,51 @@
 id: ocd-person/a30feb1f-c9fe-5612-808e-8fe5a55b76dc
-name: John W. Rose
+name: John Rose
 given_name: John
 family_name: Rose
-middle_name: W.
-gender: M
 birth_date: 1965-02-23
+gender: Male
+email: https://johnrose.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/R000612.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-6
 offices:
 - classification: capitol
-  address: 2238 Rayburn House Office Building Washington DC 20515-4206
+  address: 2238 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4231
+  fax: 202-225-6887
 - classification: district
-  address: 321 E Spring St Suite 301; Cookeville, TN 38501-4167
+  address: 321 E. Spring St., Suite 306, Cookeville, TN 38501
   voice: 931-854-9430
   fax: 615-206-8980
-  name: 'District Office #1'
 - classification: district
-  address: 355 N Belvedere Dr Suite 308; Gallatin, TN 37066-5466
+  address: 355 N. Belvedere Drive, Suite 308, Gallatin, TN 37066
   voice: 615-206-8204
   fax: 615-206-8980
-  name: 'District Office #2'
 links:
 - url: https://johnrose.house.gov
   note: website
+- url: https://johnrose.house.gov/
+other_names:
+- name: J. Rose
+- name: J.W. Rose
+- name: John W. Rose
+- name: Rose, J.
 ids:
   twitter: RepJohnRose
 other_identifiers:
@@ -68,3 +71,10 @@ other_identifiers:
   identifier: kg:/g/11g8xhg1mz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/John_Rose_(Tennessee)
+- url: https://en.wikipedia.org/wiki/John_Rose_(Tennessee_politician)
+- url: https://johnrose.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/180452/john-rose
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/john_rose/412818
+- url: https://www.linkedin.com/in/john-rose-11198010
diff --git a/data/us/legislature/Jon-Ossoff-4e48da38-17ab-5580-bced-2ea00b9b2843.yml b/data/us/legislature/Jon-Ossoff-4e48da38-17ab-5580-bced-2ea00b9b2843.yml
index 4eec270a0e..219cc156f8 100644
--- a/data/us/legislature/Jon-Ossoff-4e48da38-17ab-5580-bced-2ea00b9b2843.yml
+++ b/data/us/legislature/Jon-Ossoff-4e48da38-17ab-5580-bced-2ea00b9b2843.yml
@@ -2,32 +2,50 @@ id: ocd-person/4e48da38-17ab-5580-bced-2ea00b9b2843
 name: Jon Ossoff
 given_name: Jon
 family_name: Ossoff
-gender: M
 birth_date: 1987-02-16
+gender: Male
+email: https://www.ossoff.senate.gov/contact-us/
 image: https://theunitedstates.io/images/congress/450x550/O000174.jpg
 party:
-- start_date: '2021-01-20'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-20'
-  end_date: '2027-01-03'
+- start_date: 2021-01-20
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Georgia
 offices:
 - classification: capitol
-  address: 303 Hart Senate Office Building Washington DC 20510
+  address: 303 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3521
+  fax: 202-224-2575
+- classification: district
+  address: 1 10th St. Suite 660, Augusta, GA 30901
+- classification: district
+  address: 18 9th St., Suite 513, Columbus, GA 31901
+  voice: 706-780-7053
+  fax: 202-228-2346
+- classification: district
+  address: 271 17th St. NW Suite 1510, Atlanta, GA 30363
+  voice: 470-786-7800
+  fax: 404-949-0912
+- classification: district
+  address: 532 Stephenson Ave. Suite 103B, Savannah, GA 31405
+  voice: 912-200-9402
+  fax: 202-228-6565
 links:
 - url: https://www.ossoff.senate.gov
   note: website
 - url: https://www.ossoff.senate.gov/contact-us/
   note: contact form
-ids:
-  twitter: SenOssoff
+- url: https://www.ossoff.senate.gov/
 other_names:
+- name: J. Ossoff
 - name: Ossoff (D-GA)
+- name: Ossoff, J.
+- name: T.J. Ossoff
+ids:
+  twitter: SenOssoff
 other_identifiers:
 - scheme: bioguide
   identifier: O000174
@@ -53,3 +71,9 @@ other_identifiers:
   identifier: kg:/g/11g6njlbw2
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jon_Ossoff
+- url: https://en.wikipedia.org/wiki/Jon_Ossoff
+- url: https://justfacts.votesmart.org/candidate/176134/jon-ossoff
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jon_ossoff/456857
+- url: https://www.ossoff.senate.gov
diff --git a/data/us/legislature/Jon-Tester-9f388589-39f3-5470-af3d-d74720d56afc.yml b/data/us/legislature/Jon-Tester-9f388589-39f3-5470-af3d-d74720d56afc.yml
index 10425995e1..5d5704f61b 100644
--- a/data/us/legislature/Jon-Tester-9f388589-39f3-5470-af3d-d74720d56afc.yml
+++ b/data/us/legislature/Jon-Tester-9f388589-39f3-5470-af3d-d74720d56afc.yml
@@ -2,79 +2,76 @@ id: ocd-person/9f388589-39f3-5470-af3d-d74720d56afc
 name: Jon Tester
 given_name: Jon
 family_name: Tester
-gender: M
 birth_date: 1956-08-21
+gender: Male
+email: https://www.tester.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/T000464.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Montana
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Montana
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Montana
 offices:
 - classification: capitol
-  address: 311 Hart Senate Office Building Washington DC 20510
+  address: 311 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2644
+  fax: 202-224-8594
 - classification: district
-  address: 2900 4th Ave. N Suite 201; Billings, MT 59101
-  voice: 406-252-0550
-  fax: 406-252-7768
-  name: 'District Office #1'
+  address: 119 1st Ave. North Suite 102, Great Falls, MT 59401
+  voice: 406-452-9585
+  fax: 406-452-9586
 - classification: district
-  address: 1 E. Main St. Suite 202; Bozeman, MT 59715
-  voice: 406-586-4450
-  fax: 406-586-7647
-  name: 'District Office #2'
+  address: 130 W. Front St., Missoula, MT 59802
+  voice: 406-728-3003
+  fax: 406-728-2193
 - classification: district
-  address: 125 W. Granite Suite 200; Butte, MT 59701
-  voice: 406-723-3277
-  fax: 406-782-4717
-  name: 'District Office #3'
+  address: 8 3rd St. East, Kalispell, MT 59901
+  voice: 406-257-3360
+  fax: 406-257-3974
 - classification: district
-  address: 119 1st Ave. N Suite 102; Great Falls, MT 59401
-  voice: 402-452-9585
-  fax: 406-452-9586
-  name: 'District Office #4'
+  address: Avant Courier Building 1 E. Main St., Suite 202, Bozeman, MT 59715
+  voice: 406-586-4450
+  fax: 406-586-7647
 - classification: district
-  address: 208 N. Montana Ave. Suite 202; Helena, MT 59601
+  address: Capital One Center 208 N. Montana Ave., Suite 104, Helena, MT 59601
   voice: 406-449-5401
   fax: 406-449-5462
-  name: 'District Office #5'
 - classification: district
-  address: 8 Third St. E; Kalispell, MT 59901
-  voice: 406-257-3360
-  fax: 406-257-3974
-  name: 'District Office #6'
+  address: Judge Jameson Federal Building 2900 4th Ave. North, Suite 201, Billings,
+    MT 59101
+  voice: 406-252-0550
+  fax: 406-252-7768
 - classification: district
-  address: 130 W. Front St.; Missoula, MT 59802
-  voice: 406-728-3003
-  fax: 406-728-2193
-  name: 'District Office #7'
+  address: Silver Bow Center 125 W. Granite St., Suite 200, Butte, MT 59701
+  voice: 406-723-3277
+  fax: 406-782-4717
 links:
-- url: https://www.tester.senate.gov
-  note: website
 - url: https://www.tester.senate.gov/?p=email_senator
   note: contact form
+- url: https://www.tester.senate.gov
+  note: website
+other_names:
+- name: J. Tester
+- name: R.J. Tester
+- name: Tester (D-MT)
+- name: Tester, J.
 ids:
   twitter: SenatorTester
   youtube: UCgXAF-CON1coZFMxQkfj0fg
   facebook: senatortester
-other_names:
-- name: Tester (D-MT)
 other_identifiers:
 - scheme: bioguide
   identifier: T000464
@@ -106,3 +103,11 @@ other_identifiers:
   identifier: kg:/m/066cdp
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jon_Tester
+- url: https://en.wikipedia.org/wiki/Jon_Tester
+- url: https://jontester.com/meet-jon
+- url: https://justfacts.votesmart.org/candidate/20928/jon-tester
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jon_tester/412244
+- url: https://www.tester.senate.gov
+- url: https://www.tester.senate.gov/about
diff --git a/data/us/legislature/Jonathan-L-Jackson-f862c305-dfc3-5525-a488-8b57d58fad50.yml b/data/us/legislature/Jonathan-L-Jackson-f862c305-dfc3-5525-a488-8b57d58fad50.yml
index bcaaf44f8e..b228bb7f54 100644
--- a/data/us/legislature/Jonathan-L-Jackson-f862c305-dfc3-5525-a488-8b57d58fad50.yml
+++ b/data/us/legislature/Jonathan-L-Jackson-f862c305-dfc3-5525-a488-8b57d58fad50.yml
@@ -1,30 +1,38 @@
 id: ocd-person/f862c305-dfc3-5525-a488-8b57d58fad50
-name: Jonathan L. Jackson
+name: Jonathan Jackson
 given_name: Jonathan
 family_name: Jackson
-middle_name: Luther
-gender: M
 birth_date: 1966-01-07
+gender: Male
+email: https://jonathanjackson.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/J000309.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-1
 offices:
 - classification: capitol
-  address: 1641 Longworth House Office Building Washington DC 20515-1301
+  address: 1641 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4372
+  fax: 202-226-0333
+- classification: district
+  address: 435 E. 35th St., Chicago, IL 60616
+  voice: 773-779-2400
+  fax: 773-779-2401
 links:
 - url: https://jonathanjackson.house.gov
   note: website
+- url: https://jonathanjackson.house.gov/
 other_names:
+- name: J. Jackson
+- name: J.L. Jackson
 - name: Jackson (IL)
+- name: Jackson, J.
+- name: Jonathan L. Jackson
 other_identifiers:
 - scheme: bioguide
   identifier: J000309
@@ -42,3 +50,11 @@ other_identifiers:
   identifier: '204284'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Jonathan_Jackson_(Illinois)
+- url: https://en.wikipedia.org/wiki/Jonathan_Jackson_(Illinois_politician)
+- url: https://jonathanjackson.house.gov
+- url: https://thejacksonfile.com
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/jonathan_jackson/456899
+- url: https://www.linkedin.com/in/jonathan-jackson-89895456
+- url: https://www.linkedin.com/in/jonathan-l-jackson-83537a236
diff --git a/data/us/legislature/Joni-Ernst-86133add-b3ff-52c2-a71e-442b9afeff6b.yml b/data/us/legislature/Joni-Ernst-86133add-b3ff-52c2-a71e-442b9afeff6b.yml
index 57030ba165..af2a92baaf 100644
--- a/data/us/legislature/Joni-Ernst-86133add-b3ff-52c2-a71e-442b9afeff6b.yml
+++ b/data/us/legislature/Joni-Ernst-86133add-b3ff-52c2-a71e-442b9afeff6b.yml
@@ -2,64 +2,63 @@ id: ocd-person/86133add-b3ff-52c2-a71e-442b9afeff6b
 name: Joni Ernst
 given_name: Joni
 family_name: Ernst
-gender: F
 birth_date: 1970-07-01
+gender: Female
+email: https://www.ernst.senate.gov/contact/email-joni
 image: https://theunitedstates.io/images/congress/450x550/E000295.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Iowa
 offices:
 - classification: capitol
-  address: 260 Russell Senate Office Building Washington DC 20510
+  address: 260 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3254
+  fax: 202-224-9369
 - classification: district
-  address: 111 Seventh Ave. SE Suite 480; Cedar Rapids, IA 52401
+  address: 111 7th Ave. SE Suite 480, Cedar Rapids, IA 52401
   voice: 319-365-4504
   fax: 319-365-4683
-  name: 'District Office #1'
 - classification: district
-  address: 8 S 6th St Suite 221; Council Bluffs, IA 51501
-  voice: 712-352-1167
-  fax: 712-352-0087
-  name: 'District Office #2'
+  address: 194 Federal Building 320 6th St., Sioux City, IA 51101
+  voice: 712-252-1550
+  fax: 712-252-1638
 - classification: district
-  address: 201 W. Second St. Suite 806; Davenport, IA 52801
+  address: 201 W. 2nd St. Suite 806, Davenport, IA 52801
   voice: 563-322-0677
   fax: 563-322-0854
-  name: 'District Office #3'
 - classification: district
-  address: 210 Walnut St.; Des Moines, IA 50309
+  address: 2146 27th Ave. Suite 500, Council Bluffs, IA 51501
+  voice: 712-352-1167
+  fax: 712-352-0087
+- classification: district
+  address: 733 Federal Building 210 Walnut St., Des Moines, IA 50309
   voice: 515-284-4574
   fax: 515-284-4937
-  name: 'District Office #4'
-- classification: district
-  address: 320 Sixth St.; Sioux City, IA 51101
-  voice: 712-252-1550
-  fax: 712-252-1638
-  name: 'District Office #5'
 links:
 - url: https://www.ernst.senate.gov
   note: website
 - url: https://www.ernst.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.ernst.senate.gov/
+other_names:
+- name: Ernst (R-IA)
+- name: Ernst, J.
+- name: J. Ernst
+- name: J.K. Ernst
 ids:
   twitter: SenJoniErnst
   youtube: UCLwrmtF_84FIcK3TyMs4MIw
   facebook: senjoniernst
-other_names:
-- name: Ernst (R-IA)
 other_identifiers:
 - scheme: bioguide
   identifier: E000295
@@ -93,3 +92,10 @@ other_identifiers:
   identifier: Joni Ernst
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joni_Ernst
+- url: https://en.wikipedia.org/wiki/Joni_Ernst
+- url: https://justfacts.votesmart.org/candidate/biography/128583/joni-ernst
+- url: https://theunitedstates.io
+- url: https://www.ernst.senate.gov
+- url: https://www.govtrack.us/congress/members/joni_ernst/412667
+- url: https://www.linkedin.com/in/joni-ernst-32367216a
diff --git a/data/us/legislature/Joseph-D-Morelle-70681900-af7f-5ee5-b826-7ab8c4194a9e.yml b/data/us/legislature/Joseph-D-Morelle-70681900-af7f-5ee5-b826-7ab8c4194a9e.yml
index 7a0373f44b..d744a6b29d 100644
--- a/data/us/legislature/Joseph-D-Morelle-70681900-af7f-5ee5-b826-7ab8c4194a9e.yml
+++ b/data/us/legislature/Joseph-D-Morelle-70681900-af7f-5ee5-b826-7ab8c4194a9e.yml
@@ -1,48 +1,50 @@
 id: ocd-person/70681900-af7f-5ee5-b826-7ab8c4194a9e
-name: Joseph D. Morelle
-given_name: Joseph
+name: Joe Morelle
+given_name: Joe
 family_name: Morelle
-middle_name: D.
-gender: M
 birth_date: 1957-04-29
+gender: Male
+email: https://morelleforms.house.gov/contact/?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001206.jpg
 party:
-- start_date: '2018-11-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2018-11-13'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-25
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-25
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-25
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-11-13
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-25
 offices:
 - classification: capitol
-  address: 570 Cannon House Office Building Washington DC 20515-3225
+  address: 570 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3615
 - classification: district
-  address: 100 State St. Room 3120; Rochester, NY 14614
+  address: 255 East Ave. Suite 150, Rochester, NY 14604
   voice: 585-232-4850
-  fax: 585-232-1954
-  name: 'District Office #1'
+  fax: 771-200-5554
 links:
 - url: https://morelle.house.gov
   note: website
+other_names:
+- name: J. Morelle
+- name: J.D. Morelle
+- name: Joseph D. Morelle
+- name: Morelle, J.
 ids:
   twitter: RepJoeMorelle
 other_identifiers:
@@ -68,3 +70,10 @@ other_identifiers:
   identifier: '21761'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joseph_Morelle
+- url: https://en.wikipedia.org/wiki/Joseph_Morelle
+- url: https://justfacts.votesmart.org/candidate/biography/4362/joe-morelle
+- url: https://morelle.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joseph_morelle/412749
+- url: https://www.linkedin.com/in/joe-morelle-8246099
diff --git a/data/us/legislature/Josh-Brecheen-68651247-63fc-5dad-8071-4efef949f7fd.yml b/data/us/legislature/Josh-Brecheen-68651247-63fc-5dad-8071-4efef949f7fd.yml
index f1cebf273b..ee0cd0a538 100644
--- a/data/us/legislature/Josh-Brecheen-68651247-63fc-5dad-8071-4efef949f7fd.yml
+++ b/data/us/legislature/Josh-Brecheen-68651247-63fc-5dad-8071-4efef949f7fd.yml
@@ -2,27 +2,34 @@ id: ocd-person/68651247-63fc-5dad-8071-4efef949f7fd
 name: Josh Brecheen
 given_name: Josh
 family_name: Brecheen
-middle_name: Chad
-gender: M
 birth_date: 1979-06-19
+gender: Male
+email: https://brecheen.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001317.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
 offices:
 - classification: capitol
-  address: 1208 Longworth House Office Building Washington DC 20515-3602
+  address: 1208 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2701
+- classification: district
+  address: 223 W. Patti Page Blvd., Claremore, OK 74017
+  voice: 918-283-6262
+  fax: 918-923-6451
 links:
 - url: https://brecheen.house.gov
   note: website
+- url: https://brecheen.house.gov/
+other_names:
+- name: Brecheen, J.
+- name: J. Brecheen
+- name: J.C. Brecheen
 other_identifiers:
 - scheme: bioguide
   identifier: B001317
@@ -40,3 +47,9 @@ other_identifiers:
   identifier: '124973'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Josh_Brecheen
+- url: https://brecheen.house.gov
+- url: https://en.wikipedia.org/wiki/Josh_Brecheen
+- url: https://justfacts.votesmart.org/candidate/biography/124973/josh-brecheen
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/josh_brecheen/456931
diff --git a/data/us/legislature/Josh-Gottheimer-8ce4e2db-be5a-5493-a399-b2e6061301ba.yml b/data/us/legislature/Josh-Gottheimer-8ce4e2db-be5a-5493-a399-b2e6061301ba.yml
index 2440dd2a1f..d4579001a2 100644
--- a/data/us/legislature/Josh-Gottheimer-8ce4e2db-be5a-5493-a399-b2e6061301ba.yml
+++ b/data/us/legislature/Josh-Gottheimer-8ce4e2db-be5a-5493-a399-b2e6061301ba.yml
@@ -2,65 +2,52 @@ id: ocd-person/8ce4e2db-be5a-5493-a399-b2e6061301ba
 name: Josh Gottheimer
 given_name: Josh
 family_name: Gottheimer
-gender: M
 birth_date: 1975-03-08
+gender: Male
+email: https://gottheimer.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000583.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-5
 offices:
 - classification: capitol
-  address: 203 Cannon House Office Building Washington DC 20515-3005
+  address: 203 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4465
+  fax: 202-225-9048
 - classification: district
-  address: 65 Harristown Rd. Suite 104; Glen Rock, NJ 07452
+  address: 21-00 NJ 208 South Suite 240, Fair Lawn, NJ 07410
   voice: 201-389-1100
-  name: 'District Office #1'
 - classification: district
-  address: 93 Spring St. Suite 408; Newton, NJ 07860
+  address: 93 Spring St. Suite 408, Newton, NJ 07860
   voice: 973-940-1117
-  name: 'District Office #2'
-- classification: district
-  address: 60 Margaret King Ave.; Ringwood, NJ 07456
-  voice: 973-814-4076
-  name: 'District Office #3'
-- classification: district
-  address: 100 Belvidere Ave; Washington, NJ 07882
-  voice: 973-814-4076
-  name: 'District Office #4'
-- classification: district
-  address: 65 Central Ave; Hackensack, NJ 07601
-  voice: 973-814-4076
-  name: 'District Office #5'
-- classification: district
-  address: 21 Church St.; Vernon Township, NJ 07462
-  voice: 973-814-4076
-  name: 'District Office #6'
 links:
 - url: https://gottheimer.house.gov
   note: website
+- url: https://gottheimer.house.gov/
+other_names:
+- name: Gottheimer, J.
+- name: J. Gottheimer
+- name: J.S. Gottheimer
 ids:
   twitter: RepJoshG
   facebook: RepJoshG
@@ -91,3 +78,11 @@ other_identifiers:
   identifier: Josh Gottheimer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Josh_Gottheimer
+- url: https://en.wikipedia.org/wiki/Josh_Gottheimer
+- url: https://gottheimer.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/169202/joshua-gottheimer
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/josh_gottheimer/412714
+- url: https://www.linkedin.com/in/josh-gottheimer-9ab42823
+- url: https://www.linkedin.com/in/josh-gottheimer-9ab42823
diff --git a/data/us/legislature/Josh-Harder-3ed77541-5a79-56b1-94d9-79baa74e938b.yml b/data/us/legislature/Josh-Harder-3ed77541-5a79-56b1-94d9-79baa74e938b.yml
index bb77d2be41..b831ca96e2 100644
--- a/data/us/legislature/Josh-Harder-3ed77541-5a79-56b1-94d9-79baa74e938b.yml
+++ b/data/us/legislature/Josh-Harder-3ed77541-5a79-56b1-94d9-79baa74e938b.yml
@@ -2,44 +2,46 @@ id: ocd-person/3ed77541-5a79-56b1-94d9-79baa74e938b
 name: Josh Harder
 given_name: Josh
 family_name: Harder
-gender: M
 birth_date: 1986-08-01
+gender: Male
+email: https://harder.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001090.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-9
+  district: CA-10
 offices:
 - classification: capitol
-  address: 209 Cannon House Office Building Washington DC 20515-0509
+  address: 209 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4540
 - classification: district
-  address: 4701 Sisk Rd Suite 202; Modesto, CA 95356-9320
+  address: 1776 W. March Lane Suite 360, Stockton, CA 95202
   voice: 209-579-5458
-  name: 'District Office #1'
 links:
 - url: https://harder.house.gov
   note: website
-ids:
-  twitter: RepJoshHarder
+- url: https://harder.house.gov/
 other_names:
 - name: Harder (CA)
+- name: Harder, J.
+- name: J. Harder
+- name: J.K. Harder
+ids:
+  twitter: RepJoshHarder
 other_identifiers:
 - scheme: bioguide
   identifier: H001090
@@ -63,3 +65,12 @@ other_identifiers:
   identifier: kg:/g/11fhwknffg
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Josh_Harder
+- url: https://en.wikipedia.org/wiki/Josh_Harder
+- url: https://harder.house.gov
+- url: https://harder.house.gov/about
+- url: https://harderforcongress.com
+- url: https://justfacts.votesmart.org/candidate/biography/179326/josh-harder
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/josh_harder/412754
+- url: https://www.linkedin.com/in/joshharder
diff --git a/data/us/legislature/Josh-Hawley-0a7d370e-88bd-5b83-9b93-c8607c036d7a.yml b/data/us/legislature/Josh-Hawley-0a7d370e-88bd-5b83-9b93-c8607c036d7a.yml
index 2d2f651bb2..bd1f1cdd95 100644
--- a/data/us/legislature/Josh-Hawley-0a7d370e-88bd-5b83-9b93-c8607c036d7a.yml
+++ b/data/us/legislature/Josh-Hawley-0a7d370e-88bd-5b83-9b93-c8607c036d7a.yml
@@ -1,57 +1,56 @@
 id: ocd-person/0a7d370e-88bd-5b83-9b93-c8607c036d7a
 name: Josh Hawley
-given_name: Joshua
+given_name: Josh
 family_name: Hawley
-gender: M
 birth_date: 1979-12-31
+gender: Male
+email: https://www.hawley.senate.gov/contact-senator-hawley/
 image: https://theunitedstates.io/images/congress/450x550/H001089.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Missouri
 offices:
 - classification: capitol
-  address: 115 Russell Senate Office Building Washington DC 20510
+  address: 115 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6154
-- classification: district
-  address: '555 Independence Street #1600; Cape Girardeau, MO 63703-6235'
-  voice: 573-334-5995
-  fax: 573-334-5947
-  name: 'District Office #1'
-- classification: district
-  address: 1123 Wilkes Blvd Suite 220; Columbia, MO 65201-4774
-  voice: 202-860-5207
-  name: 'District Office #2'
-- classification: district
-  address: 4141 Pennsylvania Ave Suite 101; Kansas City, MO 64111-3051
-  voice: 816-960-4694
-  fax: 816-960-4815
-  name: 'District Office #3'
-- classification: district
-  address: 324 Park Central West Suite 101; Springfield, MO 65806-1245
+  fax: 202-228-0526
+- classification: capitol
+  address: 901 E. St. Louis St. Suite 1604, Springfield, MO 65806
   voice: 417-869-4433
   fax: 417-869-4411
-  name: 'District Office #4'
 - classification: district
-  address: 111 South 10th Street Suite 23.366; St. Louis, MO 63102-1125
+  address: 111 S. 10th St. Suite 23.360, St. Louis, MO 63102
   voice: 314-354-7060
   fax: 314-436-8534
-  name: 'District Office #5'
+- classification: district
+  address: 1123 Wilkes Blvd. Suite 220, Columbia, MO 65201
+  voice: 573-554-1919
+  fax: 573-256-1805
+- classification: district
+  address: 400 E. 9th Street Suite 9350, Kansas City, MO 64106
+  voice: 816-960-4694
+  fax: 816-472-6812
+- classification: district
+  address: 555 Independence St. Suite 1600, Cape Girardeau, MO 63703
+  voice: 573-334-5995
+  fax: 573-334-5947
 links:
-- url: https://www.hawley.senate.gov
-  note: website
 - url: https://www.hawley.senate.gov/contact-senator-hawley
   note: contact form
-ids:
-  twitter: SenHawleyPress
+- url: https://www.hawley.senate.gov
+  note: website
 other_names:
 - name: Hawley (R-MO)
+- name: Hawley, J.
+- name: J. Hawley
+- name: J.D. Hawley
+ids:
+  twitter: SenHawleyPress
 other_identifiers:
 - scheme: bioguide
   identifier: H001089
@@ -77,3 +76,11 @@ other_identifiers:
   identifier: '41901'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Josh_Hawley
+- url: https://en.wikipedia.org/wiki/Josh_Hawley
+- url: https://justfacts.votesmart.org/candidate/biography/169716/joshua-hawley
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joshua_hawley/412840
+- url: https://www.hawley.senate.gov
+- url: https://www.hawley.senate.gov/about/#biography
+- url: https://www.linkedin.com/in/joshua-hawley-7a987b30
diff --git a/data/us/legislature/Joyce-Beatty-47fb8c8b-1c71-5c66-9781-94be94803332.yml b/data/us/legislature/Joyce-Beatty-47fb8c8b-1c71-5c66-9781-94be94803332.yml
index c524fea701..fb26c288d0 100644
--- a/data/us/legislature/Joyce-Beatty-47fb8c8b-1c71-5c66-9781-94be94803332.yml
+++ b/data/us/legislature/Joyce-Beatty-47fb8c8b-1c71-5c66-9781-94be94803332.yml
@@ -2,56 +2,60 @@ id: ocd-person/47fb8c8b-1c71-5c66-9781-94be94803332
 name: Joyce Beatty
 given_name: Joyce
 family_name: Beatty
-gender: F
 birth_date: 1950-03-12
+gender: Female
+email: https://beatty.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/B001281.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-3
 offices:
 - classification: capitol
-  address: 2079 Rayburn House Office Building Washington DC 20515-3503
+  address: 2079 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4324
+  fax: 202-225-1984
 - classification: district
-  address: 471 E. Broad St. Suite 1100; Columbus, OH 43215
+  address: 471 E. Broad St. Suite 1100, Columbus, OH 43215
   voice: 614-220-0003
   fax: 614-220-5640
-  name: 'District Office #1'
 links:
 - url: https://beatty.house.gov
   note: website
+- url: https://beatty.house.gov/
+other_names:
+- name: Beatty, J.
+- name: J. Beatty
+- name: J.B. Beatty
 ids:
   twitter: RepBeatty
   youtube: UCtVl3kb7Xvt3pY7l6x-M6LA
@@ -87,3 +91,10 @@ other_identifiers:
   identifier: kg:/m/03lcwb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Joyce_Beatty
+- url: https://beatty.house.gov
+- url: https://beattyforcongress.com/about
+- url: https://en.wikipedia.org/wiki/Joyce_Beatty
+- url: https://justfacts.votesmart.org/candidate/2427/joyce-beatty
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/joyce_beatty/412565
diff --git a/data/us/legislature/Juan-Ciscomani-435b9cf1-2f02-5ec2-a54e-a42ef044db07.yml b/data/us/legislature/Juan-Ciscomani-435b9cf1-2f02-5ec2-a54e-a42ef044db07.yml
index 2dd5c5a79e..f1c9d1673e 100644
--- a/data/us/legislature/Juan-Ciscomani-435b9cf1-2f02-5ec2-a54e-a42ef044db07.yml
+++ b/data/us/legislature/Juan-Ciscomani-435b9cf1-2f02-5ec2-a54e-a42ef044db07.yml
@@ -2,27 +2,32 @@ id: ocd-person/435b9cf1-2f02-5ec2-a54e-a42ef044db07
 name: Juan Ciscomani
 given_name: Juan
 family_name: Ciscomani
-middle_name: Guadaloupe
-gender: M
-birth_date: 1982-08-30
+birth_date: 1982-08-31
+gender: Male
+email: https://ciscomani.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001133.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-6
 offices:
 - classification: capitol
-  address: 1429 Longworth House Office Building Washington DC 20515-0306
+  address: 1429 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2542
+- classification: district
+  address: 1636 N. Swan Road Suite 200, Tucson, AZ 85712
+  voice: 520-881-3588
 links:
 - url: https://ciscomani.house.gov
   note: website
+- url: https://ciscomani.house.gov/
+other_names:
+- name: Ciscomani, J.
+- name: J. Ciscomani
 ids:
   twitter: RepCiscomani
 other_identifiers:
@@ -42,3 +47,9 @@ other_identifiers:
   identifier: '106728'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Juan_Ciscomani
+- url: https://ciscomani.house.gov
+- url: https://en.wikipedia.org/wiki/Juan_Ciscomani
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/juan-ciscomani-a6957b5
+- url: https://www.linkedin.com/in/juanciscomani
diff --git a/data/us/legislature/Juan-Vargas-904bef1f-7ef4-51af-aeef-b0ac8e1fbe06.yml b/data/us/legislature/Juan-Vargas-904bef1f-7ef4-51af-aeef-b0ac8e1fbe06.yml
index b3df53f3d2..43d1c0eecf 100644
--- a/data/us/legislature/Juan-Vargas-904bef1f-7ef4-51af-aeef-b0ac8e1fbe06.yml
+++ b/data/us/legislature/Juan-Vargas-904bef1f-7ef4-51af-aeef-b0ac8e1fbe06.yml
@@ -2,61 +2,60 @@ id: ocd-person/904bef1f-7ef4-51af-aeef-b0ac8e1fbe06
 name: Juan Vargas
 given_name: Juan
 family_name: Vargas
-gender: M
 birth_date: 1961-03-07
+gender: Male
+email: https://vargas.house.gov/contact/legislative-comments
 image: https://theunitedstates.io/images/congress/450x550/V000130.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-51
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-52
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-51
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-51
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-51
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-51
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-52
+  district: CA-51
 offices:
 - classification: capitol
-  address: 2334 Rayburn House Office Building Washington DC 20515-0552
+  address: 2334 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8045
+  fax: 202-225-2772
 - classification: district
-  address: 333 F St. Suite A; Chula Vista, CA 91910
+  address: 333 F St. Suite A, Chula Vista, CA 91910
   voice: 619-422-5963
   fax: 619-422-7290
-  name: 'District Office #1'
-- classification: district
-  address: 380 N. 8th St. Suite 14; El Centro, CA 92243
-  voice: 760-312-9900
-  fax: 760-312-9664
-  name: 'District Office #2'
 links:
 - url: https://vargas.house.gov
   note: website
+- url: https://vargas.house.gov/
+other_names:
+- name: J. Vargas
+- name: J.C. Vargas
+- name: Vargas, J.
 ids:
   twitter: RepJuanVargas
   youtube: UCpMthf8y7bEMJH_td0dznRQ
@@ -90,3 +89,9 @@ other_identifiers:
   identifier: kg:/m/076bp4
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Juan_Vargas
+- url: https://en.wikipedia.org/wiki/Juan_Vargas
+- url: https://justfacts.votesmart.org/candidate/key-votes/29100/juan-vargas
+- url: https://theunitedstates.io
+- url: https://vargas.house.gov
+- url: https://www.govtrack.us/congress/members/juan_vargas/412522
diff --git a/data/us/legislature/Judy-Chu-a06fc4e8-2e1e-52b6-9aef-83d9405fe16b.yml b/data/us/legislature/Judy-Chu-a06fc4e8-2e1e-52b6-9aef-83d9405fe16b.yml
index 26493472fa..f5e14b7491 100644
--- a/data/us/legislature/Judy-Chu-a06fc4e8-2e1e-52b6-9aef-83d9405fe16b.yml
+++ b/data/us/legislature/Judy-Chu-a06fc4e8-2e1e-52b6-9aef-83d9405fe16b.yml
@@ -2,72 +2,74 @@ id: ocd-person/a06fc4e8-2e1e-52b6-9aef-83d9405fe16b
 name: Judy Chu
 given_name: Judy
 family_name: Chu
-middle_name: M.
-gender: F
 birth_date: 1953-07-07
+gender: Female
+email: https://chu.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001080.jpg
 party:
-- start_date: '2009-07-16'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-07-16'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-28
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-32
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-27
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-27
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-32
+- start_date: 2009-07-16
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-28
+  district: CA-32
 offices:
 - classification: capitol
-  address: 2423 Rayburn House Office Building Washington DC 20515-0528
+  address: 2423 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5464
+  fax: 202-225-5467
 - classification: district
-  address: 415 W. Foothill Blvd. Suite 122; Claremont, CA 91711
+  address: 415 W. Foothill Blvd. Suite 122, Claremont, CA 91711
   voice: 909-625-5394
   fax: 909-399-0198
-  name: 'District Office #1'
 - classification: district
-  address: 527 S. Lake Ave. Suite 106; Pasadena, CA 91101
+  address: 527 S. Lake Ave. Suite 250, Pasadena, CA 91101
   voice: 626-304-0110
   fax: 626-304-0132
-  name: 'District Office #2'
 links:
 - url: https://chu.house.gov
   note: website
+- url: https://chu.house.gov/
+other_names:
+- name: Chu, J.
+- name: J. Chu
+- name: J.M. Chu
 ids:
   twitter: RepJudyChu
   youtube: UCfcbYOvdEXZNelM8T05nK-w
@@ -103,3 +105,9 @@ other_identifiers:
   identifier: Judy Chu
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Judy_Chu
+- url: https://chu.house.gov
+- url: https://en.wikipedia.org/wiki/Judy_Chu
+- url: https://justfacts.votesmart.org/candidate/16539/judy-chu
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/judy_chu/412379
diff --git a/data/us/legislature/Julia-Brownley-84e51316-26ee-55c7-88e8-ae3bd2b7b3cc.yml b/data/us/legislature/Julia-Brownley-84e51316-26ee-55c7-88e8-ae3bd2b7b3cc.yml
index 1cbf415053..35c0ebd4af 100644
--- a/data/us/legislature/Julia-Brownley-84e51316-26ee-55c7-88e8-ae3bd2b7b3cc.yml
+++ b/data/us/legislature/Julia-Brownley-84e51316-26ee-55c7-88e8-ae3bd2b7b3cc.yml
@@ -2,61 +2,60 @@ id: ocd-person/84e51316-26ee-55c7-88e8-ae3bd2b7b3cc
 name: Julia Brownley
 given_name: Julia
 family_name: Brownley
-gender: F
 birth_date: 1952-08-28
+gender: Female
+email: https://juliabrownley.house.gov/contact/email-me/
 image: https://theunitedstates.io/images/congress/450x550/B001285.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-26
 offices:
 - classification: capitol
-  address: 2262 Rayburn House Office Building Washington DC 20515-0526
+  address: 2262 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5811
+  fax: 202-225-1100
 - classification: district
-  address: 201 East Fourth St. Suite 209B; Oxnard, CA 93030
+  address: 223 E. Thousand Oaks Blvd. Suite 220, Thousand Oaks, CA 91360
   voice: 805-379-1779
   fax: 805-379-1799
-  name: 'District Office #1'
-- classification: district
-  address: 223 E. Thousand Oaks Blvd. Suite 220; Thousand Oaks, CA 91360
-  voice: 805-379-1779
-  fax: 805-379-1799
-  name: 'District Office #2'
 links:
 - url: https://juliabrownley.house.gov
   note: website
+- url: https://juliabrownley.house.gov/
+other_names:
+- name: Brownley, J.
+- name: J. Brownley
+- name: J.A. Brownley
 ids:
   twitter: RepBrownley
   youtube: UCFrC4Ouk5R6xQztS9PZin_A
@@ -92,3 +91,8 @@ other_identifiers:
   identifier: kg:/m/027z42z
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Julia_Brownley
+- url: https://en.wikipedia.org/wiki/Julia_Brownley
+- url: https://juliabrownley.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/julia_brownley/412516
diff --git a/data/us/legislature/Julia-Letlow-2a914bb0-5ddc-52d0-abb0-f0cd7830fc5f.yml b/data/us/legislature/Julia-Letlow-2a914bb0-5ddc-52d0-abb0-f0cd7830fc5f.yml
index 7b507d7874..5cb218903a 100644
--- a/data/us/legislature/Julia-Letlow-2a914bb0-5ddc-52d0-abb0-f0cd7830fc5f.yml
+++ b/data/us/legislature/Julia-Letlow-2a914bb0-5ddc-52d0-abb0-f0cd7830fc5f.yml
@@ -2,31 +2,44 @@ id: ocd-person/2a914bb0-5ddc-52d0-abb0-f0cd7830fc5f
 name: Julia Letlow
 given_name: Julia
 family_name: Letlow
-gender: F
 birth_date: 1981-03-16
+gender: Female
+email: https://letlow.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000595.jpg
 party:
-- start_date: '2021-04-14'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-04-14'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-04-14
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-5
 offices:
 - classification: capitol
-  address: 142 Cannon House Office Building Washington DC 20515-1805
+  address: 142 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-8490
+- classification: district
+  address: 109 E. Oak St., Amite, LA 70422
+  voice: 985-284-5200
+- classification: district
+  address: 1900 N. 18th St. Suite 501, Monroe, LA 71201
+  voice: 318-570-6440
+- classification: district
+  address: 4124 Jackson St., Alexandria, LA 71301
+  voice: 318-319-6465
 links:
 - url: https://letlow.house.gov
   note: website
+- url: https://letlow.house.gov/
+other_names:
+- name: J. Letlow
+- name: J.B. Letlow
+- name: Letlow, J.
 ids:
   twitter: RepJuliaLetlow
 other_identifiers:
@@ -50,3 +63,10 @@ other_identifiers:
   identifier: '195745'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Julia_Letlow
+- url: https://en.wikipedia.org/wiki/Julia_Letlow
+- url: https://letlow.house.gov
+- url: https://letlow.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/julia_letlow/456859
+- url: https://www.linkedin.com/in/juliabarnhill
diff --git a/data/us/legislature/Kat-Cammack-0963048e-e973-5563-a888-497a3bd4a492.yml b/data/us/legislature/Kat-Cammack-0963048e-e973-5563-a888-497a3bd4a492.yml
index 752d01525c..d7fd8e2e9c 100644
--- a/data/us/legislature/Kat-Cammack-0963048e-e973-5563-a888-497a3bd4a492.yml
+++ b/data/us/legislature/Kat-Cammack-0963048e-e973-5563-a888-497a3bd4a492.yml
@@ -1,32 +1,44 @@
 id: ocd-person/0963048e-e973-5563-a888-497a3bd4a492
 name: Kat Cammack
-given_name: Katherine
+given_name: Kat
 family_name: Cammack
-gender: F
 birth_date: 1988-02-16
+gender: Female
+email: https://cammack.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001039.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-3
 offices:
 - classification: capitol
-  address: 2421 Rayburn House Office Building Washington DC 20515-0903
+  address: 2421 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5744
+- classification: district
+  address: 3301 SW 34th Circle Unit 402, Ocala, FL 34474
+  voice: 352-421-9052
+  fax: 771-200-5542
+- classification: district
+  address: 5550 NW 111th Blvd. Suite A, Gainesville, FL 32653
+  voice: 352-505-0838
+  fax: 771-200-5542
 links:
 - url: https://cammack.house.gov
   note: website
+- url: https://cammack.house.gov/
+other_names:
+- name: Cammack, K.
+- name: K. Cammack
+- name: K.C. Cammack
 ids:
   twitter: RepKatCammack
 other_identifiers:
@@ -46,3 +58,10 @@ other_identifiers:
   identifier: kg:/g/11fsp_lppx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kat_Cammack
+- url: https://cammack.house.gov
+- url: https://en.wikipedia.org/wiki/Kat_Cammack
+- url: https://justfacts.votesmart.org/candidate/biography/191306/kat-cammack
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/katherine_cammack/456806
+- url: https://www.linkedin.com/in/kat-cammack-03283322
diff --git a/data/us/legislature/Katherine-M-Clark-c882e018-77a3-529f-83ca-151e98d04264.yml b/data/us/legislature/Katherine-M-Clark-c882e018-77a3-529f-83ca-151e98d04264.yml
index eb6a3e4837..7fbe8c650e 100644
--- a/data/us/legislature/Katherine-M-Clark-c882e018-77a3-529f-83ca-151e98d04264.yml
+++ b/data/us/legislature/Katherine-M-Clark-c882e018-77a3-529f-83ca-151e98d04264.yml
@@ -1,67 +1,65 @@
 id: ocd-person/c882e018-77a3-529f-83ca-151e98d04264
-name: Katherine M. Clark
+name: Katherine Clark
 given_name: Katherine
 family_name: Clark
-middle_name: M.
-gender: F
 birth_date: 1963-07-17
+gender: Female
+email: https://katherineclark.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001101.jpg
 party:
-- start_date: '2013-12-12'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-12-12'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-12-12
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-5
 offices:
 - classification: capitol
-  address: 2368 Rayburn House Office Building Washington DC 20515-2105
+  address: 2368 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2836
 - classification: district
-  address: 701 Concord Ave. Suite 101; Cambridge, MA 02138
+  address: 157 Pleasant St., Suite 4, Malden, MA 02148
   voice: 617-354-0292
-  name: 'District Office #1'
-- classification: district
-  address: 116 Concord St. Suite 1; Framingham, MA 01702
-  voice: 508-319-9757
-  name: 'District Office #2'
 links:
 - url: https://katherineclark.house.gov
   note: website
+- url: https://katherineclark.house.gov/
+other_names:
+- name: Clark (MA)
+- name: Clark, K.
+- name: K. Clark
+- name: K.M. Clark
+- name: Katherine M. Clark
 ids:
   twitter: RepKClark
   youtube: UCgaI52w7QKI8LtkSeCCmSuw
   facebook: CongresswomanClark
-other_names:
-- name: Clark (MA)
 other_identifiers:
 - scheme: bioguide
   identifier: C001101
@@ -93,3 +91,10 @@ other_identifiers:
   identifier: '21375'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Katherine_Clark
+- url: https://en.wikipedia.org/wiki/Katherine_Clark
+- url: https://justfacts.votesmart.org/candidate/biography/35858/katherine-clark
+- url: https://katherineclark.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/katherine_clark/412600
+- url: https://www.linkedin.com/in/katherine-clark-3b2884
diff --git a/data/us/legislature/Kathy-Castor-4e9be052-7054-5a13-84af-4e5176dbac41.yml b/data/us/legislature/Kathy-Castor-4e9be052-7054-5a13-84af-4e5176dbac41.yml
index 5b89fadb9d..8da2de22c7 100644
--- a/data/us/legislature/Kathy-Castor-4e9be052-7054-5a13-84af-4e5176dbac41.yml
+++ b/data/us/legislature/Kathy-Castor-4e9be052-7054-5a13-84af-4e5176dbac41.yml
@@ -2,77 +2,83 @@ id: ocd-person/4e9be052-7054-5a13-84af-4e5176dbac41
 name: Kathy Castor
 given_name: Kathy
 family_name: Castor
-gender: F
 birth_date: 1966-08-20
+gender: Female
+email: https://castor.house.gov/contact/contactform.htm
 image: https://theunitedstates.io/images/congress/450x550/C001066.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: FL-14
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: FL-14
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-11
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-14
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-14
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-14
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-14
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: FL-11
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-11
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-14
+  district: FL-11
 offices:
 - classification: capitol
-  address: 2052 Rayburn House Office Building Washington DC 20515-0914
+  address: 2052 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3376
+  fax: 202-225-5652
 - classification: district
-  address: 4144 N. Armenia Ave. Suite 300; Tampa, FL 33607
+  address: 136 4th St. N.  Suite 201, St. Petersburg, FL 33701
+  voice: 727-369-0201
+- classification: district
+  address: 4144 N. Armenia Ave. Suite 300, Tampa, FL 33607
   voice: 813-871-2817
   fax: 813-871-2864
-  name: 'District Office #1'
 links:
 - url: https://castor.house.gov
   note: website
+- url: https://castor.house.gov/
+other_names:
+- name: Castor (FL)
+- name: Castor, K.
+- name: K. Castor
+- name: K.A. Castor
 ids:
   twitter: USRepKCastor
   youtube: UC_irxhmLqVenTFPxDxznG6g
   facebook: USRepKathyCastor
-other_names:
-- name: Castor (FL)
 other_identifiers:
 - scheme: bioguide
   identifier: C001066
@@ -106,3 +112,11 @@ other_identifiers:
   identifier: kg:/m/0dq1v6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kathy_Castor
+- url: https://castor.house.gov
+- url: https://castor.house.gov/biography
+- url: https://en.wikipedia.org/wiki/Kathy_Castor
+- url: https://justfacts.votesmart.org/candidate/53825/kathy-castor
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kathy_castor/412195
+- url: https://www.linkedin.com/in/u-s-rep-kathy-castor-8550ba40
diff --git a/data/us/legislature/Kathy-E-Manning-1c6b4ab9-cf1b-5dc1-a537-b991aff8fe5b.yml b/data/us/legislature/Kathy-E-Manning-1c6b4ab9-cf1b-5dc1-a537-b991aff8fe5b.yml
index 12afbc97aa..f35fbcf24b 100644
--- a/data/us/legislature/Kathy-E-Manning-1c6b4ab9-cf1b-5dc1-a537-b991aff8fe5b.yml
+++ b/data/us/legislature/Kathy-E-Manning-1c6b4ab9-cf1b-5dc1-a537-b991aff8fe5b.yml
@@ -1,33 +1,41 @@
 id: ocd-person/1c6b4ab9-cf1b-5dc1-a537-b991aff8fe5b
-name: Kathy E. Manning
+name: Kathy Manning
 given_name: Kathy
 family_name: Manning
-middle_name: Ellen
-gender: F
 birth_date: 1956-12-03
+gender: Female
+email: https://manning.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001135.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-6
 offices:
 - classification: capitol
-  address: 307 Cannon House Office Building Washington DC 20515-3306
+  address: 307 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3065
+  fax: 202-225-8611
+- classification: district
+  address: 100 S. Elm St. Suite 301, Greensboro, NC 27401
+  voice: 336-333-5005
 links:
 - url: https://manning.house.gov
   note: website
+- url: https://manning.house.gov/
+other_names:
+- name: K. Manning
+- name: K.E. Manning
+- name: Kathy E. Manning
+- name: Manning, K.
 ids:
   twitter: RepKManning
 other_identifiers:
@@ -47,3 +55,10 @@ other_identifiers:
   identifier: kg:/g/11dxpjz93v
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kathy_Manning
+- url: https://en.wikipedia.org/wiki/Kathy_Manning
+- url: https://justfacts.votesmart.org/candidate/biography/178304/kathy-manning
+- url: https://manning.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kathy_manning/456832
+- url: https://www.linkedin.com/in/kathy-manning-60674922
diff --git a/data/us/legislature/Katie-Boyd-Britt-7bf077d8-e8b9-503e-b9c2-d18b55951e93.yml b/data/us/legislature/Katie-Boyd-Britt-7bf077d8-e8b9-503e-b9c2-d18b55951e93.yml
index 5497bf9037..c9c3b500c9 100644
--- a/data/us/legislature/Katie-Boyd-Britt-7bf077d8-e8b9-503e-b9c2-d18b55951e93.yml
+++ b/data/us/legislature/Katie-Boyd-Britt-7bf077d8-e8b9-503e-b9c2-d18b55951e93.yml
@@ -1,32 +1,53 @@
 id: ocd-person/7bf077d8-e8b9-503e-b9c2-d18b55951e93
-name: Katie Boyd Britt
+name: Katie Britt
 given_name: Katie
 family_name: Britt
-middle_name: Elizabeth
-gender: F
 birth_date: 1982-02-02
+gender: Female
+email: https://www.britt.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001319.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alabama
 offices:
 - classification: capitol
-  address: 502 Hart Senate Office Building Washington DC 20510
+  address: 502 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5744
+- classification: district
+  address: 1000 Glenn Hearn Blvd. Suite 20127, Huntsville, AL 35824
+  voice: 256-429-3450
+- classification: district
+  address: 113 St. Joseph St., Room 365, Mobile, AL 36602
+  voice: 251-662-9990
+- classification: district
+  address: 2005 University Blvd. Suite 2100, Tuscaloosa, AL 35401
+  voice: 659-251-2880
+- classification: district
+  address: 321 Federal Building 1800 5th Ave. North, Birmingham, AL 35203
+  voice: 205-731-1384
+- classification: district
+  address: 410 N. Shady Lane, Dothan, AL 36303
+- classification: district
+  address: U.S. Federal Courthouse 1 Church St.,  Suite F-401 Suite 208, Montgomery,
+    AL 36104
+  voice: 334-777-1150
 links:
 - url: https://www.britt.senate.gov
   note: website
 - url: https://www.britt.senate.gov/contact/
   note: contact form
+- url: https://www.britt.senate.gov/
 other_names:
 - name: Britt (R-AL)
+- name: Britt, K.
+- name: K. Britt
+- name: K.B. Britt
+- name: Katie Boyd Britt
 other_identifiers:
 - scheme: bioguide
   identifier: B001319
@@ -50,3 +71,9 @@ other_identifiers:
   identifier: '201704'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Katie_Britt
+- url: https://en.wikipedia.org/wiki/Katie_Britt
+- url: https://theunitedstates.io
+- url: https://www.britt.senate.gov
+- url: https://www.govtrack.us/congress/members/katie_britt/456874
+- url: https://www.linkedin.com/in/katie-britt-90b2b982
diff --git a/data/us/legislature/Katie-Porter-8582a25f-087e-5d46-8c12-7dd2e5cf5417.yml b/data/us/legislature/Katie-Porter-8582a25f-087e-5d46-8c12-7dd2e5cf5417.yml
index d28db8cd16..3699666692 100644
--- a/data/us/legislature/Katie-Porter-8582a25f-087e-5d46-8c12-7dd2e5cf5417.yml
+++ b/data/us/legislature/Katie-Porter-8582a25f-087e-5d46-8c12-7dd2e5cf5417.yml
@@ -2,40 +2,43 @@ id: ocd-person/8582a25f-087e-5d46-8c12-7dd2e5cf5417
 name: Katie Porter
 given_name: Katie
 family_name: Porter
-gender: F
 birth_date: 1974-01-03
+gender: Female
+email: https://porter.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/P000618.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-45
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-47
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-45
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-47
+  district: CA-45
 offices:
 - classification: capitol
-  address: 1233 Longworth House Office Building Washington DC 20515-0547
+  address: 1233 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5611
 - classification: district
-  address: 2151 Michelson Dr Suite 195; Irvine, CA 92612-1330
+  address: 2151 Michelson Drive, Suite 195, Irvine, CA 92612
   voice: 949-668-6600
-  name: 'District Office #1'
 links:
 - url: https://porter.house.gov
   note: website
+- url: https://porter.house.gov/
+other_names:
+- name: K. Porter
+- name: K.M. Porter
+- name: Porter, K.
 ids:
   twitter: RepKatiePorter
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: kg:/g/11fkr56zm6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Katie_Porter
+- url: https://en.wikipedia.org/wiki/Katie_Porter
+- url: https://justfacts.votesmart.org/candidate/biography/179393/katie-porter
+- url: https://katieporter.com/about
+- url: https://porter.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/katie_porter/412758
diff --git a/data/us/legislature/Kay-Granger-32f7cd03-4f8d-5354-b6d1-114bdd4f9af1.yml b/data/us/legislature/Kay-Granger-32f7cd03-4f8d-5354-b6d1-114bdd4f9af1.yml
index 6fab87b84d..207e95cb63 100644
--- a/data/us/legislature/Kay-Granger-32f7cd03-4f8d-5354-b6d1-114bdd4f9af1.yml
+++ b/data/us/legislature/Kay-Granger-32f7cd03-4f8d-5354-b6d1-114bdd4f9af1.yml
@@ -2,96 +2,100 @@ id: ocd-person/32f7cd03-4f8d-5354-b6d1-114bdd4f9af1
 name: Kay Granger
 given_name: Kay
 family_name: Granger
-gender: F
 birth_date: 1943-01-18
+gender: Female
+email: https://kaygranger.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/G000377.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 1997-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-12
 offices:
 - classification: capitol
-  address: 2308 Rayburn House Office Building Washington DC 20515-4312
+  address: 2308 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5071
+  fax: 202-225-5683
 - classification: district
-  address: 1701 River Run Rd. Suite 407; Fort Worth, TX 76107
+  address: 1701 River Run Suite 407, Fort Worth, TX 76107
   voice: 817-338-0909
   fax: 817-335-5852
-  name: 'District Office #1'
 links:
 - url: https://kaygranger.house.gov
   note: website
+- url: https://kaygranger.house.gov/
+other_names:
+- name: Granger, K.
+- name: K. Granger
+- name: N.K. Granger
 ids:
   twitter: RepKayGranger
   youtube: UCsRMtemAkyLh78MPES6gMVQ
@@ -127,3 +131,10 @@ other_identifiers:
   identifier: Kay Granger
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kay_Granger
+- url: https://en.wikipedia.org/wiki/Kay_Granger
+- url: https://justfacts.votesmart.org/candidate/334/kay-granger
+- url: https://kaygranger.house.gov
+- url: https://kaygranger.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kay_granger/400157
diff --git a/data/us/legislature/Keith-Self-404f8ca3-d216-5c95-b5aa-17176b25aa16.yml b/data/us/legislature/Keith-Self-404f8ca3-d216-5c95-b5aa-17176b25aa16.yml
index ee14d42c40..eea139d9f2 100644
--- a/data/us/legislature/Keith-Self-404f8ca3-d216-5c95-b5aa-17176b25aa16.yml
+++ b/data/us/legislature/Keith-Self-404f8ca3-d216-5c95-b5aa-17176b25aa16.yml
@@ -2,27 +2,36 @@ id: ocd-person/404f8ca3-d216-5c95-b5aa-17176b25aa16
 name: Keith Self
 given_name: Keith
 family_name: Self
-middle_name: Alan
-gender: M
 birth_date: 1953-03-20
+gender: Male
+email: https://keithself.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001224.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-3
 offices:
 - classification: capitol
-  address: 1113 Longworth House Office Building Washington DC 20515-4303
+  address: 1113 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4201
+- classification: district
+  address: 2410 Lee St. Suite 202, Greenville, TX 75401
+  voice: 903-458-7037
+- classification: district
+  address: 4500 W. Eldorado Parkway Suite 3500, McKinney, TX 75070
+  voice: 972-202-4150
 links:
 - url: https://keithself.house.gov
   note: website
+- url: https://keithself.house.gov/
+other_names:
+- name: K. Self
+- name: K.A. Self
+- name: Self, K.
 other_identifiers:
 - scheme: bioguide
   identifier: S001224
@@ -44,3 +53,11 @@ other_identifiers:
   identifier: kg:/g/11s0s133nc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Keith_Self
+- url: https://en.wikipedia.org/wiki/Keith_Self
+- url: https://justfacts.votesmart.org/candidate/97491/keith-self
+- url: https://keithself.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/keith_self/456941
+- url: https://www.linkedin.com/in/keith-self-06b55518
+- url: https://www.linkedin.com/in/keith-self-86a7581b
diff --git a/data/us/legislature/Kelly-Armstrong-ea4b65ca-7dbf-575b-abdb-1ac17d6ebb13.yml b/data/us/legislature/Kelly-Armstrong-ea4b65ca-7dbf-575b-abdb-1ac17d6ebb13.yml
index 9e0a5c0b83..038eb07664 100644
--- a/data/us/legislature/Kelly-Armstrong-ea4b65ca-7dbf-575b-abdb-1ac17d6ebb13.yml
+++ b/data/us/legislature/Kelly-Armstrong-ea4b65ca-7dbf-575b-abdb-1ac17d6ebb13.yml
@@ -2,44 +2,48 @@ id: ocd-person/ea4b65ca-7dbf-575b-abdb-1ac17d6ebb13
 name: Kelly Armstrong
 given_name: Kelly
 family_name: Armstrong
-gender: M
 birth_date: 1976-10-08
+gender: Male
+email: https://armstrong.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/A000377.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: ND-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: ND-At-Large
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ND-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ND-AL
 offices:
 - classification: capitol
-  address: 2235 Rayburn House Office Building Washington DC 20515-3400
+  address: 2235 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2611
+  fax: 202-226-3410
 - classification: district
-  address: 220 E Rosser Ave Suite 228; Bismarck, ND 58501-3869
-  voice: 701-354-6700
-  name: 'District Office #1'
-- classification: district
-  address: 3217 Fiechtner Dr S D; Fargo, ND 58103-8735
+  address: 3217 Fiechtner Drive, Suite B, Fargo, ND 58103
   voice: 701-353-6665
-  name: 'District Office #2'
+  fax: 701-707-0711
+- classification: district
+  address: U.S. Federal Building 220 E. Rosser Ave., Room 228, Bismarck, ND 58501
+  voice: 701-354-6700
 links:
 - url: https://armstrong.house.gov
   note: website
+- url: https://armstrong.house.gov/
+other_names:
+- name: Armstrong, K.
+- name: K. Armstrong
+- name: K.M. Armstrong
 ids:
   twitter: RepArmstrongND
 other_identifiers:
@@ -65,3 +69,10 @@ other_identifiers:
   identifier: kg:/g/11hcszksh3
 sources:
 - url: https://theunitedstates.io/
+- url: https://armstrong.house.gov
+- url: https://ballotpedia.org/Kelly_Armstrong
+- url: https://en.wikipedia.org/wiki/Kelly_Armstrong
+- url: https://justfacts.votesmart.org/candidate/biography/139338/kelly-armstrong
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kelly_armstrong/412794
+- url: https://www.linkedin.com/in/kelly-armstrong-895a937
diff --git a/data/us/legislature/Ken-Calvert-3ca12a7a-5192-58bf-ba92-c219af17d74c.yml b/data/us/legislature/Ken-Calvert-3ca12a7a-5192-58bf-ba92-c219af17d74c.yml
index 7980c501c2..c04b979913 100644
--- a/data/us/legislature/Ken-Calvert-3ca12a7a-5192-58bf-ba92-c219af17d74c.yml
+++ b/data/us/legislature/Ken-Calvert-3ca12a7a-5192-58bf-ba92-c219af17d74c.yml
@@ -2,107 +2,113 @@ id: ocd-person/3ca12a7a-5192-58bf-ba92-c219af17d74c
 name: Ken Calvert
 given_name: Ken
 family_name: Calvert
-middle_name: S.
-gender: M
 birth_date: 1953-06-08
+gender: Male
+email: https://calvert.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C000059.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: CA-41
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: CA-42
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-42
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-42
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-42
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-44
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-42
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-42
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-44
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-42
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-43
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-42
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-43
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-42
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-43
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-42
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-43
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-41
+  district: CA-43
 offices:
 - classification: capitol
-  address: 2205 Rayburn House Office Building Washington DC 20515-0541
+  address: 2205 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1986
+  fax: 202-225-2004
 - classification: district
-  address: 400 S. Vicentia Ave. Suite 125; Corona, CA 92882
+  address: 400 S. Vicentia Ave. Suite 125, Corona, CA 92882
   voice: 951-277-0042
   fax: 951-277-0420
-  name: 'District Office #1'
+- classification: district
+  address: 73710 Fred Waring Drive Suite 129, Palm Desert, CA 92260
+  voice: 760-620-0041
 links:
 - url: https://calvert.house.gov
   note: website
+- url: https://calvert.house.gov/
+other_names:
+- name: Calvert, K.
+- name: K. Calvert
+- name: K.S. Calvert
 ids:
   twitter: KenCalvert
   youtube: UC5MEj7YOX_QdKoqD_HRxP3A
@@ -138,3 +144,9 @@ other_identifiers:
   identifier: Ken Calvert
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ken_Calvert
+- url: https://calvert.house.gov
+- url: https://en.wikipedia.org/wiki/Ken_Calvert
+- url: https://justfacts.votesmart.org/candidate/26777/ken-calvert
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ken_calvert/400057
diff --git a/data/us/legislature/Kevin-Cramer-b18c868c-a789-5a02-8070-c0c473d55304.yml b/data/us/legislature/Kevin-Cramer-b18c868c-a789-5a02-8070-c0c473d55304.yml
index 615b22f8d4..d368f64235 100644
--- a/data/us/legislature/Kevin-Cramer-b18c868c-a789-5a02-8070-c0c473d55304.yml
+++ b/data/us/legislature/Kevin-Cramer-b18c868c-a789-5a02-8070-c0c473d55304.yml
@@ -2,67 +2,67 @@ id: ocd-person/b18c868c-a789-5a02-8070-c0c473d55304
 name: Kevin Cramer
 given_name: Kevin
 family_name: Cramer
-gender: M
 birth_date: 1961-01-21
+gender: Male
+email: https://www.cramer.senate.gov/contact/contact-kevin
 image: https://theunitedstates.io/images/congress/450x550/C001096.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: North Dakota
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ND-AL
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ND-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ND-AL
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: North Dakota
 offices:
 - classification: capitol
-  address: 313 Hart Senate Office Building Washington DC 20510
+  address: 313 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2043
 - classification: district
-  address: 220 E. Rosser Ave.; Bismarck, ND 58501
-  voice: 701-224-0355
-  fax: 701-224-0431
-  name: 'District Office #1'
+  address: 105 Federal Building 100 1st St. SW, Minot, ND 58701
+  voice: 701-837-6141
 - classification: district
-  address: 3217 Fiechtner Dr. Suite D; Fargo, ND 58103
-  voice: 701-356-2216
-  fax: 701-356-2217
-  name: 'District Office #2'
+  address: 114 Federal Building 102 N. 4th St., Grand Forks, ND 58203
+  voice: 701-402-4540
 - classification: district
-  address: 4200 James Ray Dr. Office 600; Grand Forks, ND 58202
-  voice: 701-738-4880
-  name: 'District Office #3'
+  address: 125 Main St. Suite 217, Williston, ND 58801
+  voice: 701-441-7230
 - classification: district
-  address: 315 Main St. Suite 203; Minot, ND 58701
-  voice: 701-839-0255
-  name: 'District Office #4'
+  address: 306 Federal Building 657 2nd Ave. North, Fargo, ND 58102
+  voice: 701-232-5094
+- classification: district
+  address: 328 Federal Building 220 E. Rosser Ave., Bismarck, ND 58501
+  voice: 701-204-0500
 links:
 - url: https://www.cramer.senate.gov
   note: website
 - url: https://www.cramer.senate.gov/contact/contact-kevin
   note: contact form
+- url: https://www.cramer.senate.gov/
+other_names:
+- name: Cramer (R-ND)
+- name: Cramer, K.
+- name: K. Cramer
+- name: K.J. Cramer
 ids:
   twitter: SenKevinCramer
   youtube: UCqUPdO9XaAW-dvwwXKbIVdA
   facebook: CongressmanKevinCramer
-other_names:
-- name: Cramer (R-ND)
 other_identifiers:
 - scheme: govtrack
   identifier: '412555'
@@ -98,3 +98,9 @@ other_identifiers:
   identifier: S398
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kevin_Cramer
+- url: https://en.wikipedia.org/wiki/Kevin_Cramer
+- url: https://justfacts.votesmart.org/candidate/444/kevin-cramer
+- url: https://theunitedstates.io
+- url: https://www.cramer.senate.gov
+- url: https://www.govtrack.us/congress/members/kevin_cramer/412555
diff --git a/data/us/legislature/Kevin-Hern-139e15e1-4a50-5126-ad7a-b462c44f00e0.yml b/data/us/legislature/Kevin-Hern-139e15e1-4a50-5126-ad7a-b462c44f00e0.yml
index 9bf4d2a0ed..3d776401f6 100644
--- a/data/us/legislature/Kevin-Hern-139e15e1-4a50-5126-ad7a-b462c44f00e0.yml
+++ b/data/us/legislature/Kevin-Hern-139e15e1-4a50-5126-ad7a-b462c44f00e0.yml
@@ -2,46 +2,50 @@ id: ocd-person/139e15e1-4a50-5126-ad7a-b462c44f00e0
 name: Kevin Hern
 given_name: Kevin
 family_name: Hern
-middle_name: R.
-gender: M
 birth_date: 1961-12-04
+gender: Male
+email: https://hern.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/H001082.jpg
 party:
-- start_date: '2018-11-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2018-11-13'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-11-13
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-1
 offices:
 - classification: capitol
-  address: 1019 Longworth House Office Building Washington DC 20515-3601
+  address: 1019 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2211
+  fax: 202-225-9187
 - classification: district
-  address: 2448 E. 81st St. Suite 5150; Tulsa, OK 74137
+  address: 2488 E. 81st St. Suite 5150, Tulsa, OK 74137
   voice: 918-935-3222
-  name: 'District Office #1'
+  fax: 202-225-9187
 links:
 - url: https://hern.house.gov
   note: website
+- url: https://hern.house.gov/
+other_names:
+- name: Hern, K.
+- name: K. Hern
+- name: K.R. Hern
 ids:
   twitter: repkevinhern
 other_identifiers:
@@ -67,3 +71,11 @@ other_identifiers:
   identifier: kg:/g/11gzqw48lf
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kevin_Hern
+- url: https://en.wikipedia.org/wiki/Kevin_Hern
+- url: https://hern.house.gov
+- url: https://hern.house.gov/about
+- url: https://hernforcongress.com/meet-kevin
+- url: https://justfacts.votesmart.org/candidate/biography/180004/kevin-hern
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/krhern
diff --git a/data/us/legislature/Kevin-Kiley-4aee9639-900f-5593-aab0-b55bb3e8da51.yml b/data/us/legislature/Kevin-Kiley-4aee9639-900f-5593-aab0-b55bb3e8da51.yml
index f7036bd73d..f288747394 100644
--- a/data/us/legislature/Kevin-Kiley-4aee9639-900f-5593-aab0-b55bb3e8da51.yml
+++ b/data/us/legislature/Kevin-Kiley-4aee9639-900f-5593-aab0-b55bb3e8da51.yml
@@ -2,27 +2,33 @@ id: ocd-person/4aee9639-900f-5593-aab0-b55bb3e8da51
 name: Kevin Kiley
 given_name: Kevin
 family_name: Kiley
-middle_name: Patrick
-gender: M
 birth_date: 1985-01-30
+gender: Male
+email: https://kiley.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/K000401.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-3
 offices:
 - classification: capitol
-  address: 1032 Longworth House Office Building Washington DC 20515-0503
+  address: 1032 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2523
+- classification: district
+  address: 6538 Lonetree Blvd. Suite 200, Rocklin, CA 95765
+  voice: 916-724-2575
 links:
 - url: https://kiley.house.gov
   note: website
+- url: https://kiley.house.gov/
+other_names:
+- name: K. Kiley
+- name: K.P. Kiley
+- name: Kiley, K.
 ids:
   twitter: RepKiley
 other_identifiers:
@@ -46,3 +52,10 @@ other_identifiers:
   identifier: Kevin Kiley
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kevin_Kiley
+- url: https://en.wikipedia.org/wiki/Kevin_Kiley_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/169303/kevin-kiley
+- url: https://kiley.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kevin_kiley/456881
+- url: https://www.linkedin.com/in/kevin-kiley-10714266
diff --git a/data/us/legislature/Kevin-Mullin-c0400bec-65fe-5112-bf85-3a185ed0b601.yml b/data/us/legislature/Kevin-Mullin-c0400bec-65fe-5112-bf85-3a185ed0b601.yml
index 6f2ef8dff7..0abcc38e55 100644
--- a/data/us/legislature/Kevin-Mullin-c0400bec-65fe-5112-bf85-3a185ed0b601.yml
+++ b/data/us/legislature/Kevin-Mullin-c0400bec-65fe-5112-bf85-3a185ed0b601.yml
@@ -2,30 +2,36 @@ id: ocd-person/c0400bec-65fe-5112-bf85-3a185ed0b601
 name: Kevin Mullin
 given_name: Kevin
 family_name: Mullin
-gender: M
 birth_date: 1970-06-15
+gender: Male
+email: https://kevinmullin.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001225.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-15
 offices:
 - classification: capitol
-  address: 1404 Longworth House Office Building Washington DC 20515-0515
+  address: 1404 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3531
+- classification: district
+  address: 1528 S. El Camino Real Suite 307, San Mateo, CA 94402
+  voice: 650-342-0300
 links:
 - url: https://kevinmullin.house.gov
   note: website
-ids:
-  twitter: RepKevinMullin
+- url: https://kevinmullin.house.gov/
 other_names:
+- name: K. Mullin
+- name: K.C. Mullin
 - name: Mullin
+- name: Mullin, K.
+ids:
+  twitter: RepKevinMullin
 other_identifiers:
 - scheme: bioguide
   identifier: M001225
@@ -43,3 +49,9 @@ other_identifiers:
   identifier: '105586'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kevin_Mullin_(California)
+- url: https://en.wikipedia.org/wiki/Kevin_Mullin
+- url: https://justfacts.votesmart.org/candidate/biography/105586/kevin-mullin
+- url: https://kevinmullin.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/kevin-mullin-516a281
diff --git a/data/us/legislature/Kim-Schrier-eb152f16-def8-5b51-9379-e7e463628ad6.yml b/data/us/legislature/Kim-Schrier-eb152f16-def8-5b51-9379-e7e463628ad6.yml
index 1c08c12400..e4d8175051 100644
--- a/data/us/legislature/Kim-Schrier-eb152f16-def8-5b51-9379-e7e463628ad6.yml
+++ b/data/us/legislature/Kim-Schrier-eb152f16-def8-5b51-9379-e7e463628ad6.yml
@@ -2,40 +2,46 @@ id: ocd-person/eb152f16-def8-5b51-9379-e7e463628ad6
 name: Kim Schrier
 given_name: Kim
 family_name: Schrier
-gender: F
 birth_date: 1968-08-23
+gender: Female
+email: https://schrier.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001216.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-8
 offices:
 - classification: capitol
-  address: 1110 Longworth House Office Building Washington DC 20515-4708
+  address: 1110 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7761
 - classification: district
-  address: 1445 NW Mall St Suite 4; Issaquah, WA 98027-7900
+  address: 1445 NW Mall St. Suite 4, Issaquah, WA 98027
   voice: 425-657-1001
-  name: 'District Office #1'
+- classification: district
+  address: 301 Yakima St. Suite 329, Wenatchee, WA 98801
+  voice: 509-850-5340
 links:
 - url: https://schrier.house.gov
   note: website
+- url: https://schrier.house.gov/
+other_names:
+- name: K. Schrier
+- name: K.M. Schrier
+- name: Schrier, K.
 ids:
   twitter: RepKimSchrier
 other_identifiers:
@@ -61,3 +67,12 @@ other_identifiers:
   identifier: kg:/g/11fk1mqvq7
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kim_Schrier
+- url: https://en.wikipedia.org/wiki/Kim_Schrier
+- url: https://justfacts.votesmart.org/candidate/biography/181124/kim-schrier
+- url: https://schrier.house.gov
+- url: https://schrier.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.drkimschrier.com/meet-kim
+- url: https://www.govtrack.us/congress/members/kim_schrier/412835
+- url: https://www.linkedin.com/in/drkimschrier
diff --git a/data/us/legislature/Kirsten-E-Gillibrand-d3f90fd1-5f64-5d18-a658-bdd021b89f46.yml b/data/us/legislature/Kirsten-E-Gillibrand-d3f90fd1-5f64-5d18-a658-bdd021b89f46.yml
index 3ef09a5015..26f1ff497c 100644
--- a/data/us/legislature/Kirsten-E-Gillibrand-d3f90fd1-5f64-5d18-a658-bdd021b89f46.yml
+++ b/data/us/legislature/Kirsten-E-Gillibrand-d3f90fd1-5f64-5d18-a658-bdd021b89f46.yml
@@ -1,96 +1,95 @@
 id: ocd-person/d3f90fd1-5f64-5d18-a658-bdd021b89f46
-name: Kirsten E. Gillibrand
+name: Kirsten Gillibrand
 given_name: Kirsten
 family_name: Gillibrand
-middle_name: E.
-gender: F
 birth_date: 1966-12-09
+gender: Female
+email: https://www.gillibrand.senate.gov/contact/email-me/
 image: https://theunitedstates.io/images/congress/450x550/G000555.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-20
-- start_date: '2009-01-06'
-  end_date: '2009-01-26'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-20
-- start_date: '2009-01-27'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New York
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New York
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-27
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New York
+- start_date: 2009-01-06
+  end_date: 2009-01-26
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NY-20
+- start_date: 2007-01-04
+  end_date: 2009-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NY-20
 offices:
 - classification: capitol
-  address: 478 Russell Senate Office Building Washington DC 20510
+  address: 478 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4451
+  fax: 202-228-4977
 - classification: district
-  address: 11A Clinton Avenue Room 821; Albany, NY 12207
-  voice: 518-431-0120
-  fax: 518-431-0128
-  name: 'District Office #1'
-- classification: district
-  address: 726 Exchange St. Suite 511; Buffalo, NY 14210
-  voice: 716-854-9725
-  fax: 716-854-9731
-  name: 'District Office #2'
-- classification: district
-  address: PO Box 273; Lowville, NY 13367
-  voice: 315-376-6118
-  fax: 315-376-6118
-  name: 'District Office #3'
+  address: 155 Pinelawn Road Suite 250 North, Melville, NY 11747
+  voice: 631-249-2825
+  fax: 631-249-2847
 - classification: district
-  address: 780 Third Ave. Suite 2601; New York, NY 10017
+  address: 780 3rd Ave. Suite 2601, New York, NY 10017
   voice: 212-688-6262
   fax: 866-824-6340
-  name: 'District Office #4'
 - classification: district
-  address: 155 Pinelawn Rd. Suite 250 North; Melville, NY 11747
-  voice: 631-249-2825
-  fax: 631-249-2847
-  name: 'District Office #5'
+  address: James M. Hanley Federal Building, 100 S. Clinton St., Room 1470 P.O. Box
+    7378, Syracuse, NY 13261
+  voice: 315-448-0470
+  fax: 315-448-0476
 - classification: district
-  address: 100 State St. Room 4195; Rochester, NY 14614
+  address: Kenneth B. Keating Federal Office Building 100 State St., Room 4195, Rochester,
+    NY 14614
   voice: 585-263-6250
   fax: 585-263-6247
-  name: 'District Office #6'
 - classification: district
-  address: 100 S. Clinton St. Room 1470; Syracuse, NY 13261
-  voice: 315-448-0470
-  fax: 315-448-0476
-  name: 'District Office #7'
+  address: Larkin at Exchange 726 Exchange St., Suite 511, Buffalo, NY 14210
+  voice: 716-854-9725
+  fax: 716-854-9731
+- classification: district
+  address: Leo W. O'Brien Federal Office Building 11A Clinton Ave., Room 821, Albany,
+    NY 12207
+  voice: 518-431-0120
+  fax: 518-431-0128
+- classification: district
+  address: P.O. Box 273, Lowville, NY 13367
+  voice: 315-376-6118
+  fax: 315-376-6118
 - classification: district
-  address: PO Box 749; Yonkers, NY 10710-0749
+  address: P.O. Box 749, Yonkers, NY 10710
   voice: 845-875-4585
   fax: 845-875-9099
-  name: 'District Office #8'
 links:
 - url: https://www.gillibrand.senate.gov
   note: website
 - url: https://www.gillibrand.senate.gov/contact/email-me
   note: contact form
+- url: https://www.gillibrand.senate.gov/
+other_names:
+- name: Gillibrand (D-NY)
+- name: Gillibrand, K.
+- name: K. Gillibrand
+- name: K.R. Gillibrand
+- name: Kirsten E. Gillibrand
 ids:
   twitter: GillibrandNY
   youtube: UCVEloQogVsmnkd5vxJInmYg
   facebook: SenKirstenGillibrand
-other_names:
-- name: Gillibrand (D-NY)
 other_identifiers:
 - scheme: bioguide
   identifier: G000555
@@ -126,3 +125,9 @@ other_identifiers:
   identifier: kg:/m/0gnfc4
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kirsten_Gillibrand
+- url: https://en.wikipedia.org/wiki/Kirsten_Gillibrand
+- url: https://theunitedstates.io
+- url: https://www.gillibrand.senate.gov
+- url: https://www.govtrack.us/congress/members/kirsten_gillibrand/412223
+- url: https://www.linkedin.com/in/kirstengillibrand
diff --git a/data/us/legislature/Kweisi-Mfume-79575558-ef44-5bb5-9c64-3d3fe3fb4427.yml b/data/us/legislature/Kweisi-Mfume-79575558-ef44-5bb5-9c64-3d3fe3fb4427.yml
index 8be6cd70fc..4fe04c4a33 100644
--- a/data/us/legislature/Kweisi-Mfume-79575558-ef44-5bb5-9c64-3d3fe3fb4427.yml
+++ b/data/us/legislature/Kweisi-Mfume-79575558-ef44-5bb5-9c64-3d3fe3fb4427.yml
@@ -2,73 +2,71 @@ id: ocd-person/79575558-ef44-5bb5-9c64-3d3fe3fb4427
 name: Kweisi Mfume
 given_name: Kweisi
 family_name: Mfume
-gender: M
 birth_date: 1948-10-24
+gender: Male
+email: https://mfume.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M000687.jpg
 party:
-- start_date: '1987-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2020-05-05
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1995-01-04
+  end_date: 1996-02-18
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '1995-01-04'
-  end_date: '1996-02-18'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '2020-05-05'
-  end_date: '2021-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-7
 offices:
 - classification: capitol
-  address: 2263 Rayburn House Office Building Washington DC 20515-2007
+  address: 2263 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4741
+  fax: 202-225-3178
 - classification: district
-  address: 1010 Park Avenue Suite 105; Baltimore, MD 21201
+  address: 1010 Park Ave. Suite 105, Baltimore, MD 21201
   voice: 410-685-9199
-  name: 'District Office #1'
 - classification: district
-  address: 754 Frederick Road; Catonsville, MD 21228
+  address: 754 Frederick Road, Catonsville, MD 21228
   voice: 410-818-2120
-  name: 'District Office #2'
-- classification: district
-  address: 8267 Main Street Room 102; Ellicot, MD 21043
-  voice: 443-364-5413
-  name: 'District Office #3'
 links:
 - url: https://mfume.house.gov
   note: website
+- url: https://mfume.house.gov/
+other_names:
+- name: K. Mfume
+- name: Mfume, K.
 ids:
   twitter: RepKweisiMfume
   facebook: RepKweisiMfume
@@ -99,3 +97,11 @@ other_identifiers:
   identifier: kg:/m/04znp2
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kweisi_Mfume
+- url: https://en.wikipedia.org/wiki/Kweisi_Mfume
+- url: https://justfacts.votesmart.org/candidate/biography/26892/kweisi-mfume
+- url: https://mfume.house.gov
+- url: https://mfumeforcongress.com/about-me
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kweisi_mfume/407672
+- url: https://www.linkedin.com/in/hon-kweisi-mfume-16582b85
diff --git a/data/us/legislature/Kyrsten-Sinema-37a72ecf-c1ae-5c91-b4ee-d72f4e9e8894.yml b/data/us/legislature/Kyrsten-Sinema-37a72ecf-c1ae-5c91-b4ee-d72f4e9e8894.yml
index 50a920bd59..c160e302ea 100644
--- a/data/us/legislature/Kyrsten-Sinema-37a72ecf-c1ae-5c91-b4ee-d72f4e9e8894.yml
+++ b/data/us/legislature/Kyrsten-Sinema-37a72ecf-c1ae-5c91-b4ee-d72f4e9e8894.yml
@@ -2,56 +2,60 @@ id: ocd-person/37a72ecf-c1ae-5c91-b4ee-d72f4e9e8894
 name: Kyrsten Sinema
 given_name: Kyrsten
 family_name: Sinema
-gender: F
 birth_date: 1976-07-12
+gender: Female
+email: https://www.sinema.senate.gov/contact-kyrsten/
 image: https://theunitedstates.io/images/congress/450x550/S001191.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  name: Democratic
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Independent
+- name: Independent
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Arizona
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-9
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Arizona
 offices:
 - classification: capitol
-  address: 317 Hart Senate Office Building Washington DC 20510
+  address: 317 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4521
 - classification: district
-  address: 2200 E Camelback Rd Suite 120; Phoenix, AZ 85016-3454
+  address: 20 E. Ochoa St., Tucson, AZ 85701
+  voice: 520-639-7080
+- classification: district
+  address: 3333 E. Camelback Road Suite 200, Phoenix, AZ 85018
   voice: 602-598-7327
-  name: 'District Office #1'
+- classification: district
+  address: P.O. Box 7586, Phoenix, AZ 85011
 links:
 - url: https://www.sinema.senate.gov
   note: website
 - url: https://www.sinema.senate.gov/contact-kyrsten
   note: contact form
+- url: https://www.sinema.senate.gov/
+other_names:
+- name: K. Sinema
+- name: K.L. Sinema
+- name: Sinema (I-AZ)
+- name: Sinema, K.
 ids:
   twitter: SenatorSinema
   youtube: UC4NzhW7D4lQdukSGWmFnK9w
   facebook: CongresswomanSinema
-other_names:
-- name: Sinema (I-AZ)
 other_identifiers:
 - scheme: govtrack
   identifier: '412509'
@@ -87,3 +91,10 @@ other_identifiers:
   identifier: kg:/m/03qnndb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Kyrsten_Sinema
+- url: https://en.wikipedia.org/wiki/Kyrsten_Sinema
+- url: https://justfacts.votesmart.org/candidate/biography/28338/kyrsten-sinema
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/kyrsten_sinema/412509
+- url: https://www.linkedin.com/in/kyrsten-sinema-1907216
+- url: https://www.sinema.senate.gov
diff --git a/data/us/legislature/LaMonica-McIver-8847a5c1-f716-4315-863e-8881cd3c60bc.yml b/data/us/legislature/LaMonica-McIver-8847a5c1-f716-4315-863e-8881cd3c60bc.yml
new file mode 100644
index 0000000000..0ec84b7fb9
--- /dev/null
+++ b/data/us/legislature/LaMonica-McIver-8847a5c1-f716-4315-863e-8881cd3c60bc.yml
@@ -0,0 +1,45 @@
+id: ocd-person/8847a5c1-f716-4315-863e-8881cd3c60bc
+name: LaMonica McIver
+given_name: LaMonica
+family_name: McIver
+birth_date: 1986-06-20
+gender: Female
+email: https://mciver.house.gov/address_authentication?form=/contact
+party:
+- name: Democratic
+roles:
+- start_date: 2024-09-23
+  end_date: 2030-01-01
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NJ-10
+offices:
+- classification: capitol
+  address: 106 Cannon House Office Building, Washington, DC 20515
+  voice: 202-225-3436
+  fax: 202-225-4160
+- classification: district
+  address: 1455 Liberty Ave., Hillside, NJ 07205
+  voice: 862-229-2994
+  fax: 862-225-2941
+- classification: district
+  address: 253 Martin Luther King Drive, Jersey City, NJ 07305
+  voice: 201-369-0392
+  fax: 201-369-0395
+- classification: district
+  address: LeRoy F. Smith Jr. Public Safety Building 60 Nelson Place, 14th Floor,
+    Newark, NJ 07102
+  voice: 973-645-3213
+  fax: 973-645-5902
+links:
+- url: https://mciver.house.gov/
+other_names:
+- name: L. McIver
+- name: L.R. McIver
+- name: McIver, L.
+sources:
+- url: https://ballotpedia.org/LaMonica_McIver
+- url: https://en.wikipedia.org/wiki/LaMonica_McIver
+- url: https://mciver.house.gov
+- url: https://www.linkedin.com/in/lamonica-r-mciver-a8438a39
+- url: https://www.newarknj.gov/members/lamonica-mciver
diff --git a/data/us/legislature/Lance-Gooden-8d52be7e-dba0-5b01-bb9a-c0cfb72fa609.yml b/data/us/legislature/Lance-Gooden-8d52be7e-dba0-5b01-bb9a-c0cfb72fa609.yml
index 2a4a132810..0745c642d5 100644
--- a/data/us/legislature/Lance-Gooden-8d52be7e-dba0-5b01-bb9a-c0cfb72fa609.yml
+++ b/data/us/legislature/Lance-Gooden-8d52be7e-dba0-5b01-bb9a-c0cfb72fa609.yml
@@ -2,42 +2,49 @@ id: ocd-person/8d52be7e-dba0-5b01-bb9a-c0cfb72fa609
 name: Lance Gooden
 given_name: Lance
 family_name: Gooden
-gender: M
 birth_date: 1982-12-01
+gender: Male
+email: https://gooden.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/G000589.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-5
 offices:
 - classification: capitol
-  address: 2431 Rayburn House Office Building Washington DC 20515-4305
+  address: 2431 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3484
 - classification: district
-  address: 18601 Lyndon B Johnson Fwy Suite 725; Mesquite, TX 75150-5600
-  voice: 214-765-6789
-  name: 'District Office #1'
+  address: '201 W. Nash St. #103, Terrell, TX 75160'
+  voice: 903-502-5300
+  fax: 903-502-5303
+- classification: district
+  address: 220 Burnett Trail, Canton, TX 75103
+  voice: 903-502-5300
+  fax: 903-502-5303
 links:
 - url: https://gooden.house.gov
   note: website
+- url: https://gooden.house.gov/
 other_names:
 - name: Gooden (TX)
+- name: Gooden, L.
+- name: L. Gooden
+- name: L.C. Gooden
 other_identifiers:
 - scheme: bioguide
   identifier: G000589
@@ -61,3 +68,11 @@ other_identifiers:
   identifier: Lance Gooden
 sources:
 - url: https://theunitedstates.io/
+- url: https://lancegooden.com/meet-lance
+- url: https://ballotpedia.org/Lance_Gooden
+- url: https://en.wikipedia.org/wiki/Lance_Gooden
+- url: https://gooden.house.gov
+- url: https://gooden.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/biography/116935/lance-gooden
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lance_gooden/412822
diff --git a/data/us/legislature/Laphonza-R-Butler-0490575c-d32c-56f5-9d82-c0511ebe4fb8.yml b/data/us/legislature/Laphonza-R-Butler-0490575c-d32c-56f5-9d82-c0511ebe4fb8.yml
index f575a8d861..f35053d4be 100644
--- a/data/us/legislature/Laphonza-R-Butler-0490575c-d32c-56f5-9d82-c0511ebe4fb8.yml
+++ b/data/us/legislature/Laphonza-R-Butler-0490575c-d32c-56f5-9d82-c0511ebe4fb8.yml
@@ -1,49 +1,53 @@
 id: ocd-person/0490575c-d32c-56f5-9d82-c0511ebe4fb8
-name: Laphonza R. Butler
+name: Laphonza Butler
 given_name: Laphonza
 family_name: Butler
-middle_name: Romanique
-gender: F
 birth_date: 1979-05-11
+gender: Female
+email: https://www.butler.senate.gov/share-your-opinion/
 image: https://theunitedstates.io/images/congress/450x550/B001320.jpg
 party:
-- start_date: '2023-10-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-10-03'
-  end_date: '2025-01-03'
+- start_date: 2023-10-03
+  end_date: 2025-01-02
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: California
 offices:
 - classification: capitol
-  address: 112 Hart Senate Office Building Washington DC 20510
+  address: 112 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3841
+  fax: 202-228-3954
 - classification: district
-  address: 2500 Tulare St. Suite 4290; Fresno, CA 93721
-  voice: 559-485-7430
-  name: 'District Office #1'
+  address: 1 Post St. Suite 2450, San Francisco, CA 94104
+  voice: 415-393-0707
+  fax: 415-393-0710
 - classification: district
-  address: 11111 Santa Monica Blvd. Suite 915; Los Angeles, CA 90025
+  address: 11111 Santa Monica Blvd. Suite 915, Los Angeles, CA 90025
   voice: 310-914-7300
-  name: 'District Office #2'
+  fax: 310-914-7318
 - classification: district
-  address: 880 Front St. Suite 4236; San Diego, CA 92101
-  voice: 619-231-9712
-  name: 'District Office #3'
+  address: 2500 Tulare St. Suite 4290, Fresno, CA 93721
+  voice: 559-485-7430
+  fax: 559-485-9689
 - classification: district
-  address: One Post Street Suite 2450; San Francisco, CA 94104
-  voice: 415-393-0707
-  name: 'District Office #4'
+  address: 880 Front St. Suite 4236, San Diego, CA 92101
+  voice: 619-231-9712
+  fax: 619-231-1108
 links:
 - url: https://www.butler.senate.gov
   note: website
 - url: https://www.butler.senate.gov/share-your-opinion/
   note: contact form
+- url: https://www.butler.senate.gov/
 other_names:
-- name: Laphonza Butler
 - name: Butler (D-CA)
+- name: Butler, L.
+- name: L. Butler
+- name: L.R. Butler
+- name: Laphonza Butler
+- name: Laphonza R. Butler
 other_identifiers:
 - scheme: bioguide
   identifier: B001320
@@ -59,3 +63,8 @@ other_identifiers:
   identifier: Laphonza Butler
 sources:
 - url: https://theunitedstates.io/
+- url: https://en.wikipedia.org/wiki/Laphonza_Butler
+- url: https://theunitedstates.io
+- url: https://www.butler.senate.gov
+- url: https://www.linkedin.com/in/laphonza-butler-82385895
+- url: https://www.linkedin.com/in/laphonza-butler-a26a819
diff --git a/data/us/legislature/Larry-Bucshon-9b31b2fc-8303-5ad0-85d3-1051a49aedb2.yml b/data/us/legislature/Larry-Bucshon-9b31b2fc-8303-5ad0-85d3-1051a49aedb2.yml
index 0b066613a6..1dff570e37 100644
--- a/data/us/legislature/Larry-Bucshon-9b31b2fc-8303-5ad0-85d3-1051a49aedb2.yml
+++ b/data/us/legislature/Larry-Bucshon-9b31b2fc-8303-5ad0-85d3-1051a49aedb2.yml
@@ -2,72 +2,73 @@ id: ocd-person/9b31b2fc-8303-5ad0-85d3-1051a49aedb2
 name: Larry Bucshon
 given_name: Larry
 family_name: Bucshon
-gender: M
 birth_date: 1962-05-31
+gender: Male
+email: https://bucshon.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/B001275.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-8
 offices:
 - classification: capitol
-  address: 2313 Rayburn House Office Building Washington DC 20515-1408
+  address: 2313 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4636
+  fax: 202-225-3284
 - classification: district
-  address: 420 Main St. Suite 1402; Evansville, IN 47708
+  address: 1500 N. Chestnut St., Vincennes, IN 47591
+- classification: district
+  address: 20 NW 3rd St. Suite 1230, Evansville, IN 47708
   voice: 812-465-6484
   fax: 812-422-4761
-  name: 'District Office #1'
-- classification: district
-  address: 610 Main St. First Floor Small Conference Room; Jasper, IN 47547
-  name: 'District Office #2'
 - classification: district
-  address: 901 Wabash Ave. Suite 140; Terre Haute, IN 47807
+  address: 524 Wabash Ave., Terre Haute, IN 47807
   voice: 812-232-0523
   fax: 812-232-0526
-  name: 'District Office #3'
 - classification: district
-  address: 1500 N. Chestnut St.; Vincennes, IN 47591
-  name: 'District Office #4'
+  address: 610 Main St., Jasper, IN 47547
 links:
 - url: https://bucshon.house.gov
   note: website
+- url: https://bucshon.house.gov/
+other_names:
+- name: Bucshon, L.
+- name: L. Bucshon
+- name: L.D. Bucshon
 ids:
   twitter: RepLarryBucshon
   youtube: UC0bIliQs0LKZabNwvZ3gnhQ
@@ -103,3 +104,10 @@ other_identifiers:
   identifier: kg:/m/0dd9k_y
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Larry_Bucshon
+- url: https://bucshon.house.gov
+- url: https://en.wikipedia.org/wiki/Larry_Bucshon
+- url: https://justfacts.votesmart.org/candidate/biography/120335/larry-bucshon
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/larry_bucshon/412427
+- url: https://www.linkedin.com/in/larry-bucshon-a8317043
diff --git a/data/us/legislature/Laurel-M-Lee-96350e36-02c1-512a-8b83-fdd0dd93be88.yml b/data/us/legislature/Laurel-M-Lee-96350e36-02c1-512a-8b83-fdd0dd93be88.yml
index 0ec33fdccd..e5d2aae1b6 100644
--- a/data/us/legislature/Laurel-M-Lee-96350e36-02c1-512a-8b83-fdd0dd93be88.yml
+++ b/data/us/legislature/Laurel-M-Lee-96350e36-02c1-512a-8b83-fdd0dd93be88.yml
@@ -1,32 +1,38 @@
 id: ocd-person/96350e36-02c1-512a-8b83-fdd0dd93be88
-name: Laurel M. Lee
+name: Laurel Lee
 given_name: Laurel
 family_name: Lee
-middle_name: Frances
-gender: F
 birth_date: 1974-03-26
+gender: Female
+email: https://laurellee.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000597.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-15
 offices:
 - classification: capitol
-  address: 1118 Longworth House Office Building Washington DC 20515-0915
+  address: 1118 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5626
+- classification: district
+  address: 17425 Bridge Hill Court Suite 203, Tampa, FL 33647
+  voice: 813-393-5077
 links:
 - url: https://laurellee.house.gov
   note: website
-ids:
-  twitter: RepLaurelLee
+- url: https://laurellee.house.gov/
 other_names:
+- name: L. Lee
+- name: L.M. Lee
+- name: Laurel M. Lee
 - name: Lee (FL)
+- name: Lee, L.
+ids:
+  twitter: RepLaurelLee
 other_identifiers:
 - scheme: bioguide
   identifier: L000597
@@ -46,3 +52,9 @@ other_identifiers:
   identifier: '186114'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Laurel_Lee
+- url: https://en.wikipedia.org/wiki/Laurel_M._Lee
+- url: https://justfacts.votesmart.org/candidate/biography/186114/laurel-lee
+- url: https://laurellee.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/laurel_lee/456892
diff --git a/data/us/legislature/Lauren-Boebert-bbaa33e5-6ab2-5fba-bb46-35e44f89e553.yml b/data/us/legislature/Lauren-Boebert-bbaa33e5-6ab2-5fba-bb46-35e44f89e553.yml
index 2c292bcbe6..50a2fd3163 100644
--- a/data/us/legislature/Lauren-Boebert-bbaa33e5-6ab2-5fba-bb46-35e44f89e553.yml
+++ b/data/us/legislature/Lauren-Boebert-bbaa33e5-6ab2-5fba-bb46-35e44f89e553.yml
@@ -2,32 +2,44 @@ id: ocd-person/bbaa33e5-6ab2-5fba-bb46-35e44f89e553
 name: Lauren Boebert
 given_name: Lauren
 family_name: Boebert
-middle_name: Opal
-gender: F
 birth_date: 1986-12-15
+gender: Female
+email: https://boebertforms.house.gov/forms/writeyourrep/?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B000825.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-3
 offices:
 - classification: capitol
-  address: 1713 Longworth House Office Building Washington DC 20515-0603
+  address: 1713 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4761
+- classification: district
+  address: 503 N. Main St. Suite 426, Pueblo, CO 81003
+  voice: 719-696-6970
+- classification: district
+  address: 743 Horizon Court Suite 112, Grand Junction, CO 81301
+  voice: 970-208-0460
+- classification: district
+  address: The West Building 835 E. 2nd Ave., Suite 204, Durango, CO 81301
+  voice: 970-317-6130
 links:
 - url: https://boebert.house.gov
   note: website
+- url: https://boebert.house.gov/
+other_names:
+- name: Boebert, L.
+- name: L. Boebert
+- name: L.O. Boebert
 ids:
   twitter: RepBoebert
 other_identifiers:
@@ -49,3 +61,10 @@ other_identifiers:
   identifier: Lauren Boebert
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lauren_Boebert
+- url: https://boebert.house.gov
+- url: https://en.wikipedia.org/wiki/Lauren_Boebert
+- url: https://justfacts.votesmart.org/candidate/191290/lauren-boebert
+- url: https://laurenforcolorado.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lauren_boebert/456805
diff --git a/data/us/legislature/Lauren-Underwood-9415f4f1-c2b8-5543-b695-d8cace3373f2.yml b/data/us/legislature/Lauren-Underwood-9415f4f1-c2b8-5543-b695-d8cace3373f2.yml
index 6339941335..a7f0da8355 100644
--- a/data/us/legislature/Lauren-Underwood-9415f4f1-c2b8-5543-b695-d8cace3373f2.yml
+++ b/data/us/legislature/Lauren-Underwood-9415f4f1-c2b8-5543-b695-d8cace3373f2.yml
@@ -2,40 +2,46 @@ id: ocd-person/9415f4f1-c2b8-5543-b695-d8cace3373f2
 name: Lauren Underwood
 given_name: Lauren
 family_name: Underwood
-gender: F
 birth_date: 1986-10-04
+gender: Female
+email: https://underwood.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/U000040.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-14
 offices:
 - classification: capitol
-  address: 1410 Longworth House Office Building Washington DC 20515-1314
+  address: 1410 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2976
 - classification: district
-  address: 490 East Roosevelt Road Suite 202; West Chicago, IL 60185
+  address: 116 N. Chicago St. Suite 201, Joliet, IL 60432
+  voice: 630-549-2190
+- classification: district
+  address: 207 E. Church St. Unit F, Sandwich, IL 60548
   voice: 630-549-2190
-  name: 'District Office #1'
 links:
 - url: https://underwood.house.gov
   note: website
+- url: https://underwood.house.gov/
+other_names:
+- name: L. Underwood
+- name: L.A. Underwood
+- name: Underwood, L.
 ids:
   twitter: RepUnderwood
 other_identifiers:
@@ -59,3 +65,12 @@ other_identifiers:
   identifier: kg:/g/11gfm73_1z
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lauren_Underwood
+- url: https://en.wikipedia.org/wiki/Lauren_Underwood
+- url: https://justfacts.votesmart.org/candidate/biography/177001/lauren-underwood
+- url: https://theunitedstates.io
+- url: https://underwood.house.gov
+- url: https://underwood.house.gov/about
+- url: https://www.govtrack.us/congress/members/lauren_underwood/412776
+- url: https://www.linkedin.com/in/lauren-a-underwood-b47b7814
+- url: https://www.underwoodforcongress.com/about
diff --git a/data/us/legislature/Linda-T-Snchez-b01048a9-27a5-5fed-b5ef-7bf3b3be6d04.yml b/data/us/legislature/Linda-T-Snchez-b01048a9-27a5-5fed-b5ef-7bf3b3be6d04.yml
index 031be2b6fc..bfebb3950b 100644
--- a/data/us/legislature/Linda-T-Snchez-b01048a9-27a5-5fed-b5ef-7bf3b3be6d04.yml
+++ b/data/us/legislature/Linda-T-Snchez-b01048a9-27a5-5fed-b5ef-7bf3b3be6d04.yml
@@ -1,89 +1,92 @@
 id: ocd-person/b01048a9-27a5-5fed-b5ef-7bf3b3be6d04
-name: "Linda T. S\xE1nchez"
+name: "Linda S\xE1nchez"
 given_name: Linda
 family_name: "S\xE1nchez"
-middle_name: T.
-gender: F
 birth_date: 1969-01-28
+gender: Female
+email: https://lindasanchez.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001156.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-38
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-38
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-38
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-38
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: CA-38
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-38
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-39
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-39
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-39
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-39
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-38
+  district: CA-39
 offices:
 - classification: capitol
-  address: 2428 Rayburn House Office Building Washington DC 20515-0538
+  address: 2428 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6676
+  fax: 202-226-1012
 - classification: district
-  address: 12440 E. Imperial Hwy. Suite 140; Norwalk, CA 90650
+  address: 15111 Whittier Blvd. Suite 220, Whittier, CA 90603
   voice: 562-860-5050
-  fax: 562-924-2914
-  name: 'District Office #1'
+  fax: 771-200-5828
 links:
 - url: https://lindasanchez.house.gov
   note: website
+- url: https://lindasanchez.house.gov/
+other_names:
+- name: "L. S\xE1nchez"
+- name: "L.T. S\xE1nchez"
+- name: "Linda T. S\xE1nchez"
+- name: Sanchez
+- name: "S\xE1nchez, L."
 ids:
   twitter: RepLindaSanchez
   youtube: UCu1K6uHxjMgj2mvzM7O9-ow
   facebook: CongresswomanLindaSanchez
-other_names:
-- name: Sanchez
 other_identifiers:
 - scheme: bioguide
   identifier: S001156
@@ -115,3 +118,12 @@ other_identifiers:
   identifier: "Linda S\xE1nchez"
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Linda_S%C3%A1nchez
+- url: https://chci.org/staff-and-leadership/rep-linda-t-sanchez
+- url: https://en.wikipedia.org/wiki/Linda_S%C3%A1nchez
+- url: https://justfacts.votesmart.org/candidate/29674/linda-sanchez
+- url: https://lindasanchez.house.gov
+- url: https://lindasanchez.house.gov/about-linda
+- url: https://theunitedstates.io
+- url: https://voteforlinda.com/about-linda
+- url: https://www.govtrack.us/congress/members/linda_sanchez/400355
diff --git a/data/us/legislature/Lindsey-Graham-111e4df8-6815-5549-9833-57120f302f81.yml b/data/us/legislature/Lindsey-Graham-111e4df8-6815-5549-9833-57120f302f81.yml
index bef9af1c67..d78f69d231 100644
--- a/data/us/legislature/Lindsey-Graham-111e4df8-6815-5549-9833-57120f302f81.yml
+++ b/data/us/legislature/Lindsey-Graham-111e4df8-6815-5549-9833-57120f302f81.yml
@@ -2,100 +2,97 @@ id: ocd-person/111e4df8-6815-5549-9833-57120f302f81
 name: Lindsey Graham
 given_name: Lindsey
 family_name: Graham
-middle_name: O.
-gender: M
 birth_date: 1955-07-09
+gender: Male
+email: https://www.lgraham.senate.gov/public/index.cfm/e-mail-senator-graham
 image: https://theunitedstates.io/images/congress/450x550/G000359.jpg
 party:
-- start_date: '1995-01-04'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SC-3
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SC-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SC-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SC-3
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2003-01-07
+  end_date: 2009-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
+- start_date: 2001-01-03
+  end_date: 2003-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SC-3
+- start_date: 1999-01-06
+  end_date: 2001-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SC-3
+- start_date: 1997-01-07
+  end_date: 1999-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SC-3
+- start_date: 1995-01-04
+  end_date: 1997-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SC-3
 offices:
 - classification: capitol
-  address: 211 Russell Senate Office Building Washington DC 20510
+  address: 211 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5972
+  fax: 202-224-3808
 - classification: district
-  address: 508 Hampton St. Suite 202; Columbia, SC 29201
-  voice: 803-933-0112
-  fax: 803-933-0957
-  name: 'District Office #1'
-- classification: district
-  address: 401 W. Evans St. Suite 111; Florence, SC 29501
-  voice: 843-669-1505
-  fax: 843-669-9015
-  name: 'District Office #2'
+  address: 124 Exchange St. Suite A, Pendleton, SC 29670
+  voice: 864-646-4090
+  fax: 864-646-8609
 - classification: district
-  address: 130 S. Main St. 7th Floor; Greenville, SC 29601
+  address: 2 W. Washington St. Suite 802, Greenville, SC 29601
   voice: 864-250-1417
   fax: 864-250-4322
-  name: 'District Office #3'
 - classification: district
-  address: 530 Johnnie Dodds Blvd. Suite 202; Mt. Pleasant, SC 29464
-  voice: 843-849-3887
-  fax: 843-971-3669
-  name: 'District Office #4'
-- classification: district
-  address: 124 Exchange St. Suite A; Pendleton, SC 29670
-  voice: 864-646-4090
-  fax: 864-646-8609
-  name: 'District Office #5'
+  address: 2142 Boyce St. Suite 404, Columbia, SC 29201
+  voice: 803-933-0112
+  fax: 803-933-0957
 - classification: district
-  address: 235 E. Main St. Suite 100; Rock Hill, SC 29730
+  address: 235 E. Main St. Suite 100, Rock Hill, SC 29730
   voice: 803-366-2828
   fax: 803-366-5353
-  name: 'District Office #6'
+- classification: district
+  address: 4 Carriage Lane Suite 401, Charleston, SC 29407
+  voice: 843-849-3887
+  fax: 843-971-3669
+- classification: district
+  address: McMillan Federal Building 401 W. Evans St., Suite 111, Florence, SC 29501
+  voice: 843-669-1505
+  fax: 843-669-9015
 links:
 - url: https://www.lgraham.senate.gov/public
   note: website
 - url: https://www.lgraham.senate.gov/public/index.cfm/e-mail-senator-graham
   note: contact form
+- url: https://www.lgraham.senate.gov/public/
+other_names:
+- name: Graham (R-SC)
+- name: Graham, L.
+- name: L. Graham
+- name: L.O. Graham
 ids:
   twitter: GrahamBlog
   youtube: UClLGZMA5Ei2Z8fR1PLEx6yQ
   facebook: USSenatorLindseyGraham
-other_names:
-- name: Graham (R-SC)
 other_identifiers:
 - scheme: bioguide
   identifier: G000359
@@ -131,3 +128,11 @@ other_identifiers:
   identifier: kg:/m/01_pdg
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lindsey_Graham
+- url: https://en.wikipedia.org/wiki/Lindsey_Graham
+- url: https://justfacts.votesmart.org/candidate/biography/21992/lindsey-graham
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lindsey_graham/300047
+- url: https://www.lgraham.senate.gov/public
+- url: https://www.lgraham.senate.gov/public/index.cfm/biography
+- url: https://www.lindseygraham.com/about
diff --git a/data/us/legislature/Lisa-Blunt-Rochester-0b32bee9-863e-522f-99b8-9ad8e5d8f42e.yml b/data/us/legislature/Lisa-Blunt-Rochester-0b32bee9-863e-522f-99b8-9ad8e5d8f42e.yml
index f05223a1d8..329441b1f1 100644
--- a/data/us/legislature/Lisa-Blunt-Rochester-0b32bee9-863e-522f-99b8-9ad8e5d8f42e.yml
+++ b/data/us/legislature/Lisa-Blunt-Rochester-0b32bee9-863e-522f-99b8-9ad8e5d8f42e.yml
@@ -2,49 +2,51 @@ id: ocd-person/0b32bee9-863e-522f-99b8-9ad8e5d8f42e
 name: Lisa Blunt Rochester
 given_name: Lisa
 family_name: Blunt Rochester
-gender: F
 birth_date: 1962-02-10
+gender: Female
+email: https://bluntrochester.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001303.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
 offices:
 - classification: capitol
-  address: 1724 Longworth House Office Building Washington DC 20515-0800
+  address: 1724 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4165
 - classification: district
-  address: 1105 N. Market St. Suite 400; Wilmington, DE 19801
+  address: 1105 N. Market St. Suite 400, Wilmington, DE 19801
   voice: 302-830-2330
-  name: 'District Office #1'
 - classification: district
-  address: 28 The Circle Suite 2; Georgetown, DE 19947
+  address: 28 The Circle Suite 2, Georgetown, DE 19947
   voice: 302-858-4773
-  name: 'District Office #2'
 links:
 - url: https://bluntrochester.house.gov
   note: website
+- url: https://bluntrochester.house.gov/
+other_names:
+- name: Blunt Rochester, L.
+- name: L. Blunt Rochester
+- name: L.L. Blunt Rochester
 ids:
   twitter: RepLBR
   facebook: Rep.BluntRochester
@@ -75,3 +77,9 @@ other_identifiers:
   identifier: Lisa Blunt Rochester
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lisa_Blunt_Rochester
+- url: https://bluntrochester.house.gov
+- url: https://en.wikipedia.org/wiki/Lisa_Blunt_Rochester
+- url: https://justfacts.votesmart.org/candidate/biography/173249/lisa-blunt-rochester
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lisa_blunt_rochester/412689
diff --git a/data/us/legislature/Lisa-C-McClain-f8a1c19c-3aa4-5c20-a8a4-211a40b2c540.yml b/data/us/legislature/Lisa-C-McClain-f8a1c19c-3aa4-5c20-a8a4-211a40b2c540.yml
index c951e826b6..7f9d76774a 100644
--- a/data/us/legislature/Lisa-C-McClain-f8a1c19c-3aa4-5c20-a8a4-211a40b2c540.yml
+++ b/data/us/legislature/Lisa-C-McClain-f8a1c19c-3aa4-5c20-a8a4-211a40b2c540.yml
@@ -1,33 +1,44 @@
 id: ocd-person/f8a1c19c-3aa4-5c20-a8a4-211a40b2c540
-name: Lisa C. McClain
+name: Lisa McClain
 given_name: Lisa
 family_name: McClain
-middle_name: C.
-gender: F
 birth_date: 1966-04-07
+gender: Female
+email: https://mcclain.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M001136.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: MI-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-9
+  district: MI-10
 offices:
 - classification: capitol
-  address: 444 Cannon House Office Building Washington DC 20515-2209
+  address: 444 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2106
+  fax: 202-226-1169
+- classification: district
+  address: 30 N. Broadway St., Lake Orion, MI 48362
+  voice: 586-697-9300
+- classification: district
+  address: 6725 Airport Road, Marlette, MI 48453
+  voice: 586-697-9300
 links:
 - url: https://mcclain.house.gov
   note: website
+- url: https://mcclain.house.gov/
+other_names:
+- name: L. McClain
+- name: L.C. McClain
+- name: Lisa C. McClain
+- name: McClain, L.
 ids:
   twitter: RepLisaMcClain
 other_identifiers:
@@ -49,3 +60,11 @@ other_identifiers:
   identifier: Lisa McClain
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lisa_McClain
+- url: https://en.wikipedia.org/wiki/Lisa_McClain
+- url: https://justfacts.votesmart.org/candidate/biography/191633/lisa-mcclain
+- url: https://lisamcclainforcongress.com/meet-lisa
+- url: https://mcclain.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lisa_mcclain/456827
+- url: https://www.linkedin.com/in/lisa-mcclain-19513a196
diff --git a/data/us/legislature/Lisa-Murkowski-cd76253c-a786-586d-aaac-bd14db985c3b.yml b/data/us/legislature/Lisa-Murkowski-cd76253c-a786-586d-aaac-bd14db985c3b.yml
index 8c86a82b34..c78e81ba96 100644
--- a/data/us/legislature/Lisa-Murkowski-cd76253c-a786-586d-aaac-bd14db985c3b.yml
+++ b/data/us/legislature/Lisa-Murkowski-cd76253c-a786-586d-aaac-bd14db985c3b.yml
@@ -2,85 +2,82 @@ id: ocd-person/cd76253c-a786-586d-aaac-bd14db985c3b
 name: Lisa Murkowski
 given_name: Lisa
 family_name: Murkowski
-middle_name: A.
-gender: F
 birth_date: 1957-05-22
+gender: Female
+email: https://www.murkowski.senate.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/M001153.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alaska
 offices:
 - classification: capitol
-  address: 522 Hart Senate Office Building Washington DC 20510
+  address: 522 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6665
+  fax: 202-224-5301
 - classification: district
-  address: 510 L St. Suite 600; Anchorage, AK 99501
-  voice: 907-271-3735
+  address: 1900 1st Ave. Suite 225, Ketchikan, AK 99901
+  voice: 907-225-6880
   fax: 877-857-0322
-  name: 'District Office #1'
-- classification: district
-  address: 250 Cushman Ave. Suite 2D; Fairbanks, AK 99701
-  voice: 907-456-0233
-  fax: 907-451-7146
-  name: 'District Office #2'
 - classification: district
-  address: 800 Glacier Ave. Suite 101; Juneau, AK 99801
-  voice: 907-586-7277
-  fax: 907-586-7201
-  name: 'District Office #3'
+  address: 44539 Sterling Highway Suite 203, Soldotna, AK 99669
+  voice: 907-262-4220
+  fax: 877-857-0322
 - classification: district
-  address: 1900 First Ave. Suite 225; Ketchikan, AK 99901
-  voice: 907-225-6880
-  fax: 907-225-0390
-  name: 'District Office #4'
+  address: 510 L St. Suite 600, Anchorage, AK 99501
+  voice: 907-271-3735
+  fax: 877-857-0322
 - classification: district
-  address: 44539 Sterling Hwy. Suite 203; Soldotna, AK 99669
-  voice: 907-262-4220
-  fax: 907-283-4363
-  name: 'District Office #5'
+  address: 800 Glacier Ave. Suite 101, Juneau, AK 99801
+  voice: 907-586-7277
+  fax: 202-228-0363
 - classification: district
-  address: 851 E. Westpoint Dr. Suite 307; Wasilla, AK 99654
+  address: 851 E. Westpoint Drive Suite 307, Wasilla, AK 99654
   voice: 907-376-7665
-  fax: 907-376-8526
-  name: 'District Office #6'
+  fax: 877-857-0322
+- classification: district
+  address: Fairbanks Federal Building 101 12th Ave., Room 172, Fairbanks, AK 99701
+  voice: 907-456-0233
+  fax: 877-857-0322
 links:
 - url: https://www.murkowski.senate.gov
   note: website
 - url: https://www.murkowski.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.murkowski.senate.gov/
+other_names:
+- name: L. Murkowski
+- name: L.A. Murkowski
+- name: Murkowski (R-AK)
+- name: Murkowski, L.
 ids:
   twitter: LisaMurkowski
   youtube: UCaigku16AErqvD0wRuwGb9A
   facebook: SenLisaMurkowski
-other_names:
-- name: Murkowski (R-AK)
 other_identifiers:
 - scheme: bioguide
   identifier: M001153
@@ -114,3 +111,10 @@ other_identifiers:
   identifier: kg:/m/0202kt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lisa_Murkowski
+- url: https://en.wikipedia.org/wiki/Lisa_Murkowski
+- url: https://justfacts.votesmart.org/candidate/15841/lisa-murkowski
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lisa_murkowski/300075
+- url: https://www.murkowski.senate.gov
+- url: https://www.murkowski.senate.gov/about-lisa
diff --git a/data/us/legislature/Lizzie-Fletcher-b2b37c5e-17c0-5833-b5e0-fe4f93834761.yml b/data/us/legislature/Lizzie-Fletcher-b2b37c5e-17c0-5833-b5e0-fe4f93834761.yml
index d05733ba1f..28694a4c50 100644
--- a/data/us/legislature/Lizzie-Fletcher-b2b37c5e-17c0-5833-b5e0-fe4f93834761.yml
+++ b/data/us/legislature/Lizzie-Fletcher-b2b37c5e-17c0-5833-b5e0-fe4f93834761.yml
@@ -2,39 +2,49 @@ id: ocd-person/b2b37c5e-17c0-5833-b5e0-fe4f93834761
 name: Lizzie Fletcher
 given_name: Lizzie
 family_name: Fletcher
-gender: F
 birth_date: 1975-02-13
+gender: Female
+email: https://fletcher.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000468.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-7
 offices:
 - classification: capitol
-  address: 346 Cannon House Office Building Washington DC 20515-4307
+  address: 346 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2571
+  fax: 202-225-4381
 - classification: district
-  address: 5599 San Felipe St Suite 950; Houston, TX 77056-2724
-  name: 'District Office #1'
+  address: 1600 Highway 6, Suite 455, Sugarland, TX 77478
+  voice: 713-353-8680
+  fax: 713-353-8677
+- classification: district
+  address: 3700 Buffalo Speedway Suite 610, Houston, TX 77098
+  voice: 713-353-8680
+  fax: 713-353-8677
 links:
 - url: https://fletcher.house.gov
   note: website
+- url: https://fletcher.house.gov/
+other_names:
+- name: E.A.P. Fletcher
+- name: Fletcher, L.
+- name: L. Fletcher
 ids:
   twitter: RepFletcher
 other_identifiers:
@@ -60,3 +70,12 @@ other_identifiers:
   identifier: kg:/g/11gzqssv7p
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lizzie_Pannill_Fletcher
+- url: https://en.wikipedia.org/wiki/Lizzie_Pannill_Fletcher
+- url: https://fletcher.house.gov
+- url: https://fletcher.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/177031/lizzie-fletcher
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lizzie_fletcher/412824
+- url: https://www.linkedin.com/in/elizabeth-fletcher-a6a7738
+- url: https://www.lizziefletcher.com/meet-lizzie-fletcher
diff --git a/data/us/legislature/Lloyd-Doggett-09fc76c2-eb6b-52c2-bc3d-de183e362df0.yml b/data/us/legislature/Lloyd-Doggett-09fc76c2-eb6b-52c2-bc3d-de183e362df0.yml
index 90b9ef9dad..ae5f1a5b13 100644
--- a/data/us/legislature/Lloyd-Doggett-09fc76c2-eb6b-52c2-bc3d-de183e362df0.yml
+++ b/data/us/legislature/Lloyd-Doggett-09fc76c2-eb6b-52c2-bc3d-de183e362df0.yml
@@ -2,105 +2,103 @@ id: ocd-person/09fc76c2-eb6b-52c2-bc3d-de183e362df0
 name: Lloyd Doggett
 given_name: Lloyd
 family_name: Doggett
-middle_name: A.
-gender: M
 birth_date: 1946-10-06
+gender: Male
+email: https://doggett.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/D000399.jpg
 party:
-- start_date: '1995-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-10
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: TX-37
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-10
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: TX-35
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-10
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: TX-35
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-10
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: TX-35
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-10
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: TX-35
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-25
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: TX-35
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-35
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: TX-25
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-35
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: TX-10
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-35
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: TX-10
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-35
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: TX-10
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-35
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: TX-10
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-37
+  district: TX-10
 offices:
 - classification: capitol
-  address: 2307 Rayburn House Office Building Washington DC 20515-0001
+  address: 2307 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4865
 - classification: district
-  address: 300 E. 8th St. Suite 763; Austin, TX 78701
+  address: J.J. Pickle Federal Building 300 E. 8th St., 7th Floor, Austin, TX 78701
   voice: 512-916-5921
-  name: 'District Office #1'
-- classification: district
-  address: 217 W. Travis St.; San Antonio, TX 78205
-  voice: 210-704-1080
-  name: 'District Office #2'
 links:
 - url: https://doggett.house.gov
   note: website
+- url: https://doggett.house.gov/
+other_names:
+- name: Doggett, L.
+- name: L. Doggett
+- name: L.A. Doggett
 ids:
   twitter: RepLloydDoggett
   youtube: UCN-kiLKyHPcfRVZ28sAHS_g
@@ -136,3 +134,10 @@ other_identifiers:
   identifier: Lloyd Doggett
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lloyd_Doggett
+- url: https://doggett.house.gov
+- url: https://doggett.house.gov/about/full-biography
+- url: https://en.wikipedia.org/wiki/Lloyd_Doggett
+- url: https://justfacts.votesmart.org/candidate/21689/lloyd-doggett-ii
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lloyd_doggett/400111
diff --git a/data/us/legislature/Lloyd-Smucker-0f2326f2-b5dc-5428-bcaa-9a1078d0750c.yml b/data/us/legislature/Lloyd-Smucker-0f2326f2-b5dc-5428-bcaa-9a1078d0750c.yml
index 8698f8be14..40597fe860 100644
--- a/data/us/legislature/Lloyd-Smucker-0f2326f2-b5dc-5428-bcaa-9a1078d0750c.yml
+++ b/data/us/legislature/Lloyd-Smucker-0f2326f2-b5dc-5428-bcaa-9a1078d0750c.yml
@@ -2,54 +2,55 @@ id: ocd-person/0f2326f2-b5dc-5428-bcaa-9a1078d0750c
 name: Lloyd Smucker
 given_name: Lloyd
 family_name: Smucker
-gender: M
 birth_date: 1964-01-23
+gender: Male
+email: https://smucker.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001199.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-16
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-11
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-11
+  district: PA-16
 offices:
 - classification: capitol
-  address: 302 Cannon House Office Building Washington DC 20515-3811
+  address: 302 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2411
+  fax: 202-225-2013
 - classification: district
-  address: 118 Carlise Street; Hanover, PA 17331
+  address: 100 Redco Ave., Red Lion, PA 17356
+  voice: 717-969-6133
+- classification: district
+  address: 118 Carlisle St., Hanover, PA 17331
   voice: 717-969-6132
-  name: 'District Office #1'
 - classification: district
-  address: 51 S. Duke St. Suite 201; Lancaster, PA 17602
+  address: 2270 Erin Court, Lancaster, PA 17601
   voice: 717-393-0667
   fax: 717-393-0924
-  name: 'District Office #2'
-- classification: district
-  address: 100 Redco Ave; Red Lion, PA 17356-1436
-  voice: 717-969-6133
-  name: 'District Office #3'
 links:
 - url: https://smucker.house.gov
   note: website
+other_names:
+- name: L. Smucker
+- name: L.K. Smucker
+- name: Smucker, L.
 ids:
   twitter: RepSmucker
   youtube: UCs5iMvWy-oTHyf5HuwB7FCg
@@ -81,3 +82,10 @@ other_identifiers:
   identifier: Lloyd Smucker
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lloyd_Smucker
+- url: https://en.wikipedia.org/wiki/Lloyd_Smucker
+- url: https://justfacts.votesmart.org/candidate/biography/102454/lloyd-smucker
+- url: https://smucker.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lloyd_smucker/412722
+- url: https://www.linkedin.com/in/lloyd-smucker-983b1311
diff --git a/data/us/legislature/Lois-Frankel-6dca533f-6c45-5308-9d6c-b579d4baf301.yml b/data/us/legislature/Lois-Frankel-6dca533f-6c45-5308-9d6c-b579d4baf301.yml
index 67067dfe8f..85b89b6be0 100644
--- a/data/us/legislature/Lois-Frankel-6dca533f-6c45-5308-9d6c-b579d4baf301.yml
+++ b/data/us/legislature/Lois-Frankel-6dca533f-6c45-5308-9d6c-b579d4baf301.yml
@@ -2,62 +2,65 @@ id: ocd-person/6dca533f-6c45-5308-9d6c-b579d4baf301
 name: Lois Frankel
 given_name: Lois
 family_name: Frankel
-gender: F
 birth_date: 1948-05-16
+gender: Female
+email: https://frankel.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000462.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-22
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-22
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: FL-21
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-21
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-21
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-21
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-22
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-22
 offices:
 - classification: capitol
-  address: 2305 Rayburn House Office Building Washington DC 20515-0922
+  address: 2305 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-9890
+  fax: 202-225-1224
 - classification: district
-  address: 2500 N. Military Trl. Suite 490; Boca Raton, FL 33431
+  address: 7499 W. Atlantic Ave. Unit 206, Delray Beach, FL 33446
   voice: 561-998-9045
   fax: 561-998-9048
-  name: 'District Office #1'
 links:
 - url: https://frankel.house.gov
   note: website
+- url: https://frankel.house.gov/
+other_names:
+- name: Frankel, L.
+- name: Frankel, Lois
+- name: L. Frankel
+- name: L.J. Frankel
 ids:
   twitter: RepLoisFrankel
   youtube: UCEk5viAhxaW_2OK20-yBwzQ
   facebook: RepLoisFrankel
-other_names:
-- name: Frankel, Lois
 other_identifiers:
 - scheme: govtrack
   identifier: '412529'
@@ -91,3 +94,9 @@ other_identifiers:
   identifier: kg:/m/0gjdw8_
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lois_Frankel
+- url: https://en.wikipedia.org/wiki/Lois_Frankel
+- url: https://frankel.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/8102/lois-frankel
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lois_frankel/412529
diff --git a/data/us/legislature/Lori-Chavez-DeRemer-dba5c00d-d539-5816-8781-e63f28d8b3e2.yml b/data/us/legislature/Lori-Chavez-DeRemer-dba5c00d-d539-5816-8781-e63f28d8b3e2.yml
index 6cf219e9c7..ab99ebf5ce 100644
--- a/data/us/legislature/Lori-Chavez-DeRemer-dba5c00d-d539-5816-8781-e63f28d8b3e2.yml
+++ b/data/us/legislature/Lori-Chavez-DeRemer-dba5c00d-d539-5816-8781-e63f28d8b3e2.yml
@@ -2,27 +2,36 @@ id: ocd-person/dba5c00d-d539-5816-8781-e63f28d8b3e2
 name: Lori Chavez-DeRemer
 given_name: Lori
 family_name: Chavez-DeRemer
-middle_name: Michelle
-gender: F
 birth_date: 1968-04-07
+gender: Female
+email: https://chavez-deremer.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001135.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-5
 offices:
 - classification: capitol
-  address: 1722 Longworth House Office Building Washington DC 20515-3705
+  address: 1722 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5711
+- classification: district
+  address: 2757 NW 7th St. Suite D, Redmond, OR 97756
+  voice: 541-604-3141
+- classification: district
+  address: 621 High St., Oregon City, OR 97045
+  voice: 503-387-8651
 links:
 - url: https://chavez-deremer.house.gov
   note: website
+- url: https://chavez-deremer.house.gov/
+other_names:
+- name: Chavez-DeRemer, L.
+- name: L. Chavez-DeRemer
+- name: L.M. Chavez-DeRemer
 ids:
   twitter: RepLCD
 other_identifiers:
@@ -42,3 +51,8 @@ other_identifiers:
   identifier: '202792'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lori_Chavez-DeRemer
+- url: https://chavez-deremer.house.gov
+- url: https://en.wikipedia.org/wiki/Lori_Chavez-DeRemer
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/lori-chavez-deremer-52299674
diff --git a/data/us/legislature/Lori-Trahan-f8d561c8-c0f2-5251-9d52-53289b82c7d9.yml b/data/us/legislature/Lori-Trahan-f8d561c8-c0f2-5251-9d52-53289b82c7d9.yml
index 24e492abec..fc6ec4eb44 100644
--- a/data/us/legislature/Lori-Trahan-f8d561c8-c0f2-5251-9d52-53289b82c7d9.yml
+++ b/data/us/legislature/Lori-Trahan-f8d561c8-c0f2-5251-9d52-53289b82c7d9.yml
@@ -2,43 +2,43 @@ id: ocd-person/f8d561c8-c0f2-5251-9d52-53289b82c7d9
 name: Lori Trahan
 given_name: Lori
 family_name: Trahan
-gender: F
 birth_date: 1973-10-27
+gender: Female
+email: https://trahan.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/T000482.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-3
 offices:
 - classification: capitol
-  address: 2439 Rayburn House Office Building Washington DC 20515-2103
+  address: 2439 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3411
 - classification: district
-  address: 15 Union St 4th Floor; Lawrence, MA 01840-1866
-  name: 'District Office #1'
-- classification: district
-  address: 126 John St Suite 12; Lowell, MA 01852-1152
+  address: 126 John St., Suite 12, Lowell, MA 01852
   voice: 978-459-0101
-  name: 'District Office #2'
 links:
 - url: https://trahan.house.gov
   note: website
+- url: https://trahan.house.gov/
+other_names:
+- name: L. Trahan
+- name: L.L. Trahan
+- name: Trahan, L.
 ids:
   twitter: RepLoriTrahan
 other_identifiers:
@@ -64,3 +64,11 @@ other_identifiers:
   identifier: kg:/g/11gtcg496z
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lori_Trahan
+- url: https://chci.org/staff-and-leadership/rep-lori-trahan
+- url: https://en.wikipedia.org/wiki/Lori_Trahan
+- url: https://justfacts.votesmart.org/candidate/182310/lori-trahan
+- url: https://theunitedstates.io
+- url: https://trahan.house.gov
+- url: https://www.govtrack.us/congress/members/lori_trahan/412781
+- url: https://www.linkedin.com/in/latrahan
diff --git a/data/us/legislature/Lucy-McBath-b5d26a8a-2954-574c-abf8-1c232e928c9c.yml b/data/us/legislature/Lucy-McBath-b5d26a8a-2954-574c-abf8-1c232e928c9c.yml
index 3845b93ba1..10b18e646f 100644
--- a/data/us/legislature/Lucy-McBath-b5d26a8a-2954-574c-abf8-1c232e928c9c.yml
+++ b/data/us/legislature/Lucy-McBath-b5d26a8a-2954-574c-abf8-1c232e928c9c.yml
@@ -2,40 +2,43 @@ id: ocd-person/b5d26a8a-2954-574c-abf8-1c232e928c9c
 name: Lucy McBath
 given_name: Lucy
 family_name: McBath
-gender: F
 birth_date: 1960-06-01
+gender: Female
+email: https://mcbath.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001208.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: GA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: GA-7
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: GA-7
+  district: GA-6
 offices:
 - classification: capitol
-  address: 2246 Rayburn House Office Building Washington DC 20515-1007
+  address: 2246 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4501
 - classification: district
-  address: 5775 Glenridge Dr.; Atlanta, GA 30328-5380
+  address: 3700 Crestwood Parkway Suite 270, Duluth, GA 30096
   voice: 470-773-6330
-  name: 'District Office #1'
 links:
 - url: https://mcbath.house.gov
   note: website
+- url: https://mcbath.house.gov/
+other_names:
+- name: L. McBath
+- name: L.K. McBath
+- name: McBath, L.
 ids:
   twitter: RepLucyMcBath
 other_identifiers:
@@ -61,3 +64,11 @@ other_identifiers:
   identifier: Lucy McBath
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Lucy_McBath
+- url: https://en.wikipedia.org/wiki/Lucy_McBath
+- url: https://justfacts.votesmart.org/candidate/biography/178538/lucy-mcbath
+- url: https://mcbath.house.gov
+- url: https://mcbath.house.gov/official-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/lucy_mcbath/412769
+- url: https://www.linkedin.com/in/lucy-mcbath-9bb9b040
diff --git a/data/us/legislature/Madeleine-Dean-1daf07ea-2575-511e-a5a8-47f0662cf209.yml b/data/us/legislature/Madeleine-Dean-1daf07ea-2575-511e-a5a8-47f0662cf209.yml
index 3ab4fbeb2b..f61c0273be 100644
--- a/data/us/legislature/Madeleine-Dean-1daf07ea-2575-511e-a5a8-47f0662cf209.yml
+++ b/data/us/legislature/Madeleine-Dean-1daf07ea-2575-511e-a5a8-47f0662cf209.yml
@@ -2,50 +2,49 @@ id: ocd-person/1daf07ea-2575-511e-a5a8-47f0662cf209
 name: Madeleine Dean
 given_name: Madeleine
 family_name: Dean
-gender: F
 birth_date: 1959-06-06
+gender: Female
+email: https://dean.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/D000631.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-4
 offices:
 - classification: capitol
-  address: 150 Cannon House Office Building Washington DC 20515-3804
+  address: 150 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4731
 - classification: district
-  address: 115 E Glenside Ave Suite 1; Glenside, PA 19038-4618
+  address: 115 E. Glenside Ave. Suite 1, Glenside, PA 19038
   voice: 215-884-4300
   fax: 215-884-3640
-  name: 'District Office #1'
 - classification: district
-  address: 101 E Main St A; Norristown, PA 19401-4916
+  address: 1200 E. High St. Suite 105, Pottstown, PA 19464
   voice: 610-382-1250
-  fax: 610-275-1759
-  name: 'District Office #2'
 links:
 - url: https://dean.house.gov
   note: website
-ids:
-  twitter: RepDean
+- url: https://dean.house.gov/
 other_names:
 - name: Dean (PA)
+- name: Dean, M.
+- name: M. Dean
+ids:
+  twitter: RepDean
 other_identifiers:
 - scheme: bioguide
   identifier: D000631
@@ -69,3 +68,10 @@ other_identifiers:
   identifier: Madeleine Dean
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Madeleine_Dean
+- url: https://dean.house.gov
+- url: https://dean.house.gov/biography
+- url: https://en.wikipedia.org/wiki/Madeleine_Dean
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/madeleine_dean/412809
+- url: https://www.linkedin.com/in/madeleine-dean-41007a74
diff --git a/data/us/legislature/Marc-A-Veasey-fe3cbb3c-90cd-5661-8f02-2e7da15459b8.yml b/data/us/legislature/Marc-A-Veasey-fe3cbb3c-90cd-5661-8f02-2e7da15459b8.yml
index f5bc586a36..658fdf5459 100644
--- a/data/us/legislature/Marc-A-Veasey-fe3cbb3c-90cd-5661-8f02-2e7da15459b8.yml
+++ b/data/us/legislature/Marc-A-Veasey-fe3cbb3c-90cd-5661-8f02-2e7da15459b8.yml
@@ -1,63 +1,66 @@
 id: ocd-person/fe3cbb3c-90cd-5661-8f02-2e7da15459b8
-name: Marc A. Veasey
+name: Marc Veasey
 given_name: Marc
 family_name: Veasey
-middle_name: A.
-gender: M
 birth_date: 1971-01-03
+gender: Male
+email: https://veasey.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/V000131.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-33
 offices:
 - classification: capitol
-  address: 2348 Rayburn House Office Building Washington DC 20515-4333
+  address: 2348 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-9897
+  fax: 202-225-9702
 - classification: district
-  address: 1881 Sylvan Ave. Suite 108; Dallas, TX 75208
-  voice: 214-741-1387
-  fax: 214-741-2026
-  name: 'District Office #1'
-- classification: district
-  address: 6707 Brentwood Stair Rd. Suite 200; Fort Worth, TX 76112
+  address: 6707 Brentwood Stair Road Suite 200, Fort Worth, TX 76112
   voice: 817-920-9086
   fax: 817-920-9324
-  name: 'District Office #2'
+- classification: district
+  address: JP Morgan Chase Building 1881 Sylvan Ave., Suite 108, Dallas, TX 75028
+  voice: 214-741-1387
+  fax: 214-741-2026
 links:
 - url: https://veasey.house.gov
   note: website
+- url: https://veasey.house.gov/
+other_names:
+- name: M. Veasey
+- name: M.A. Veasey
+- name: Marc A. Veasey
+- name: Veasey, M.
 ids:
   twitter: RepVeasey
   youtube: UC2CRp1KF5uljZyhDRPR-72Q
@@ -91,3 +94,11 @@ other_identifiers:
   identifier: kg:/m/0kmnfw5
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marc_Veasey
+- url: https://en.wikipedia.org/wiki/Marc_Veasey
+- url: https://marcveasey.com/about-marc
+- url: https://theunitedstates.io
+- url: https://veasey.house.gov
+- url: https://veasey.house.gov/about/full-biography
+- url: https://www.govtrack.us/congress/members/marc_veasey/412579
+- url: https://www.linkedin.com/in/marc-veasey-3b2b002
diff --git a/data/us/legislature/Marco-Rubio-014b069e-c444-50fe-99ef-bf72ae5aecd5.yml b/data/us/legislature/Marco-Rubio-014b069e-c444-50fe-99ef-bf72ae5aecd5.yml
index 4b6cf3c496..55f0bfdf62 100644
--- a/data/us/legislature/Marco-Rubio-014b069e-c444-50fe-99ef-bf72ae5aecd5.yml
+++ b/data/us/legislature/Marco-Rubio-014b069e-c444-50fe-99ef-bf72ae5aecd5.yml
@@ -2,77 +2,72 @@ id: ocd-person/014b069e-c444-50fe-99ef-bf72ae5aecd5
 name: Marco Rubio
 given_name: Marco
 family_name: Rubio
-gender: M
 birth_date: 1971-05-28
+gender: Male
+email: https://www.rubio.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/R000595.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Florida
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Florida
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Florida
 offices:
 - classification: capitol
-  address: 284 Russell Senate Office Building Washington DC 20510
+  address: 284 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3041
+- classification: capitol
+  address: 402 S. Monroe St. Suite 2105E, Tallahassee, FL 32399
+  voice: 850-599-9100
 - classification: district
-  address: 2120 Main St. Room 200; Fort Myers, FL 33901
-  voice: 239-318-6464
-  name: 'District Office #1'
-- classification: district
-  address: 300 North Hogan St. Suite 8-111; Jacksonville, FL 32202
-  voice: 904-354-4300
-  name: 'District Office #2'
-- classification: district
-  address: 7400 SW 87th Ave. Suite 270; Miami, FL 33173
-  voice: 305-596-4224
-  fax: 305-596-4345
-  name: 'District Office #3'
+  address: 1 N. Palafox St. Suite 159, Pensacola, FL 32502
+  voice: 850-433-2603
 - classification: district
-  address: 201 S. Orange Ave. Suite 350; Orlando, FL 32801
+  address: 201 S. Orange Ave. Suite 350, Orlando, FL 32801
   voice: 407-254-2573
-  name: 'District Office #4'
 - classification: district
-  address: 4580 PGA Blvd. Suite 201; Palm Beach Gardens, FL 33418
-  voice: 561-775-3360
-  name: 'District Office #5'
+  address: 2120 Main St. Room 200, Fort Myers, FL 33901
+  voice: 239-318-6464
 - classification: district
-  address: 700 S. Palafox St. Suite 125; Pensacola, FL 32502
-  voice: 850-433-2603
-  name: 'District Office #6'
+  address: 300 N. Hogan St. Suite 8-111, Jacksonville, FL 32202
+  voice: 904-354-4300
 - classification: district
-  address: 402 S. Monroe St. Suite 2105E; Tallahassee, FL 32399
-  voice: 850-599-9100
-  name: 'District Office #7'
+  address: 4580 PGA Blvd. Suite 201, Palm Beach Gardens, FL 33418
+  voice: 561-775-3360
 - classification: district
-  address: 501 E. Polk St Suite 601; Tampa, FL 33602
+  address: 501 E. Polk St. Suite 601, Tampa, FL 33602
   voice: 813-947-6288
-  name: 'District Office #8'
+- classification: district
+  address: 9130 S. Dadeland Blvd. Suite 1510, Miami, FL 33156
+  voice: 305-596-4224
+  fax: 305-596-4345
 links:
 - url: https://www.rubio.senate.gov
   note: website
 - url: https://www.rubio.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.rubio.senate.gov/
+other_names:
+- name: M. Rubio
+- name: M.A. Rubio
+- name: Rubio (R-FL)
+- name: Rubio, M.
 ids:
   twitter: SenRubioPress
   youtube: UCh8t7sV_DBKz4A-RkL9feyg
   facebook: SenatorMarcoRubio
-other_names:
-- name: Rubio (R-FL)
 other_identifiers:
 - scheme: bioguide
   identifier: R000595
@@ -104,3 +99,10 @@ other_identifiers:
   identifier: kg:/m/0dpr5f
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marco_Rubio
+- url: https://en.wikipedia.org/wiki/Marco_Rubio
+- url: https://justfacts.votesmart.org/candidate/1601/marco-rubio
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marco_rubio/412491
+- url: https://www.linkedin.com/in/marcorubio16
+- url: https://www.rubio.senate.gov
diff --git a/data/us/legislature/Marcus-J-Molinaro-5cc850f2-c4fa-5844-ab4c-bb44a07159ac.yml b/data/us/legislature/Marcus-J-Molinaro-5cc850f2-c4fa-5844-ab4c-bb44a07159ac.yml
index 66796437ed..15860b48f7 100644
--- a/data/us/legislature/Marcus-J-Molinaro-5cc850f2-c4fa-5844-ab4c-bb44a07159ac.yml
+++ b/data/us/legislature/Marcus-J-Molinaro-5cc850f2-c4fa-5844-ab4c-bb44a07159ac.yml
@@ -1,28 +1,44 @@
 id: ocd-person/5cc850f2-c4fa-5844-ab4c-bb44a07159ac
-name: Marcus J. Molinaro
-given_name: Marcus
+name: Marc Molinaro
+given_name: Marc
 family_name: Molinaro
-middle_name: J.
-gender: M
 birth_date: 1975-10-08
+gender: Male
+email: https://molinaro.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001221.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-19
 offices:
 - classification: capitol
-  address: 1207 Longworth House Office Building Washington DC 20515-3219
+  address: 1207 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5441
+- classification: district
+  address: 41 S. Main St., Oneonta, NY 13820
+- classification: district
+  address: 49 Court St. Suite 210, Binghamton, NY 13901
+  voice: 607-242-0200
+- classification: district
+  address: 49 Gilfeather Park Road Unit 1, Leeds, NY 12451
+  voice: 585-625-2100
+- classification: district
+  address: 59 N. Main St., Liberty, NY 12754
+- classification: district
+  address: 661 W. Main St., Hancock, NY 13783
 links:
 - url: https://molinaro.house.gov
   note: website
+- url: https://molinaro.house.gov/
+other_names:
+- name: M. Molinaro
+- name: M.J. Molinaro
+- name: Marcus J. Molinaro
+- name: Molinaro, M.
 ids:
   twitter: RepMolinaroNY19
 other_identifiers:
@@ -44,3 +60,8 @@ other_identifiers:
   identifier: Marcus Molinaro
 sources:
 - url: https://theunitedstates.io/
+- url: https://en.wikipedia.org/wiki/Marc_Molinaro
+- url: https://justfacts.votesmart.org/candidate/key-votes/69202/marcus-molinaro
+- url: https://molinaro.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marcus_molinaro/456925
diff --git a/data/us/legislature/Marcy-Kaptur-b6f3dafd-0c6e-5694-ac20-59a88e891f62.yml b/data/us/legislature/Marcy-Kaptur-b6f3dafd-0c6e-5694-ac20-59a88e891f62.yml
index c48ac5c37a..91dc68ef79 100644
--- a/data/us/legislature/Marcy-Kaptur-b6f3dafd-0c6e-5694-ac20-59a88e891f62.yml
+++ b/data/us/legislature/Marcy-Kaptur-b6f3dafd-0c6e-5694-ac20-59a88e891f62.yml
@@ -2,141 +2,137 @@ id: ocd-person/b6f3dafd-0c6e-5694-ac20-59a88e891f62
 name: Marcy Kaptur
 given_name: Marcy
 family_name: Kaptur
-gender: F
 birth_date: 1946-06-17
+gender: Female
+email: https://kaptur.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000009.jpg
 party:
-- start_date: '1983-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-9
 offices:
 - classification: capitol
-  address: 2186 Rayburn House Office Building Washington DC 20515-3509
+  address: 2186 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4146
+  fax: 202-225-7711
 - classification: district
-  address: 17021 Lorain; Cleveland, OH 44111
-  voice: 216-767-5933
-  fax: 419-255-9623
-  name: 'District Office #1'
-- classification: district
-  address: 200 W. Erie Room 310; Lorain, OH 44052
-  voice: 440-288-1500
-  fax: 419-255-9623
-  name: 'District Office #2'
-- classification: district
-  address: One Maritime Plaza Room 600; Toledo, OH 43604
+  address: 1 Maritime Plaza, Room 600, Toledo, OH 43604
   voice: 419-259-7500
   fax: 419-255-9623
-  name: 'District Office #3'
+- classification: district
+  address: 101 Clinton St., Room 2300, Defiance, OH 43512
 links:
 - url: https://kaptur.house.gov
   note: website
+- url: https://kaptur.house.gov/
+other_names:
+- name: Kaptur, M.
+- name: M. Kaptur
+- name: M.C. Kaptur
 ids:
   twitter: RepMarcyKaptur
   youtube: UCIJUNf22o09nO02oQPLKQ6w
@@ -172,3 +168,11 @@ other_identifiers:
   identifier: Marcy Kaptur
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marcy_Kaptur
+- url: https://en.wikipedia.org/wiki/Marcy_Kaptur
+- url: https://justfacts.votesmart.org/candidate/27016/marcy-kaptur
+- url: https://kaptur.house.gov
+- url: https://kaptur.house.gov/about
+- url: https://marcykaptur.com/about-marcy
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marcy_kaptur/400211
diff --git a/data/us/legislature/Margaret-Wood-Hassan-c59c2d02-3a1e-55a7-b1eb-638a902899d5.yml b/data/us/legislature/Margaret-Wood-Hassan-c59c2d02-3a1e-55a7-b1eb-638a902899d5.yml
index ee8d81d2cc..1b7e257284 100644
--- a/data/us/legislature/Margaret-Wood-Hassan-c59c2d02-3a1e-55a7-b1eb-638a902899d5.yml
+++ b/data/us/legislature/Margaret-Wood-Hassan-c59c2d02-3a1e-55a7-b1eb-638a902899d5.yml
@@ -1,61 +1,56 @@
 id: ocd-person/c59c2d02-3a1e-55a7-b1eb-638a902899d5
-name: Margaret Wood Hassan
-given_name: Margaret
+name: Maggie Hassan
+given_name: Maggie
 family_name: Hassan
-middle_name: Wood
-gender: F
 birth_date: 1958-02-27
+gender: Female
+email: https://www.hassan.senate.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/H001076.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Hampshire
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Hampshire
 offices:
 - classification: capitol
-  address: 324 Hart Senate Office Building Washington DC 20510
+  address: 324 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3324
 - classification: district
-  address: 168 Main Street Lower Level; Berlin, NH 03570
-  voice: 603-752-6190
-  name: 'District Office #1'
+  address: 14 Manchester Square Suite 140, Portsmouth, NH 03801
+  voice: 603-433-4445
 - classification: district
-  address: 1589 Elm Street Third Floor; Manchester, NH 03101
+  address: 1589 Elm St. 3rd Floor, Manchester, NH 03101
   voice: 603-622-2204
-  name: 'District Office #2'
-- classification: district
-  address: 142 Main Street Suite 520; Nashua, NH 03060
-  voice: 603-880-3314
-  name: 'District Office #3'
 - classification: district
-  address: 14 Manchester Square Suite 140; Portsmouth, NH 03801
-  voice: 603-433-4445
-  name: 'District Office #4'
+  address: 168 Main St. Berlin City Hall, Lower Level, Berlin, NH 03570
+  voice: 603-752-6190
 - classification: district
-  address: 53 Pleasant Street; Concord, NH 03301
+  address: James C. Cleveland Federal Building 53 Pleasant St., Concord, NH 03301
   voice: 603-622-2204
-  name: 'District Office #5'
 links:
 - url: https://www.hassan.senate.gov
   note: website
 - url: https://www.hassan.senate.gov/content/contact-senator
   note: contact form
+- url: https://www.hassan.senate.gov/
+other_names:
+- name: Hassan (D-NH)
+- name: Hassan, M.
+- name: M. Hassan
+- name: M.C.W. Hassan
+- name: Maggie Hassan
+- name: Margaret Wood Hassan
 ids:
   twitter: SenatorHassan
   facebook: SenatorHassan
-other_names:
-- name: Maggie Hassan
-- name: Hassan (D-NH)
 other_identifiers:
 - scheme: bioguide
   identifier: H001076
@@ -85,3 +80,9 @@ other_identifiers:
   identifier: '41702'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Maggie_Hassan
+- url: https://en.wikipedia.org/wiki/Maggie_Hassan
+- url: https://justfacts.votesmart.org/candidate/42552/maggie-hassan
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/margaret_hassan/412680
+- url: https://www.hassan.senate.gov
diff --git a/data/us/legislature/Maria-Cantwell-46c3b77a-7d00-5ecc-83d0-04c8fa05bf04.yml b/data/us/legislature/Maria-Cantwell-46c3b77a-7d00-5ecc-83d0-04c8fa05bf04.yml
index 97bd6aa1f2..a29b541618 100644
--- a/data/us/legislature/Maria-Cantwell-46c3b77a-7d00-5ecc-83d0-04c8fa05bf04.yml
+++ b/data/us/legislature/Maria-Cantwell-46c3b77a-7d00-5ecc-83d0-04c8fa05bf04.yml
@@ -2,84 +2,82 @@ id: ocd-person/46c3b77a-7d00-5ecc-83d0-04c8fa05bf04
 name: Maria Cantwell
 given_name: Maria
 family_name: Cantwell
-gender: F
 birth_date: 1958-10-13
+gender: Female
+email: https://www.cantwell.senate.gov/contact/email/form
 image: https://theunitedstates.io/images/congress/450x550/C000127.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: WA-1
-- start_date: '2001-01-03'
-  end_date: '2007-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-01-03
+  end_date: 2007-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
+- start_date: 1993-01-05
+  end_date: 1995-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: WA-1
 offices:
 - classification: capitol
-  address: 511 Hart Senate Office Building Washington DC 20510
+  address: 511 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-3441
+  fax: 202-228-0514
 - classification: district
-  address: 2930 Wetmore Ave. Suite 9B; Everett, WA 98201
+  address: 2930 Wetmore Ave. Suite 9B, Everett, WA 98201
   voice: 425-303-0114
   fax: 425-303-8351
-  name: 'District Office #1'
 - classification: district
-  address: 825 Jadwin Ave. Suite 206; Richland, WA 99352
+  address: 825 Jadwin Ave. Suite 206, Richland, WA 99352
   voice: 509-946-8106
   fax: 509-946-6937
-  name: 'District Office #2'
-- classification: district
-  address: 915 Second Ave. Suite 3206; Seattle, WA 98174
-  voice: 206-220-6400
-  fax: 206-220-6404
-  name: 'District Office #3'
-- classification: district
-  address: 920 W. Riverside Ave. Suite 697; Spokane, WA 99201
-  voice: 509-353-2507
-  fax: 509-353-2547
-  name: 'District Office #4'
 - classification: district
-  address: 950 Pacific Ave. Suite 615; Tacoma, WA 98402
+  address: 950 Pacific Ave. Suite 615, Tacoma, WA 98402
   voice: 253-572-2281
   fax: 253-572-5879
-  name: 'District Office #5'
 - classification: district
-  address: 1313 Officers Row; Vancouver, WA 98661
+  address: Jackson Federal Building 915 2nd Ave., Suite 3206, Seattle, WA 98174
+  voice: 206-220-6400
+  fax: 206-220-6404
+- classification: district
+  address: The Marshall House 1313 Officers Row, Vancouver, WA 98661
   voice: 360-696-7838
   fax: 360-696-7844
-  name: 'District Office #6'
+- classification: district
+  address: U.S. Federal Courthouse 920 W. Riverside Ave., Suite 697, Spokane, WA 99201
+  voice: 509-353-2507
+  fax: 509-353-2547
 links:
 - url: https://www.cantwell.senate.gov
   note: website
 - url: https://www.cantwell.senate.gov/public/index.cfm/email-maria
   note: contact form
+- url: https://www.cantwell.senate.gov/
+other_names:
+- name: Cantwell (D-WA)
+- name: Cantwell, M.
+- name: M. Cantwell
+- name: M.E. Cantwell
 ids:
   twitter: SenatorCantwell
   youtube: UCN52UDqKgvHRk39ncySrIMw
   facebook: senatorcantwell
-other_names:
-- name: Cantwell (D-WA)
 other_identifiers:
 - scheme: bioguide
   identifier: C000127
@@ -115,3 +113,10 @@ other_identifiers:
   identifier: kg:/m/01x68t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Maria_Cantwell
+- url: https://en.wikipedia.org/wiki/Maria_Cantwell
+- url: https://justfacts.votesmart.org/candidate/27122/maria-cantwell
+- url: https://theunitedstates.io
+- url: https://www.cantwell.senate.gov
+- url: https://www.cantwell.senate.gov/about/biography
+- url: https://www.govtrack.us/congress/members/maria_cantwell/300018
diff --git a/data/us/legislature/Maria-Elvira-Salazar-23524e03-1206-50cb-844d-ddea47f258da.yml b/data/us/legislature/Maria-Elvira-Salazar-23524e03-1206-50cb-844d-ddea47f258da.yml
index 1048814666..b78d251061 100644
--- a/data/us/legislature/Maria-Elvira-Salazar-23524e03-1206-50cb-844d-ddea47f258da.yml
+++ b/data/us/legislature/Maria-Elvira-Salazar-23524e03-1206-50cb-844d-ddea47f258da.yml
@@ -1,33 +1,42 @@
 id: ocd-person/23524e03-1206-50cb-844d-ddea47f258da
-name: Maria Elvira Salazar
-given_name: Maria
+name: "Mar\xEDa Salazar"
+given_name: "Mar\xEDa"
 family_name: Salazar
-middle_name: Elvira
-gender: F
 birth_date: 1961-11-01
+gender: Female
+email: https://salazar.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S000168.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-27
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-27
 offices:
 - classification: capitol
-  address: 2162 Rayburn House Office Building Washington DC 20515-0927
+  address: 2162 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3931
+- classification: district
+  address: 10720 Caribbean Blvd. Room 220, Cutler Bay, FL 33189
+- classification: district
+  address: 5725 SW 8th St. Suite 200, Miami, FL 33144
+  voice: 305-668-2285
 links:
 - url: https://salazar.house.gov
   note: website
+- url: https://salazar.house.gov/
+other_names:
+- name: M. Salazar
+- name: M.E. Salazar
+- name: Maria Elvira Salazar
+- name: Salazar, M.
 ids:
   twitter: RepMariaSalazar
 other_identifiers:
@@ -49,3 +58,10 @@ other_identifiers:
   identifier: '182300'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Maria_Elvira_Salazar
+- url: https://en.wikipedia.org/wiki/Maria_Elvira_Salazar
+- url: https://justfacts.votesmart.org/candidate/biography/182300/maria-salazar
+- url: https://salazar.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/maria_salazar/456810
+- url: https://www.linkedin.com/in/mariaelviralive
diff --git a/data/us/legislature/Mariannette-Miller-Meeks-fc8623ea-be1e-518f-aa76-3598910fa676.yml b/data/us/legislature/Mariannette-Miller-Meeks-fc8623ea-be1e-518f-aa76-3598910fa676.yml
index 6020da1d9f..fc3b922556 100644
--- a/data/us/legislature/Mariannette-Miller-Meeks-fc8623ea-be1e-518f-aa76-3598910fa676.yml
+++ b/data/us/legislature/Mariannette-Miller-Meeks-fc8623ea-be1e-518f-aa76-3598910fa676.yml
@@ -2,32 +2,44 @@ id: ocd-person/fc8623ea-be1e-518f-aa76-3598910fa676
 name: Mariannette Miller-Meeks
 given_name: Mariannette
 family_name: Miller-Meeks
-middle_name: Jane
-gender: F
 birth_date: 1955-09-06
+gender: Female
+email: https://millermeeks.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001215.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: IA-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: IA-1
+  district: IA-2
 offices:
 - classification: capitol
-  address: 1034 Longworth House Office Building Washington DC 20515-1501
+  address: 1034 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6576
+- classification: district
+  address: 126 N. Howard St., Indianola, IA 50125
+  voice: 515-808-6040
+- classification: district
+  address: 201 W. 2nd St. Suite 705, Davenport, IA 52801
+  voice: 563-232-0930
+  fax: 563-323-5231
+- classification: district
+  address: 521A Lafayette St., Waterloo, IA 50703
 links:
 - url: https://millermeeks.house.gov
   note: website
+- url: https://millermeeks.house.gov/
+other_names:
+- name: M. Miller-Meeks
+- name: M.J. Miller-Meeks
+- name: Miller-Meeks, M.
 ids:
   twitter: RepMMM
 other_identifiers:
@@ -51,3 +63,10 @@ other_identifiers:
   identifier: Mariannette Miller-Meeks
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mariannette_Miller-Meeks
+- url: https://en.wikipedia.org/wiki/Mariannette_Miller-Meeks
+- url: https://justfacts.votesmart.org/candidate/biography/103294/mariannette-miller-meeks
+- url: https://millermeeks.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mariannette_miller_meeks/456817
+- url: https://www.linkedin.com/in/mariannette-miller-meeks-b08b98b
diff --git a/data/us/legislature/Marie-Gluesenkamp-Perez-3d465b8f-2f67-5283-8cab-da3990ec8c49.yml b/data/us/legislature/Marie-Gluesenkamp-Perez-3d465b8f-2f67-5283-8cab-da3990ec8c49.yml
index c32ecd1051..1eefc70c54 100644
--- a/data/us/legislature/Marie-Gluesenkamp-Perez-3d465b8f-2f67-5283-8cab-da3990ec8c49.yml
+++ b/data/us/legislature/Marie-Gluesenkamp-Perez-3d465b8f-2f67-5283-8cab-da3990ec8c49.yml
@@ -1,31 +1,38 @@
 id: ocd-person/3d465b8f-2f67-5283-8cab-da3990ec8c49
-name: Marie Gluesenkamp Perez
+name: "Marie Gluesenkamp P\xE9rez"
 given_name: Marie
-family_name: Gluesenkamp Perez
-gender: F
-birth_date: 1988-06-06
+family_name: "Gluesenkamp P\xE9rez"
+birth_date: 1988-06-04
+gender: Female
+email: https://gluesenkampperez.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/G000600.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-3
 offices:
 - classification: capitol
-  address: 1431 Longworth House Office Building Washington DC 20515-4703
+  address: 1431 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3536
+- classification: district
+  address: 1053 Officers Row, Vancouver, WA 98661
+  voice: 360-695-6292
 links:
 - url: https://gluesenkampperez.house.gov
   note: website
-ids:
-  twitter: RepMGP
+- url: https://gluesenkampperez.house.gov/
 other_names:
+- name: "Gluesenkamp P\xE9rez, M."
+- name: "K.M. Gluesenkamp P\xE9rez"
+- name: "M. Gluesenkamp P\xE9rez"
+- name: Marie Gluesenkamp Perez
 - name: Perez
+ids:
+  twitter: RepMGP
 other_identifiers:
 - scheme: bioguide
   identifier: G000600
@@ -47,3 +54,8 @@ other_identifiers:
   identifier: '207307'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marie_Gluesenkamp_Perez
+- url: https://en.wikipedia.org/wiki/Marie_Gluesenkamp_Perez
+- url: https://gluesenkampperez.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marie_gluesenkamp_perez/456949
diff --git a/data/us/legislature/Marilyn-Strickland-f0914f67-02b0-5f3c-8f03-949f79c30f62.yml b/data/us/legislature/Marilyn-Strickland-f0914f67-02b0-5f3c-8f03-949f79c30f62.yml
index fb2954dd61..265d6dcc14 100644
--- a/data/us/legislature/Marilyn-Strickland-f0914f67-02b0-5f3c-8f03-949f79c30f62.yml
+++ b/data/us/legislature/Marilyn-Strickland-f0914f67-02b0-5f3c-8f03-949f79c30f62.yml
@@ -2,31 +2,40 @@ id: ocd-person/f0914f67-02b0-5f3c-8f03-949f79c30f62
 name: Marilyn Strickland
 given_name: Marilyn
 family_name: Strickland
-gender: F
 birth_date: 1962-09-25
+gender: Female
+email: https://strickland.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001159.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-10
 offices:
 - classification: capitol
-  address: 1708 Longworth House Office Building Washington DC 20515-4710
+  address: 1708 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-9740
+- classification: district
+  address: 6000 Main St. SW Suite 3B, Lakewood, WA 98499
+- classification: district
+  address: Lacey City Hall, 3rd Floor 420 College St. SE, Suite 3000, Lacey, WA 98503
+  voice: 360-459-8514
+  fax: 360-459-8581
 links:
 - url: https://strickland.house.gov
   note: website
+- url: https://strickland.house.gov/
+other_names:
+- name: M. Strickland
+- name: Strickland, M.
 ids:
   twitter: RepStricklandWA
 other_identifiers:
@@ -46,3 +55,11 @@ other_identifiers:
   identifier: kg:/m/0bhb38l
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marilyn_Strickland
+- url: https://en.wikipedia.org/wiki/Marilyn_Strickland
+- url: https://justfacts.votesmart.org/candidate/biography/80596/marilyn-strickland
+- url: https://strickland.house.gov
+- url: https://stricklandforwashington.com/meet-marilyn
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marilyn_strickland/456854
+- url: https://www.linkedin.com/in/marilyn-strickland-747902160
diff --git a/data/us/legislature/Mario-Diaz-Balart-7e5729d1-198d-5389-be51-d1e05969729c.yml b/data/us/legislature/Mario-Diaz-Balart-7e5729d1-198d-5389-be51-d1e05969729c.yml
index 2d385809f3..07c931aecf 100644
--- a/data/us/legislature/Mario-Diaz-Balart-7e5729d1-198d-5389-be51-d1e05969729c.yml
+++ b/data/us/legislature/Mario-Diaz-Balart-7e5729d1-198d-5389-be51-d1e05969729c.yml
@@ -2,86 +2,89 @@ id: ocd-person/7e5729d1-198d-5389-be51-d1e05969729c
 name: Mario Diaz-Balart
 given_name: Mario
 family_name: Diaz-Balart
-gender: M
 birth_date: 1961-09-25
+gender: Male
+email: https://mariodiazbalart.house.gov/address_authentication?form=/contact-mario
 image: https://theunitedstates.io/images/congress/450x550/D000600.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-25
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: FL-26
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-21
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-25
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-25
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: FL-21
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-25
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-26
+  district: FL-25
 offices:
 - classification: capitol
-  address: 374 Cannon House Office Building Washington DC 20515-0926
+  address: 374 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4211
+  fax: 202-225-8576
 - classification: district
-  address: 8669 NW. 36th St. Suite 100; Doral, FL 33166
-  voice: 305-470-8555
-  fax: 305-470-8575
-  name: 'District Office #1'
-- classification: district
-  address: 4715 Golden Gate Pkwy. Suite 1; Naples, FL 34116
+  address: 4715 Golden Gate Parkway Suite 1, Naples, FL 34116
   voice: 239-348-1620
   fax: 239-348-3569
-  name: 'District Office #2'
+- classification: district
+  address: 8669 NW 36th St. Suite 100, Doral, FL 33166
+  voice: 305-470-8555
+  fax: 305-470-8575
 links:
 - url: https://mariodiazbalart.house.gov
   note: website
+- url: https://mariodiazbalart.house.gov/
+other_names:
+- name: Diaz-Balart, M.
+- name: M. Diaz-Balart
+- name: M.R. Diaz-Balart
 ids:
   twitter: MarioDB
   youtube: UCpEEd0Plxx5D78pI4a4mFTQ
@@ -117,3 +120,9 @@ other_identifiers:
   identifier: kg:/m/02536z
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mario_Diaz-Balart
+- url: https://en.wikipedia.org/wiki/Mario_Diaz-Balart
+- url: https://justfacts.votesmart.org/candidate/24312/mario-diaz-balart
+- url: https://mariodiazbalart.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mario_diaz_balart/400108
diff --git a/data/us/legislature/Marjorie-Taylor-Greene-8c511e48-a002-5f1c-a4b9-1cd18b7f7a6e.yml b/data/us/legislature/Marjorie-Taylor-Greene-8c511e48-a002-5f1c-a4b9-1cd18b7f7a6e.yml
index 1f9c70f3c0..d15156955d 100644
--- a/data/us/legislature/Marjorie-Taylor-Greene-8c511e48-a002-5f1c-a4b9-1cd18b7f7a6e.yml
+++ b/data/us/legislature/Marjorie-Taylor-Greene-8c511e48-a002-5f1c-a4b9-1cd18b7f7a6e.yml
@@ -1,37 +1,42 @@
 id: ocd-person/8c511e48-a002-5f1c-a4b9-1cd18b7f7a6e
 name: Marjorie Taylor Greene
-given_name: Marjorie
+given_name: Marjorie Taylor
 family_name: Greene
-middle_name: Taylor
-gender: F
 birth_date: 1974-05-27
+gender: Female
+email: https://greene.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000596.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-14
 offices:
 - classification: capitol
-  address: 403 Cannon House Office Building Washington DC 20515-1014
+  address: 403 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5211
+- classification: district
+  address: P.O. Box 829, Rome, GA 30162
+  voice: 706-226-5320
 links:
 - url: https://greene.house.gov
   note: website
-ids:
-  twitter: RepMTG
+- url: https://greene.house.gov/
 other_names:
 - name: Greene (GA)
+- name: Greene, M.
+- name: M. Greene
+- name: M.T. Greene
+ids:
+  twitter: RepMTG
 other_identifiers:
 - scheme: bioguide
   identifier: G000596
@@ -53,3 +58,10 @@ other_identifiers:
   identifier: '189785'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marjorie_Taylor_Greene
+- url: https://en.wikipedia.org/wiki/Marjorie_Taylor_Greene
+- url: https://greene.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/189785/marjorie-greene
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/marjorie_greene/456814
+- url: https://www.mtgforamerica.com/about
diff --git a/data/us/legislature/Mark-Alford-baf62641-318a-58be-bb76-f7c6aeb97684.yml b/data/us/legislature/Mark-Alford-baf62641-318a-58be-bb76-f7c6aeb97684.yml
index dd28e24087..6af5c2f8bc 100644
--- a/data/us/legislature/Mark-Alford-baf62641-318a-58be-bb76-f7c6aeb97684.yml
+++ b/data/us/legislature/Mark-Alford-baf62641-318a-58be-bb76-f7c6aeb97684.yml
@@ -2,27 +2,39 @@ id: ocd-person/baf62641-318a-58be-bb76-f7c6aeb97684
 name: Mark Alford
 given_name: Mark
 family_name: Alford
-middle_name: Allen
-gender: M
 birth_date: 1963-10-04
+gender: Male
+email: https://alford.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/A000379.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-4
 offices:
 - classification: capitol
-  address: 1516 Longworth House Office Building Washington DC 20515-2504
+  address: 1516 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2876
+- classification: district
+  address: 1272 W. Foxwood Drive, Raymore, MO 64083
+  voice: 816-441-6318
+- classification: district
+  address: 2401 Bernadette Drive Suite 117, Columbia, MO 65203
+  voice: 573-540-6600
+- classification: district
+  address: 500 E. Elm St., Lebanon, MO 65536
+  voice: 417-532-5582
 links:
 - url: https://alford.house.gov
   note: website
+- url: https://alford.house.gov/
+other_names:
+- name: Alford, M.
+- name: M. Alford
+- name: M.A. Alford
 other_identifiers:
 - scheme: bioguide
   identifier: A000379
@@ -40,3 +52,10 @@ other_identifiers:
   identifier: '205858'
 sources:
 - url: https://theunitedstates.io/
+- url: https://alford.house.gov
+- url: https://ballotpedia.org/Mark_Alford
+- url: https://en.wikipedia.org/wiki/Mark_Alford_(politician)
+- url: https://justfacts.votesmart.org/candidate/205858/mark-alford
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_alford/456909
+- url: https://www.linkedin.com/in/markalfordmo
diff --git a/data/us/legislature/Mark-DeSaulnier-a1d66d4f-5f94-5605-9e25-96c8f5b4e2df.yml b/data/us/legislature/Mark-DeSaulnier-a1d66d4f-5f94-5605-9e25-96c8f5b4e2df.yml
index c41564d6dc..e1ef1b754e 100644
--- a/data/us/legislature/Mark-DeSaulnier-a1d66d4f-5f94-5605-9e25-96c8f5b4e2df.yml
+++ b/data/us/legislature/Mark-DeSaulnier-a1d66d4f-5f94-5605-9e25-96c8f5b4e2df.yml
@@ -2,56 +2,59 @@ id: ocd-person/a1d66d4f-5f94-5605-9e25-96c8f5b4e2df
 name: Mark DeSaulnier
 given_name: Mark
 family_name: DeSaulnier
-gender: M
 birth_date: 1952-03-31
+gender: Male
+email: https://desaulnier.house.gov/address_authentication?form=/connect/email
 image: https://theunitedstates.io/images/congress/450x550/D000623.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-11
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-10
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-11
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-10
+  district: CA-11
 offices:
 - classification: capitol
-  address: 503 Cannon House Office Building Washington DC 20515-0510
+  address: 503 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2095
+  fax: 202-225-5609
 - classification: district
-  address: 440 Civic Center Plz. 2nd Floor; Richmond, CA 94804
-  voice: 510-620-1000
-  fax: 510-620-1005
-  name: 'District Office #1'
-- classification: district
-  address: 3100 Oak Road Suite 110; Walnut Creek, CA 94597
+  address: 3100 Oak Road Suite 110, Walnut Creek, CA 94597
   voice: 925-933-2660
   fax: 925-933-2677
-  name: 'District Office #2'
+- classification: district
+  address: 4703 Lone Tree Way, Antioch, CA 94531
+  voice: 925-754-0716
+  fax: 925-754-0728
 links:
 - url: https://desaulnier.house.gov
   note: website
+- url: https://desaulnier.house.gov/
+other_names:
+- name: DeSaulnier, M.
+- name: M. DeSaulnier
+- name: M.J. DeSaulnier
 ids:
   twitter: RepDeSaulnier
   facebook: RepMarkDeSaulnier
@@ -84,3 +87,9 @@ other_identifiers:
   identifier: Mark DeSaulnier
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_DeSaulnier
+- url: https://desaulnier.house.gov
+- url: https://en.wikipedia.org/wiki/Mark_DeSaulnier
+- url: https://justfacts.votesmart.org/candidate/biography/69477/mark-desaulnier
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_desaulnier/412613
diff --git a/data/us/legislature/Mark-E-Amodei-e58ac762-d546-52f3-8efd-8a2c8f12f731.yml b/data/us/legislature/Mark-E-Amodei-e58ac762-d546-52f3-8efd-8a2c8f12f731.yml
index 670f5e5399..b3e2b6fc33 100644
--- a/data/us/legislature/Mark-E-Amodei-e58ac762-d546-52f3-8efd-8a2c8f12f731.yml
+++ b/data/us/legislature/Mark-E-Amodei-e58ac762-d546-52f3-8efd-8a2c8f12f731.yml
@@ -1,68 +1,70 @@
 id: ocd-person/e58ac762-d546-52f3-8efd-8a2c8f12f731
-name: Mark E. Amodei
+name: Mark Amodei
 given_name: Mark
 family_name: Amodei
-middle_name: E.
-gender: M
 birth_date: 1958-06-12
+gender: Male
+email: https://amodei.house.gov/address_authentication?form=/email-me
 image: https://theunitedstates.io/images/congress/450x550/A000369.jpg
 party:
-- start_date: '2011-09-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-09-13'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-09-13
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-2
 offices:
 - classification: capitol
-  address: 104 Cannon House Office Building Washington DC 20515-2802
+  address: 104 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6155
+  fax: 202-225-5679
 - classification: district
-  address: 905 Railroad St. Suite 104 D; Elko, NV 89801
-  voice: 775-777-7705
-  fax: 775-753-9984
-  name: 'District Office #1'
-- classification: district
-  address: 5310 Kietzke Ln. Suite 103; Reno, NV 89511
+  address: 5310 Kietzke Lane Suite 103, Reno, NV 89511
   voice: 775-686-5760
   fax: 775-686-5711
-  name: 'District Office #2'
+- classification: district
+  address: Elko, NV
+  voice: 775-777-7705
 links:
 - url: https://amodei.house.gov
   note: website
+- url: https://amodei.house.gov/
+other_names:
+- name: Amodei, M.
+- name: M. Amodei
+- name: M.E. Amodei
+- name: Mark E. Amodei
 ids:
   twitter: MarkAmodeiNV2
   youtube: UCjOGx2iqSn1r3BQxaVgYhYw
@@ -102,3 +104,9 @@ other_identifiers:
   identifier: kg:/m/03bzdkn
 sources:
 - url: https://theunitedstates.io/
+- url: https://amodei.house.gov
+- url: https://ballotpedia.org/Mark_Amodei
+- url: https://en.wikipedia.org/wiki/Mark_Amodei
+- url: https://justfacts.votesmart.org/candidate/biography/12537/mark-amodei
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_amodei/412500
diff --git a/data/us/legislature/Mark-E-Green-92fdf72b-20aa-5d08-83b8-833c4714b0ac.yml b/data/us/legislature/Mark-E-Green-92fdf72b-20aa-5d08-83b8-833c4714b0ac.yml
index 4b2b410786..4fa75fb842 100644
--- a/data/us/legislature/Mark-E-Green-92fdf72b-20aa-5d08-83b8-833c4714b0ac.yml
+++ b/data/us/legislature/Mark-E-Green-92fdf72b-20aa-5d08-83b8-833c4714b0ac.yml
@@ -1,49 +1,54 @@
 id: ocd-person/92fdf72b-20aa-5d08-83b8-833c4714b0ac
-name: Mark E. Green
+name: Mark Green
 given_name: Mark
 family_name: Green
-middle_name: E.
-gender: M
 birth_date: 1964-11-08
+gender: Male
+email: https://markgreen.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/G000590.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
 offices:
 - classification: capitol
-  address: 2446 Rayburn House Office Building Washington DC 20515-4207
+  address: 2446 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2811
 - classification: district
-  address: 128 N 2nd St Suite 104; Clarksville, TN 37040-6458
-  voice: 202-225-2811
-  name: 'District Office #1'
+  address: 128 N. 2nd St., Suite 104, Clarksville, TN 37040
+  voice: 931-266-4483
+- classification: district
+  address: 305 Public Square Suite 212, Franklin, TN 37064
+  voice: 629-223-6050
 - classification: district
-  address: 305 Public Sq Suite 212; Franklin, TN 37064-2580
-  name: 'District Office #2'
+  address: 801 Broadway St. Suite C507, Nashville, TN 37203
+  voice: 629-999-4950
 links:
 - url: https://markgreen.house.gov
   note: website
-ids:
-  twitter: RepMarkGreen
+- url: https://markgreen.house.gov/
 other_names:
 - name: Green (TN)
+- name: Green, M.
+- name: M. Green
+- name: M.E. Green
+- name: Mark E. Green
+ids:
+  twitter: RepMarkGreen
 other_identifiers:
 - scheme: bioguide
   identifier: G000590
@@ -67,3 +72,12 @@ other_identifiers:
   identifier: Mark Green (Tennessee)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_Green_(Tennessee)
+- url: https://en.wikipedia.org/wiki/Mark_E._Green
+- url: https://justfacts.votesmart.org/candidate/139030/mark-green
+- url: https://markgreen.house.gov
+- url: https://markgreen.house.gov/biography
+- url: https://markgreentn.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_green/412819
+- url: https://www.linkedin.com/in/mark-e-green-md-4200578
diff --git a/data/us/legislature/Mark-Kelly-30665d55-5695-5ede-930d-c92e63e4ee65.yml b/data/us/legislature/Mark-Kelly-30665d55-5695-5ede-930d-c92e63e4ee65.yml
index eeadea6197..ee7f778483 100644
--- a/data/us/legislature/Mark-Kelly-30665d55-5695-5ede-930d-c92e63e4ee65.yml
+++ b/data/us/legislature/Mark-Kelly-30665d55-5695-5ede-930d-c92e63e4ee65.yml
@@ -2,38 +2,47 @@ id: ocd-person/30665d55-5695-5ede-930d-c92e63e4ee65
 name: Mark Kelly
 given_name: Mark
 family_name: Kelly
-gender: M
 birth_date: 1964-02-21
+gender: Male
+email: https://www.kelly.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/K000377.jpg
 party:
-- start_date: '2020-12-02'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2020-12-02'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Arizona
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2020-12-02
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Arizona
 offices:
 - classification: capitol
-  address: 516 Hart Senate Office Building Washington DC 20510
+  address: 516 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2235
+- classification: district
+  address: 100 N. Stone Ave. Suite 600, Tucson, AZ 85701
+  voice: 520-475-5177
+- classification: district
+  address: 2201 E. Camelback Road Suite 115, Phoenix, AZ 85016
+  voice: 602-671-7901
 links:
 - url: https://www.kelly.senate.gov
   note: website
 - url: https://www.kelly.senate.gov/contact/contact-form/
   note: contact form
+- url: https://www.kelly.senate.gov/
+other_names:
+- name: Kelly (D-AZ)
+- name: Kelly, M.
+- name: M. Kelly
+- name: M.E. Kelly
 ids:
   twitter: SenMarkKelly
   facebook: SenMarkKelly
-other_names:
-- name: Kelly (D-AZ)
 other_identifiers:
 - scheme: bioguide
   identifier: K000377
@@ -55,3 +64,10 @@ other_identifiers:
   identifier: '190594'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_Kelly
+- url: https://en.wikipedia.org/wiki/Mark_Kelly_%28astronaut%29
+- url: https://justfacts.votesmart.org/candidate/biography/190594/mark-kelly
+- url: https://markkelly.com/bio
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_kelly/456794
+- url: https://www.kelly.senate.gov
diff --git a/data/us/legislature/Mark-Pocan-50093b91-c03b-5dbf-acb8-e5881dd576e4.yml b/data/us/legislature/Mark-Pocan-50093b91-c03b-5dbf-acb8-e5881dd576e4.yml
index 4ae5e1014c..e1b20313c4 100644
--- a/data/us/legislature/Mark-Pocan-50093b91-c03b-5dbf-acb8-e5881dd576e4.yml
+++ b/data/us/legislature/Mark-Pocan-50093b91-c03b-5dbf-acb8-e5881dd576e4.yml
@@ -2,60 +2,59 @@ id: ocd-person/50093b91-c03b-5dbf-acb8-e5881dd576e4
 name: Mark Pocan
 given_name: Mark
 family_name: Pocan
-gender: M
 birth_date: 1964-08-14
+gender: Male
+email: https://pocan.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/P000607.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
 offices:
 - classification: capitol
-  address: 1026 Longworth House Office Building Washington DC 20515-4902
+  address: 1026 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2906
 - classification: district
-  address: 100 State St. 3rd floor; Beloit, WI 53511
-  voice: 608-365-8001
-  name: 'District Office #1'
-- classification: district
-  address: 10 E. Doty St. Suite 405; Madison, WI 53703
+  address: 10 E. Doty St. Suite 405, Madison, WI 53703
   voice: 608-258-9800
   fax: 608-258-0377
-  name: 'District Office #2'
 links:
 - url: https://pocan.house.gov
   note: website
+- url: https://pocan.house.gov/
+other_names:
+- name: M. Pocan
+- name: M.W. Pocan
+- name: Pocan, M.
 ids:
   twitter: RepMarkPocan
   youtube: UCz5b47WER_u3dUGV_Zi70dQ
@@ -89,3 +88,10 @@ other_identifiers:
   identifier: kg:/m/0gyhpz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_Pocan
+- url: https://en.wikipedia.org/wiki/Mark_Pocan
+- url: https://justfacts.votesmart.org/candidate/26238/mark-pocan
+- url: https://pocan.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_pocan/412585
+- url: https://www.linkedin.com/in/markpocan
diff --git a/data/us/legislature/Mark-R-Warner-0149412b-3e52-5743-bf11-a11ef4a98856.yml b/data/us/legislature/Mark-R-Warner-0149412b-3e52-5743-bf11-a11ef4a98856.yml
index 57c95c8ed2..4900a22581 100644
--- a/data/us/legislature/Mark-R-Warner-0149412b-3e52-5743-bf11-a11ef4a98856.yml
+++ b/data/us/legislature/Mark-R-Warner-0149412b-3e52-5743-bf11-a11ef4a98856.yml
@@ -1,66 +1,64 @@
 id: ocd-person/0149412b-3e52-5743-bf11-a11ef4a98856
-name: Mark R. Warner
+name: Mark Warner
 given_name: Mark
 family_name: Warner
-middle_name: R.
-gender: M
 birth_date: 1954-12-15
+gender: Male
+email: https://www.warner.senate.gov/public/index.cfm?p=contact
 image: https://theunitedstates.io/images/congress/450x550/W000805.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Virginia
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Virginia
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Virginia
 offices:
 - classification: capitol
-  address: 703 Hart Senate Office Building Washington DC 20510
+  address: 703 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2023
+- classification: capitol
+  address: 919 E. Main St. Suite 630, Richmond, VA 23219
+  voice: 804-775-2314
 - classification: district
-  address: 180 W. Main St. Room 235; Abingdon, VA 24210
-  voice: 276-628-8158
-  name: 'District Office #1'
-- classification: district
-  address: 101 W. Main St. Suite 7771; Norfolk, VA 23510
+  address: 101 W. Main St. Suite 7771, Norfolk, VA 23510
   voice: 757-441-3079
-  name: 'District Office #2'
-- classification: district
-  address: 919 E. Main St. Suite 630; Richmond, VA 23219
-  voice: 804-775-2314
-  name: 'District Office #3'
 - classification: district
-  address: 110 Kirk Ave. SW; Roanoke, VA 24011
+  address: 120 Luck Ave. SW Suite 108, Roanoke, VA 24011
   voice: 540-857-2676
-  name: 'District Office #4'
 - classification: district
-  address: 8000 Towers Crescent Dr. Suite 200; Vienna, VA 22182
+  address: 180 W. Main St. Suite 235, Abingdon, VA 24210
+  voice: 276-628-8158
+- classification: district
+  address: 8150 Leesburg Pike Suite 700, Vienna, VA 22182
   voice: 703-442-0670
-  name: 'District Office #5'
 links:
 - url: https://www.warner.senate.gov
   note: website
 - url: https://www.warner.senate.gov/public/index.cfm?p=Contact
   note: contact form
+- url: https://www.warner.senate.gov/public/
+other_names:
+- name: M. Warner
+- name: M.R. Warner
+- name: Mark R. Warner
+- name: Warner (D-VA)
+- name: Warner, M.
 ids:
   twitter: MarkWarner
   youtube: UCwyivNlEGf4sGd1oDLfY5jw
   facebook: MarkRWarner
-other_names:
-- name: Warner (D-VA)
 other_identifiers:
 - scheme: bioguide
   identifier: W000805
@@ -94,3 +92,10 @@ other_identifiers:
   identifier: kg:/m/024mm1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_Warner
+- url: https://en.wikipedia.org/wiki/Mark_Warner
+- url: https://justfacts.votesmart.org/candidate/535/mark-warner
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_warner/412321
+- url: https://www.linkedin.com/in/markrwarner
+- url: https://www.warner.senate.gov/public
diff --git a/data/us/legislature/Mark-Takano-d01bffb6-a515-5ca5-8203-3a9b8d5da15e.yml b/data/us/legislature/Mark-Takano-d01bffb6-a515-5ca5-8203-3a9b8d5da15e.yml
index ef8a633f40..79e4931848 100644
--- a/data/us/legislature/Mark-Takano-d01bffb6-a515-5ca5-8203-3a9b8d5da15e.yml
+++ b/data/us/legislature/Mark-Takano-d01bffb6-a515-5ca5-8203-3a9b8d5da15e.yml
@@ -2,56 +2,60 @@ id: ocd-person/d01bffb6-a515-5ca5-8203-3a9b8d5da15e
 name: Mark Takano
 given_name: Mark
 family_name: Takano
-gender: M
 birth_date: 1960-12-10
+gender: Male
+email: https://takano.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/T000472.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-41
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-39
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-41
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-41
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-41
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-41
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
+  district: CA-41
 offices:
 - classification: capitol
-  address: 2078 Rayburn House Office Building Washington DC 20515-0539
+  address: 2078 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2305
+  fax: 202-225-7018
 - classification: district
-  address: 3403 10th St. Suite 610; Riverside, CA 92501
+  address: 3403 10th St. Suite 610, Riverside, CA 92501
   voice: 951-222-0203
   fax: 951-222-0217
-  name: 'District Office #1'
 links:
 - url: https://takano.house.gov
   note: website
+- url: https://takano.house.gov/
+other_names:
+- name: M. Takano
+- name: M.A. Takano
+- name: Takano, M.
 ids:
   twitter: RepMarkTakano
   youtube: UCJg4F1irmSFeKoXZBaZbX2w
@@ -85,3 +89,11 @@ other_identifiers:
   identifier: kg:/m/0k3lj_y
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mark_Takano
+- url: https://en.wikipedia.org/wiki/Mark_Takano
+- url: https://justfacts.votesmart.org/candidate/biography/22337/mark-takano
+- url: https://marktakano.squarespace.com/about
+- url: https://takano.house.gov
+- url: https://takano.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mark_takano/412520
diff --git a/data/us/legislature/Markwayne-Mullin-c1fcdb86-e58e-59ed-94f2-40e481824423.yml b/data/us/legislature/Markwayne-Mullin-c1fcdb86-e58e-59ed-94f2-40e481824423.yml
index f4bbbf9916..ddfb085a7d 100644
--- a/data/us/legislature/Markwayne-Mullin-c1fcdb86-e58e-59ed-94f2-40e481824423.yml
+++ b/data/us/legislature/Markwayne-Mullin-c1fcdb86-e58e-59ed-94f2-40e481824423.yml
@@ -2,74 +2,68 @@ id: ocd-person/c1fcdb86-e58e-59ed-94f2-40e481824423
 name: Markwayne Mullin
 given_name: Markwayne
 family_name: Mullin
-gender: M
 birth_date: 1977-07-26
+gender: Male
+email: https://www.mullin.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001190.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oklahoma
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-2
-- start_date: '2023-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oklahoma
 offices:
 - classification: capitol
-  address: 330 Hart Senate Office Building Washington DC 20510
+  address: 330 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-4721
+  fax: 202-225-3038
 - classification: district
-  address: 223 W Patti Page Blvd; Claremore, OK 74017-8046
-  voice: 918-283-6262
-  fax: 918-923-6451
-  name: 'District Office #1'
+  address: 15 W. 6th St. Suite 2100, Tulsa, OK 74119
+  voice: 918-921-8520
 - classification: district
-  address: 1 E. Choctaw Suite 175; McAlester, OK 74501
-  voice: 918-423-5951
-  fax: 918-423-1940
-  name: 'District Office #2'
-- classification: district
-  address: 811 N York St Ste A; Muskogee, OK 74403-3860
-  voice: 918-687-2533
-  fax: 918-686-0128
-  name: 'District Office #3'
+  address: '3817 NW Expressway #780, Oklahoma City, OK 73112'
+  voice: 405-246-0025
 links:
 - url: https://www.mullin.senate.gov
   note: website
 - url: https://www.mullin.senate.gov/contact/
   note: contact form
+- url: https://www.mullin.senate.gov/
+other_names:
+- name: M. Mullin
+- name: Mullin (R-OK)
+- name: Mullin, M.
 ids:
   twitter: SenMullin
   youtube: UCLQlm-cbGbJj9baZC6oFsag
   facebook: RepMullin
-other_names:
-- name: Mullin (R-OK)
 other_identifiers:
 - scheme: govtrack
   identifier: '412568'
@@ -101,3 +95,10 @@ other_identifiers:
   identifier: kg:/m/0lq78pn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Markwayne_Mullin
+- url: https://en.wikipedia.org/wiki/Markwayne_Mullin
+- url: https://justfacts.votesmart.org/candidate/biography/135898/markwayne-mullin
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/markwayne_mullin/412568
+- url: https://www.linkedin.com/in/markwayne-mullin-14808236
+- url: https://www.mullin.senate.gov
diff --git a/data/us/legislature/Marlin-Stutzman-5b40cfbc-cc23-4523-9495-89d3967ba030.yml b/data/us/legislature/Marlin-Stutzman-5b40cfbc-cc23-4523-9495-89d3967ba030.yml
new file mode 100644
index 0000000000..b23f0c9ee9
--- /dev/null
+++ b/data/us/legislature/Marlin-Stutzman-5b40cfbc-cc23-4523-9495-89d3967ba030.yml
@@ -0,0 +1,24 @@
+id: ocd-person/5b40cfbc-cc23-4523-9495-89d3967ba030
+name: Marlin Stutzman
+given_name: Marlin
+family_name: Stutzman
+birth_date: 1976-08-31
+gender: Male
+email: marlin@stutzmangroup.us
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-05
+  end_date: 2030-01-01
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IN-3
+other_names:
+- name: M. Stutzman
+- name: M.A. Stutzman
+- name: Stutzman, M.
+sources:
+- url: https://en.wikipedia.org/wiki/Marlin_Stutzman
+- url: https://www.gomarlin.com/meet-marlin
+- url: https://www.govtrack.us/congress/members/marlin_stutzman/412392
+- url: https://www.linkedin.com/in/marlin-stutzman-b4485a59
diff --git a/data/us/legislature/Marsha-Blackburn-fad2ab8c-d191-5eb8-9bd8-5bbc44a35f0d.yml b/data/us/legislature/Marsha-Blackburn-fad2ab8c-d191-5eb8-9bd8-5bbc44a35f0d.yml
index 4fbf793ef7..d628a898a0 100644
--- a/data/us/legislature/Marsha-Blackburn-fad2ab8c-d191-5eb8-9bd8-5bbc44a35f0d.yml
+++ b/data/us/legislature/Marsha-Blackburn-fad2ab8c-d191-5eb8-9bd8-5bbc44a35f0d.yml
@@ -2,105 +2,102 @@ id: ocd-person/fad2ab8c-d191-5eb8-9bd8-5bbc44a35f0d
 name: Marsha Blackburn
 given_name: Marsha
 family_name: Blackburn
-middle_name: W.
-gender: F
 birth_date: 1952-06-06
+gender: Female
+email: https://www.blackburn.senate.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/B001243.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Tennessee
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-7
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Tennessee
 offices:
 - classification: capitol
-  address: 357 Dirksen Senate Office Building Washington DC 20510
+  address: 357 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-3344
+  fax: 202-228-0566
 - classification: district
-  address: 10 West M. L. King Blvd 6th Floor; Chattanooga, TN 37402
+  address: 10 W. Martin Luther King Blvd. 6th Floor, Chattanooga, TN 37402
   voice: 423-541-2939
   fax: 423-541-2944
-  name: 'District Office #1'
 - classification: district
-  address: 109 S Highland Ave Suite 218; Jackson, TN 38301
-  voice: 731-660-3971
-  fax: 731-660-3978
-  name: 'District Office #2'
+  address: 100 Peabody Place Suite 1125, Memphis, TN 38103
+  voice: 901-527-9199
+  fax: 901-527-9515
 - classification: district
-  address: 1105 E Jackson Blvd Suite 4; Jonesborough, TN 37659-4997
+  address: 207 Mocking Bird Lane Suite 502, Johnson City, TN 37604
   voice: 423-753-4009
   fax: 423-788-0250
-  name: 'District Office #3'
 - classification: district
-  address: 800 Market St Suite 121; Knoxville, TN 37902-2327
+  address: 3322 W. End Ave. Suite 610, Nashville, TN 37203
+  voice: 629-800-6600
+  fax: 615-298-2148
+- classification: district
+  address: 800 Market St. Suite 121, Knoxville, TN 37902
   voice: 865-540-3781
   fax: 865-540-7952
-  name: 'District Office #4'
 - classification: district
-  address: 100 Peabody Pl Suite 1125; Memphis, TN 38103-3654
-  voice: 901-527-9199
-  fax: 901-527-9515
-  name: 'District Office #5'
-- classification: district
-  address: 3322 West End Avenue Suite 610; Nashville, TN 37203
-  voice: 629-800-6600
-  fax: 615-298-2148
-  name: 'District Office #6'
+  address: 91 Stonebridge Blvd. Suite 103, Jackson, TN 38305
+  voice: 731-660-3971
+  fax: 731-660-3978
 links:
 - url: https://www.blackburn.senate.gov
   note: website
 - url: https://www.blackburn.senate.gov/email-me
   note: contact form
+- url: https://www.blackburn.senate.gov/
+other_names:
+- name: Blackburn (R-TN)
+- name: Blackburn, M.
+- name: M. Blackburn
+- name: M.W. Blackburn
 ids:
   twitter: MarshaBlackburn
   youtube: UCvNnmu5mUm7xr8QXBlbtQ9w
   facebook: marshablackburn
-other_names:
-- name: Blackburn (R-TN)
 other_identifiers:
 - scheme: bioguide
   identifier: B001243
@@ -136,3 +133,10 @@ other_identifiers:
   identifier: S396
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Marsha_Blackburn
+- url: https://en.wikipedia.org/wiki/Marsha_Blackburn
+- url: https://justfacts.votesmart.org/candidate/25186/marsha-blackburn
+- url: https://theunitedstates.io
+- url: https://www.blackburn.senate.gov
+- url: https://www.govtrack.us/congress/members/marsha_blackburn/400032
+- url: https://www.linkedin.com/in/senator-marsha-blackburn
diff --git a/data/us/legislature/Martin-Heinrich-fb46b038-d2a8-5824-bb36-deb07f8d9f54.yml b/data/us/legislature/Martin-Heinrich-fb46b038-d2a8-5824-bb36-deb07f8d9f54.yml
index 6e26395564..9bd92b3eef 100644
--- a/data/us/legislature/Martin-Heinrich-fb46b038-d2a8-5824-bb36-deb07f8d9f54.yml
+++ b/data/us/legislature/Martin-Heinrich-fb46b038-d2a8-5824-bb36-deb07f8d9f54.yml
@@ -2,75 +2,74 @@ id: ocd-person/fb46b038-d2a8-5824-bb36-deb07f8d9f54
 name: Martin Heinrich
 given_name: Martin
 family_name: Heinrich
-gender: M
 birth_date: 1971-10-17
+gender: Male
+email: https://www.heinrich.senate.gov/contact/write-martin
 image: https://theunitedstates.io/images/congress/450x550/H001046.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: NM-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: NM-1
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Mexico
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: New Mexico
+- start_date: 2011-01-05
+  end_date: 2013-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NM-1
+- start_date: 2009-01-06
+  end_date: 2011-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: NM-1
 offices:
 - classification: capitol
-  address: 709 Hart Senate Office Building Washington DC 20510
+  address: 709 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5521
+  fax: 202-228-2841
 - classification: district
-  address: 400 Gold Ave. SW Suite 1080; Albuquerque, NM 87102
-  voice: 505-346-6601
-  fax: 505-346-6780
-  name: 'District Office #1'
+  address: 123 E. Marcy St. Suite 103, Santa Fe, NM 87501
+  voice: 505-988-6647
+  fax: 505-992-8435
 - classification: district
-  address: 7450 E. Main St. Suite A; Farmington, NM 87402
-  voice: 505-325-5030
-  fax: 505-325-6035
-  name: 'District Office #2'
+  address: 200 E. 4th St. Suite 300, Roswell, NM 88201
+  voice: 575-622-7113
+  fax: 575-622-3538
 - classification: district
-  address: 505 S. Main St. Suite 148; Las Cruces, NM 88001
+  address: 201 N. Church St. Suite 305, Las Cruces, NM 88001
   voice: 575-523-6561
   fax: 575-523-6584
-  name: 'District Office #3'
 - classification: district
-  address: 200 E. 4th St. Suite 300; Roswell, NM 88201
-  voice: 575-622-7113
-  fax: 575-622-3538
-  name: 'District Office #4'
+  address: 400 Gold Ave. SW Suite 1080, Albuquerque, NM 87102
+  voice: 505-346-6601
+  fax: 505-346-6780
 - classification: district
-  address: 123 E. Marcy St. Suite 103; Santa Fe, NM 87501
-  voice: 505-988-6647
-  fax: 505-992-8435
-  name: 'District Office #5'
+  address: 7450 E. Main St. Suite A, Farmington, NM 87402
+  voice: 505-325-5030
+  fax: 505-325-6035
 links:
 - url: https://www.heinrich.senate.gov
   note: website
 - url: https://www.heinrich.senate.gov/contact
   note: contact form
+- url: https://www.heinrich.senate.gov/
+other_names:
+- name: Heinrich (D-NM)
+- name: Heinrich, M.
+- name: M. Heinrich
+- name: M.T. Heinrich
+- name: Martin T. Heinrich
 ids:
   twitter: MartinHeinrich
   youtube: UCBxh8IK5sMxY0Ln_0G2NYcg
   facebook: MartinHeinrich
-other_names:
-- name: Martin T. Heinrich
-- name: Heinrich (D-NM)
 other_identifiers:
 - scheme: bioguide
   identifier: H001046
@@ -106,3 +105,9 @@ other_identifiers:
   identifier: kg:/m/02qkv0r
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Martin_Heinrich
+- url: https://en.wikipedia.org/wiki/Martin_Heinrich
+- url: https://justfacts.votesmart.org/candidate/74517/martin-heinrich
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/martin_heinrich/412281
+- url: https://www.heinrich.senate.gov
diff --git a/data/us/legislature/Mary-E-Miller-b98a30a0-ae7f-5910-9883-3132a7164446.yml b/data/us/legislature/Mary-E-Miller-b98a30a0-ae7f-5910-9883-3132a7164446.yml
index a41dc05add..14cfdd3ade 100644
--- a/data/us/legislature/Mary-E-Miller-b98a30a0-ae7f-5910-9883-3132a7164446.yml
+++ b/data/us/legislature/Mary-E-Miller-b98a30a0-ae7f-5910-9883-3132a7164446.yml
@@ -1,37 +1,47 @@
 id: ocd-person/b98a30a0-ae7f-5910-9883-3132a7164446
-name: Mary E. Miller
+name: Mary Miller
 given_name: Mary
 family_name: Miller
-middle_name: E.
-gender: F
 birth_date: 1959-08-27
+gender: Female
+email: https://marymiller.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001211.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-15
 offices:
 - classification: capitol
-  address: 1740 Longworth House Office Building Washington DC 20515-1315
+  address: 1740 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5271
+  fax: 202-225-5880
+- classification: district
+  address: 3236 Broadway St. Suite 200, Quincy, IL 62301
+  voice: 217-640-6210
+- classification: district
+  address: 604 E. Main St. Suite G, Mahomet, IL 61853
+  voice: 217-703-6100
 links:
 - url: https://marymiller.house.gov
   note: website
-ids:
-  twitter: RepMaryMiller
+- url: https://marymiller.house.gov/
 other_names:
+- name: M. Miller
+- name: M.E. Miller
+- name: Mary E. Miller
 - name: Miller (IL)
+- name: Miller, M.
+ids:
+  twitter: RepMaryMiller
 other_identifiers:
 - scheme: bioguide
   identifier: M001211
@@ -49,3 +59,9 @@ other_identifiers:
   identifier: kg:/g/11fsd5mh_l
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mary_Miller_(Illinois)
+- url: https://en.wikipedia.org/wiki/Mary_Miller_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/187988/mary-miller
+- url: https://marymiller.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mary_miller/456820
diff --git a/data/us/legislature/Mary-Gay-Scanlon-4dc45e4a-78e1-545f-94c1-10c1d9a12f15.yml b/data/us/legislature/Mary-Gay-Scanlon-4dc45e4a-78e1-545f-94c1-10c1d9a12f15.yml
index bf40eba2b1..d7a0056bfd 100644
--- a/data/us/legislature/Mary-Gay-Scanlon-4dc45e4a-78e1-545f-94c1-10c1d9a12f15.yml
+++ b/data/us/legislature/Mary-Gay-Scanlon-4dc45e4a-78e1-545f-94c1-10c1d9a12f15.yml
@@ -1,47 +1,49 @@
 id: ocd-person/4dc45e4a-78e1-545f-94c1-10c1d9a12f15
 name: Mary Gay Scanlon
-given_name: Mary
+given_name: Mary Gay
 family_name: Scanlon
-middle_name: Gay
-gender: F
 birth_date: 1959-08-30
+gender: Female
+email: https://scanlon.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/S001205.jpg
 party:
-- start_date: '2018-11-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2018-11-13'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-5
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-11-13
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-5
+  district: PA-7
 offices:
 - classification: capitol
-  address: 1227 Longworth House Office Building Washington DC 20515-3805
+  address: 1227 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2011
 - classification: district
-  address: 927 E Baltimore Ave; East Lansdowne, PA 19050-2749
-  voice: 610-626-1913
-  name: 'District Office #1'
+  address: 2501 Seaport Drive BH230, Chester, PA 19013
+  voice: 610-626-2020
 links:
 - url: https://scanlon.house.gov
   note: website
+- url: https://scanlon.house.gov/
+other_names:
+- name: M. Scanlon
+- name: M.G. Scanlon
+- name: Scanlon, M.
 ids:
   twitter: RepMGS
 other_identifiers:
@@ -67,3 +69,10 @@ other_identifiers:
   identifier: kg:/g/11gtg87gkn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mary_Gay_Scanlon
+- url: https://en.wikipedia.org/wiki/Mary_Gay_Scanlon
+- url: https://justfacts.votesmart.org/candidate/178890/mary-scanlon
+- url: https://scanlon.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mary_scanlon/412750
+- url: https://www.linkedin.com/in/mary-gay-scanlon-a9ab0810
diff --git a/data/us/legislature/Mary-Sattler-Peltola-be59b2eb-82fa-5b34-af53-30a9aa8b1123.yml b/data/us/legislature/Mary-Sattler-Peltola-be59b2eb-82fa-5b34-af53-30a9aa8b1123.yml
index 0148ef21f2..b9f4b6841b 100644
--- a/data/us/legislature/Mary-Sattler-Peltola-be59b2eb-82fa-5b34-af53-30a9aa8b1123.yml
+++ b/data/us/legislature/Mary-Sattler-Peltola-be59b2eb-82fa-5b34-af53-30a9aa8b1123.yml
@@ -1,33 +1,40 @@
 id: ocd-person/be59b2eb-82fa-5b34-af53-30a9aa8b1123
-name: Mary Sattler Peltola
+name: Mary Peltola
 given_name: Mary
 family_name: Peltola
-middle_name: Sattler
-gender: F
 birth_date: 1973-08-31
+gender: Female
+email: https://peltola.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/P000619.jpg
 party:
-- start_date: '2022-09-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2022-09-13'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AK-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2022-09-13
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AK-AL
 offices:
 - classification: capitol
-  address: 153 Cannon House Office Building Washington DC 20515-0200
+  address: 153 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5765
+  fax: 202-225-0425
+- classification: district
+  address: 121 W. Fireweed Lane Suite 260 907-921-6575, Anchorage, AK 99503
 links:
 - url: https://peltola.house.gov
   note: website
+- url: https://peltola.house.gov/
+other_names:
+- name: M. Peltola
+- name: M.S. Peltola
+- name: Mary Sattler Peltola
+- name: Peltola, M.
 other_identifiers:
 - scheme: bioguide
   identifier: P000619
@@ -47,3 +54,11 @@ other_identifiers:
   identifier: '207620'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mary_Peltola
+- url: https://en.wikipedia.org/wiki/Mary_Peltola
+- url: https://peltola.house.gov
+- url: https://peltola.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mary_peltola/456870
+- url: https://www.linkedin.com/in/mary-sattler-95b98a95
+- url: https://www.linkedin.com/in/mary-sattler-peltola-602b2473
diff --git a/data/us/legislature/Matt-Cartwright-1f22bb4c-3315-53ae-848a-e30bb8fec18e.yml b/data/us/legislature/Matt-Cartwright-1f22bb4c-3315-53ae-848a-e30bb8fec18e.yml
index 5b49d81528..170931026c 100644
--- a/data/us/legislature/Matt-Cartwright-1f22bb4c-3315-53ae-848a-e30bb8fec18e.yml
+++ b/data/us/legislature/Matt-Cartwright-1f22bb4c-3315-53ae-848a-e30bb8fec18e.yml
@@ -1,62 +1,73 @@
 id: ocd-person/1f22bb4c-3315-53ae-848a-e30bb8fec18e
 name: Matt Cartwright
-given_name: Matthew
+given_name: Matt
 family_name: Cartwright
-middle_name: A.
-gender: M
 birth_date: 1961-05-01
+gender: Male
+email: https://cartwright.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001090.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-17
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: PA-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-17
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: PA-8
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-17
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-8
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: PA-17
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-17
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-8
+  district: PA-17
 offices:
 - classification: capitol
-  address: 2102 Rayburn House Office Building Washington DC 20515-3808
+  address: 2102 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5546
+  fax: 202-226-0996
 - classification: district
-  address: 226 Wyoming Ave.; Scranton, PA 18503
+  address: 1 S. Church St., Suite 100, Hazleton, PA 18201
+  voice: 570-751-0050
+- classification: district
+  address: 20 N. Pennsylvania Ave. Suite 213, Wilkes Barre, PA 18711
+  voice: 570-371-0317
+- classification: district
+  address: 226 Wyoming Ave., Scranton, PA 18503
   voice: 570-341-1050
   fax: 570-341-1055
-  name: 'District Office #1'
 - classification: district
-  address: 20 N. Pennsylvania Ave. Suite 201; Wilkes-Barre, PA 18711
-  voice: 570-371-0317
-  name: 'District Office #2'
+  address: 2959 Route 611 Suite 105, Tannersville, PA 18372
+  voice: 570-355-1818
+- classification: district
+  address: 8 Silk Mill Drive Suite 213, Hawley, PA 18428
+  voice: 570-576-8005
 links:
 - url: https://cartwright.house.gov
   note: website
+- url: https://cartwright.house.gov/
+other_names:
+- name: Cartwright, M.
+- name: M. Cartwright
+- name: M.A. Cartwright
 ids:
   twitter: RepCartwright
   youtube: UCnAOvexSGLBnYidaFzguhTQ
@@ -90,3 +101,10 @@ other_identifiers:
   identifier: kg:/m/0j_6b9d
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Matt_Cartwright
+- url: https://cartwright.house.gov
+- url: https://en.wikipedia.org/wiki/Matt_Cartwright
+- url: https://justfacts.votesmart.org/candidate/biography/136236/matt-cartwright
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/matthew_cartwright/412571
+- url: https://www.linkedin.com/in/matt-cartwright-03476912
diff --git a/data/us/legislature/Matt-Gaetz-89e031c0-3988-5b08-b7a3-7d4e63eb0579.yml b/data/us/legislature/Matt-Gaetz-89e031c0-3988-5b08-b7a3-7d4e63eb0579.yml
index 86dadacbac..1cef6aa8d0 100644
--- a/data/us/legislature/Matt-Gaetz-89e031c0-3988-5b08-b7a3-7d4e63eb0579.yml
+++ b/data/us/legislature/Matt-Gaetz-89e031c0-3988-5b08-b7a3-7d4e63eb0579.yml
@@ -2,49 +2,48 @@ id: ocd-person/89e031c0-3988-5b08-b7a3-7d4e63eb0579
 name: Matt Gaetz
 given_name: Matt
 family_name: Gaetz
-gender: M
 birth_date: 1982-05-07
+gender: Male
+email: https://gaetz.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000578.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-1
 offices:
 - classification: capitol
-  address: 2021 Rayburn House Office Building Washington DC 20515-0901
+  address: 2021 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4136
 - classification: district
-  address: 1170 Martin Luther King, Jr. Blvd. Room 454; Fort Walton Beach, FL 32547
+  address: 805 E. James Lee Blvd., Crestview, FL 32539
   voice: 850-479-1183
-  name: 'District Office #1'
-- classification: district
-  address: 226 S Palafox Place 6th Floor; Pensacola, FL 32502
-  voice: 850-479-1183
-  name: 'District Office #2'
 links:
 - url: https://gaetz.house.gov
   note: website
+- url: https://gaetz.house.gov/
+other_names:
+- name: Gaetz, M.
+- name: M. Gaetz
+- name: M.L. Gaetz
 ids:
   twitter: RepMattGaetz
   youtube: UClqXcJew_A3s8qiX-T4a9CA
@@ -76,3 +75,11 @@ other_identifiers:
   identifier: Matt Gaetz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Matt_Gaetz
+- url: https://en.wikipedia.org/wiki/Matt_Gaetz
+- url: https://gaetz.house.gov
+- url: https://gaetz.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/matt_gaetz/412690
+- url: https://www.linkedin.com/in/mattgaetz
+- url: https://www.mattgaetz.com/meet-matt
diff --git a/data/us/legislature/Matthew-M-Rosendale-Sr-5b030c5d-0d50-5452-b2f8-95f8659056fb.yml b/data/us/legislature/Matthew-M-Rosendale-Sr-5b030c5d-0d50-5452-b2f8-95f8659056fb.yml
index fe7c2576fc..88a357b94a 100644
--- a/data/us/legislature/Matthew-M-Rosendale-Sr-5b030c5d-0d50-5452-b2f8-95f8659056fb.yml
+++ b/data/us/legislature/Matthew-M-Rosendale-Sr-5b030c5d-0d50-5452-b2f8-95f8659056fb.yml
@@ -1,28 +1,41 @@
 id: ocd-person/5b030c5d-0d50-5452-b2f8-95f8659056fb
-name: Matthew M. Rosendale, Sr.
-given_name: Matthew
+name: Matt Rosendale
+given_name: Matt
 family_name: Rosendale
-middle_name: Martin
-gender: M
 birth_date: 1960-07-07
+gender: Male
+email: https://rosendale.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/R000103.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MT-2
 offices:
 - classification: capitol
-  address: 1023 Longworth House Office Building Washington DC 20515-0001
+  address: 1023 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3211
+- classification: district
+  address: 3300 2nd Ave. North Suites 7-8, Billings, MT 59101
+  voice: 406-413-6720
+- classification: district
+  address: 410 Central Ave. Suite 407, Great Falls, MT 59404
+  voice: 406-770-6260
+- classification: district
+  address: 7 W. 6th Ave. Suite 3B, Helena, MT 59601
+  voice: 406-502-1435
 links:
 - url: https://rosendale.house.gov
   note: website
+- url: https://rosendale.house.gov/
+other_names:
+- name: M. Rosendale
+- name: M.M. Rosendale
+- name: Matthew M. Rosendale, Sr.
+- name: Rosendale, M.
 ids:
   twitter: RepRosendale
 other_identifiers:
@@ -46,3 +59,11 @@ other_identifiers:
   identifier: Matthew Rosendale
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Matt_Rosendale
+- url: https://en.wikipedia.org/wiki/Matt_Rosendale
+- url: https://justfacts.votesmart.org/candidate/biography/120815/matt-rosendale
+- url: https://mattformontana.com/meet-matt
+- url: https://rosendale.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/matthew_rosendale/456830
+- url: https://www.linkedin.com/in/matthew-rosendale-487bb871
diff --git a/data/us/legislature/Max-L-Miller-a26ef77d-1f50-5c77-918d-83f917ac83fb.yml b/data/us/legislature/Max-L-Miller-a26ef77d-1f50-5c77-918d-83f917ac83fb.yml
index b25f1802ab..cdd298201a 100644
--- a/data/us/legislature/Max-L-Miller-a26ef77d-1f50-5c77-918d-83f917ac83fb.yml
+++ b/data/us/legislature/Max-L-Miller-a26ef77d-1f50-5c77-918d-83f917ac83fb.yml
@@ -1,30 +1,39 @@
 id: ocd-person/a26ef77d-1f50-5c77-918d-83f917ac83fb
-name: Max L. Miller
+name: Max Miller
 given_name: Max
 family_name: Miller
-middle_name: Leonard
-gender: M
 birth_date: 1988-11-13
+gender: Male
+email: https://maxmiller.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M001222.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-7
 offices:
 - classification: capitol
-  address: 143 Cannon House Office Building Washington DC 20515-3507
+  address: 143 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3876
+- classification: district
+  address: 72 Public Square, Medina, OH 44256
+  voice: 330-661-6654
+- classification: district
+  address: 7335 Ridge Road, Parma, OH 44129
+  voice: 440-692-6120
 links:
 - url: https://maxmiller.house.gov
   note: website
+- url: https://maxmiller.house.gov/
 other_names:
+- name: M. Miller
+- name: M.L. Miller
+- name: Max L. Miller
 - name: Miller (OH)
+- name: Miller, M.
 other_identifiers:
 - scheme: bioguide
   identifier: M001222
@@ -42,3 +51,9 @@ other_identifiers:
   identifier: '206947'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Max_Miller
+- url: https://en.wikipedia.org/wiki/Max_Miller_(Ohio_politician)
+- url: https://justfacts.votesmart.org/candidate/206947/max-miller
+- url: https://maxmiller.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/max_miller/456929
diff --git a/data/us/legislature/Maxine-Waters-fc7a4a9e-9274-546f-ae5c-bcf46f3fe0f2.yml b/data/us/legislature/Maxine-Waters-fc7a4a9e-9274-546f-ae5c-bcf46f3fe0f2.yml
index 7117bad14e..5e2d9a1b50 100644
--- a/data/us/legislature/Maxine-Waters-fc7a4a9e-9274-546f-ae5c-bcf46f3fe0f2.yml
+++ b/data/us/legislature/Maxine-Waters-fc7a4a9e-9274-546f-ae5c-bcf46f3fe0f2.yml
@@ -2,111 +2,115 @@ id: ocd-person/fc7a4a9e-9274-546f-ae5c-bcf46f3fe0f2
 name: Maxine Waters
 given_name: Maxine
 family_name: Waters
-gender: F
 birth_date: 1938-08-15
+gender: Female
+email: https://waters.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/W000187.jpg
 party:
-- start_date: '1991-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-29
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+  district: CA-43
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-35
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: CA-43
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-35
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: CA-43
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-35
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-43
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-35
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-43
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-35
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-43
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-35
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-35
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-35
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-35
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-35
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-43
+  district: CA-29
 offices:
 - classification: capitol
-  address: 2221 Rayburn House Office Building Washington DC 20515-0543
+  address: 2221 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2201
+  fax: 202-225-7854
 - classification: district
-  address: 10124 South Broadway Suite 1; Los Angeles, CA 90003
+  address: 13605 Hawthorne Blvd., Hawthorne, CA 90250
   voice: 323-757-8900
   fax: 323-757-9506
-  name: 'District Office #1'
 links:
 - url: https://waters.house.gov
   note: website
+- url: https://waters.house.gov/
+other_names:
+- name: M. Waters
+- name: M.M.C. Waters
+- name: Waters, M.
 ids:
   twitter: RepMaxineWaters
   youtube: UCOQ2js1VYFlo74n7Ns8WsLQ
@@ -142,3 +146,9 @@ other_identifiers:
   identifier: kg:/m/024tyk
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Maxine_Waters
+- url: https://en.wikipedia.org/wiki/Maxine_Waters
+- url: https://justfacts.votesmart.org/candidate/26759/maxine-waters
+- url: https://theunitedstates.io
+- url: https://waters.house.gov
+- url: https://www.govtrack.us/congress/members/maxine_waters/400422
diff --git a/data/us/legislature/Maxwell-Frost-f0bef4bc-bb68-55ca-afb8-9104567b2f17.yml b/data/us/legislature/Maxwell-Frost-f0bef4bc-bb68-55ca-afb8-9104567b2f17.yml
index d4703ac6ae..7b22c2a9ce 100644
--- a/data/us/legislature/Maxwell-Frost-f0bef4bc-bb68-55ca-afb8-9104567b2f17.yml
+++ b/data/us/legislature/Maxwell-Frost-f0bef4bc-bb68-55ca-afb8-9104567b2f17.yml
@@ -2,27 +2,33 @@ id: ocd-person/f0bef4bc-bb68-55ca-afb8-9104567b2f17
 name: Maxwell Frost
 given_name: Maxwell
 family_name: Frost
-middle_name: Alejandro
-gender: M
 birth_date: 1997-01-17
+gender: Male
+email: https://frost.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000476.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-10
 offices:
 - classification: capitol
-  address: 1224 Longworth House Office Building Washington DC 20515-0910
+  address: 1224 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2176
+- classification: district
+  address: 617 N. Magnolia Ave. Suite 101, Orlando, FL 32801
+  voice: 321-388-9808
 links:
 - url: https://frost.house.gov
   note: website
+- url: https://frost.house.gov/
+other_names:
+- name: Frost, M.
+- name: M. Frost
+- name: M.A. Frost
 ids:
   twitter: RepMaxwellFrost
 other_identifiers:
@@ -44,3 +50,9 @@ other_identifiers:
   identifier: '209096'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Maxwell_Alejandro_Frost
+- url: https://en.wikipedia.org/wiki/Maxwell_Frost
+- url: https://frost.house.gov
+- url: https://justfacts.votesmart.org/candidate/209096/maxwell-frost
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/maxwellfrost
diff --git a/data/us/legislature/Mazie-K-Hirono-ee89a520-227a-575d-8379-5d36b6e6b2a2.yml b/data/us/legislature/Mazie-K-Hirono-ee89a520-227a-575d-8379-5d36b6e6b2a2.yml
index a633c29450..a1207def27 100644
--- a/data/us/legislature/Mazie-K-Hirono-ee89a520-227a-575d-8379-5d36b6e6b2a2.yml
+++ b/data/us/legislature/Mazie-K-Hirono-ee89a520-227a-575d-8379-5d36b6e6b2a2.yml
@@ -1,61 +1,65 @@
 id: ocd-person/ee89a520-227a-575d-8379-5d36b6e6b2a2
-name: Mazie K. Hirono
+name: Mazie Hirono
 given_name: Mazie
 family_name: Hirono
-middle_name: K.
-gender: F
 birth_date: 1947-11-03
+gender: Female
+email: https://www.hirono.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/H001042.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Hawaii
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Hawaii
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: HI-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: HI-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: HI-2
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Hawaii
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Hawaii
 offices:
 - classification: capitol
-  address: 109 Hart Senate Office Building Washington DC 20510
+  address: 109 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6361
+  fax: 202-224-2126
 - classification: district
-  address: 300 Ala Moana Blvd. Rm. 3-106; Honolulu, HI 96850
+  address: Prince Kuhio Federal Building 300 Ala Moana Blvd., Room 3-106, Honolulu,
+    HI 96850
   voice: 808-522-8970
   fax: 808-545-4683
-  name: 'District Office #1'
 links:
 - url: https://www.hirono.senate.gov
   note: website
 - url: https://www.hirono.senate.gov/contact
   note: contact form
+- url: https://www.hirono.senate.gov/
+other_names:
+- name: Hirono (D-HI)
+- name: Hirono, M.
+- name: M. Hirono
+- name: M.K. Hirono
+- name: Mazie K. Hirono
 ids:
   twitter: MazieHirono
   youtube: UCcoKhxad156flzPYJ8JMFOA
   facebook: senatorhirono
-other_names:
-- name: Hirono (D-HI)
 other_identifiers:
 - scheme: bioguide
   identifier: H001042
@@ -91,3 +95,10 @@ other_identifiers:
   identifier: kg:/m/0357cd
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mazie_Hirono
+- url: https://en.wikipedia.org/wiki/Mazie_Hirono
+- url: https://justfacts.votesmart.org/candidate/1677/mazie-hirono
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mazie_hirono/412200
+- url: https://www.hirono.senate.gov
+- url: https://www.hirono.senate.gov/about
diff --git a/data/us/legislature/Melanie-A-Stansbury-e3c837d0-9b42-53c9-a131-896bb28aa319.yml b/data/us/legislature/Melanie-A-Stansbury-e3c837d0-9b42-53c9-a131-896bb28aa319.yml
index e1f76185e5..baf291d3f0 100644
--- a/data/us/legislature/Melanie-A-Stansbury-e3c837d0-9b42-53c9-a131-896bb28aa319.yml
+++ b/data/us/legislature/Melanie-A-Stansbury-e3c837d0-9b42-53c9-a131-896bb28aa319.yml
@@ -1,33 +1,40 @@
 id: ocd-person/e3c837d0-9b42-53c9-a131-896bb28aa319
-name: Melanie A. Stansbury
+name: Melanie Stansbury
 given_name: Melanie
 family_name: Stansbury
-middle_name: Ann
-gender: F
 birth_date: 1979-01-31
+gender: Female
+email: https://stansbury.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/S001218.jpg
 party:
-- start_date: '2021-06-14'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-06-14'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-06-14
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-1
 offices:
 - classification: capitol
-  address: 1421 Longworth House Office Building Washington DC 20515-3101
+  address: 1421 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6316
+- classification: district
+  address: 6301 Indian School Road NE, Suite 4200, Albuquerque, NM 87110
+  voice: 505-346-6781
 links:
 - url: https://stansbury.house.gov
   note: website
+- url: https://stansbury.house.gov/
+other_names:
+- name: M. Stansbury
+- name: M.A. Stansbury
+- name: Melanie A. Stansbury
+- name: Stansbury, M.
 ids:
   twitter: Rep_Stansbury
 other_identifiers:
@@ -51,3 +58,10 @@ other_identifiers:
   identifier: kg:/g/11f_jwp_yr
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Melanie_Ann_Stansbury
+- url: https://en.wikipedia.org/wiki/Melanie_Stansbury
+- url: https://justfacts.votesmart.org/candidate/biography/180789/melanie-stansbury
+- url: https://stansbury.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/melanie_stansbury/456861
+- url: https://www.linkedin.com/in/melaniestansbury
diff --git a/data/us/legislature/Michael-A-Rulli-91ba3b6a-a4c8-54ab-8964-8498641a6d8f.yml b/data/us/legislature/Michael-A-Rulli-91ba3b6a-a4c8-54ab-8964-8498641a6d8f.yml
index 7fff77a9d1..f40513b9ff 100644
--- a/data/us/legislature/Michael-A-Rulli-91ba3b6a-a4c8-54ab-8964-8498641a6d8f.yml
+++ b/data/us/legislature/Michael-A-Rulli-91ba3b6a-a4c8-54ab-8964-8498641a6d8f.yml
@@ -1,28 +1,40 @@
 id: ocd-person/91ba3b6a-a4c8-54ab-8964-8498641a6d8f
-name: Michael A. Rulli
+name: Michael Rulli
 given_name: Michael
 family_name: Rulli
-middle_name: A.
-gender: M
 birth_date: 1969-03-11
+gender: Male
+email: https://rulli.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/R000619.jpg
 party:
-- start_date: '2024-06-11'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2024-06-11'
-  end_date: '2025-01-03'
+- start_date: 2024-06-11
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-6
 offices:
 - classification: capitol
-  address: 2082 Rayburn House Office Building Washington DC 20515-3506
+  address: 2082 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5705
+  fax: 202-225-5907
+- classification: district
+  address: 246 Front St., Marietta, OH 45750
+  voice: 740-376-0868
+  fax: 740-376-0886
+- classification: district
+  address: 4137 Boardman-Canfield Road Suite 106, Canfield, OH 44406
+  voice: 330-967-7312
 links:
 - url: https://rulli.house.gov
   note: website
+- url: https://rulli.house.gov/
+other_names:
+- name: M. Rulli
+- name: M.A. Rulli
+- name: Michael A. Rulli
+- name: Rulli, M.
 other_identifiers:
 - scheme: bioguide
   identifier: R000619
@@ -36,3 +48,7 @@ other_identifiers:
   identifier: Q63170062
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Rulli
+- url: https://en.wikipedia.org/wiki/Michael_Rulli
+- url: https://rulli.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Michael-C-Burgess-e40d8398-4cca-57bb-a8cc-8376230801d4.yml b/data/us/legislature/Michael-C-Burgess-e40d8398-4cca-57bb-a8cc-8376230801d4.yml
index 80277594d1..5c421e22a8 100644
--- a/data/us/legislature/Michael-C-Burgess-e40d8398-4cca-57bb-a8cc-8376230801d4.yml
+++ b/data/us/legislature/Michael-C-Burgess-e40d8398-4cca-57bb-a8cc-8376230801d4.yml
@@ -1,83 +1,87 @@
 id: ocd-person/e40d8398-4cca-57bb-a8cc-8376230801d4
-name: Michael C. Burgess
+name: Michael Burgess
 given_name: Michael
 family_name: Burgess
-middle_name: C.
-gender: M
 birth_date: 1950-12-23
+gender: Male
+email: https://burgess.house.gov/contact/356345.htm
 image: https://theunitedstates.io/images/congress/450x550/B001248.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2003-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-26
 offices:
 - classification: capitol
-  address: 2161 Rayburn House Office Building Washington DC 20515-4326
+  address: 2161 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-7772
+  fax: 202-225-2919
 - classification: district
-  address: 2000 S. Stemmons Fwy. Suite 200; Lake Dallas, TX 75065
+  address: 2000 S. Stemmons Freeway Suite 200, Lake Dallas, TX 75065
   voice: 940-497-5031
   fax: 940-497-5067
-  name: 'District Office #1'
 links:
 - url: https://burgess.house.gov
   note: website
+- url: https://burgess.house.gov/
+other_names:
+- name: Burgess, M.
+- name: M. Burgess
+- name: M.C. Burgess
+- name: Michael C. Burgess
 ids:
   twitter: MichaelCBurgess
   youtube: UCvvO8lo-Nkc31cEEElqQvQw
@@ -111,3 +115,9 @@ other_identifiers:
   identifier: kg:/m/03tq8_
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Burgess
+- url: https://burgess.house.gov
+- url: https://en.wikipedia.org/wiki/Michael_C._Burgess
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michael_burgess/400052
+- url: https://www.linkedin.com/in/michael-burgess-50166129
diff --git a/data/us/legislature/Michael-Cloud-da5e831e-227c-58a1-bf1a-86782158fb57.yml b/data/us/legislature/Michael-Cloud-da5e831e-227c-58a1-bf1a-86782158fb57.yml
index 5b8ca75200..9886286792 100644
--- a/data/us/legislature/Michael-Cloud-da5e831e-227c-58a1-bf1a-86782158fb57.yml
+++ b/data/us/legislature/Michael-Cloud-da5e831e-227c-58a1-bf1a-86782158fb57.yml
@@ -2,49 +2,51 @@ id: ocd-person/da5e831e-227c-58a1-bf1a-86782158fb57
 name: Michael Cloud
 given_name: Michael
 family_name: Cloud
-gender: M
 birth_date: 1975-05-13
+gender: Male
+email: https://cloud.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001115.jpg
 party:
-- start_date: '2018-07-10'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2018-07-10'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-27
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-27
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-27
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-07-10
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-27
 offices:
 - classification: capitol
-  address: 171 Cannon House Office Building Washington DC 20515-4327
+  address: 171 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-7742
 - classification: district
-  address: 101 N. Shoreline Blvd. Suite 300; Corpus Christi, TX 78401
-  voice: 361-884-2222
-  name: 'District Office #1'
-- classification: district
-  address: 5606 N. Navarro St. Suite 203; Victoria, TX 77904
+  address: 120 S. Main St. Suite 310, Victoria, TX 77901
   voice: 361-894-6446
-  name: 'District Office #2'
+- classification: district
+  address: 555 N. Carancahua St. Tower II, Suite 980, Corpus Christi, TX 78401
+  voice: 361-884-2222
 links:
 - url: https://cloud.house.gov
   note: website
+- url: https://cloud.house.gov/
+other_names:
+- name: Cloud, M.
+- name: M. Cloud
+- name: M.J. Cloud
 ids:
   twitter: RepCloudTX
 other_identifiers:
@@ -72,3 +74,8 @@ other_identifiers:
   identifier: kg:/g/11f6y3n6vk
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Cloud_(Texas)
+- url: https://cloud.house.gov
+- url: https://en.wikipedia.org/wiki/Michael_Cloud
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/michaeljcloud
diff --git a/data/us/legislature/Michael-F-Bennet-16a0a125-6ebe-58b3-810f-df10c0e7df1f.yml b/data/us/legislature/Michael-F-Bennet-16a0a125-6ebe-58b3-810f-df10c0e7df1f.yml
index 79886a2d43..939fb04b63 100644
--- a/data/us/legislature/Michael-F-Bennet-16a0a125-6ebe-58b3-810f-df10c0e7df1f.yml
+++ b/data/us/legislature/Michael-F-Bennet-16a0a125-6ebe-58b3-810f-df10c0e7df1f.yml
@@ -1,83 +1,81 @@
 id: ocd-person/16a0a125-6ebe-58b3-810f-df10c0e7df1f
-name: Michael F. Bennet
+name: Michael Bennet
 given_name: Michael
 family_name: Bennet
-middle_name: F.
-gender: M
 birth_date: 1964-11-28
+gender: Male
+email: https://www.bennet.senate.gov/public/index.cfm/write-to-michael
 image: https://theunitedstates.io/images/congress/450x550/B001267.jpg
 party:
-- start_date: '2009-01-22'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-22'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Colorado
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Colorado
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Colorado
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2009-01-22
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Colorado
 offices:
 - classification: capitol
-  address: 261 Russell Senate Office Building Washington DC 20510
+  address: 261 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5852
+  fax: 202-228-5097
 - classification: district
-  address: 609 Main St. Suite 110; Alamosa, CO 81101
-  voice: 719-587-0096
-  name: 'District Office #1'
+  address: 1200 S. College Ave. Suite 211, Fort Collins, CO 80524
+  voice: 970-224-2200
+  fax: 970-224-2205
+- classification: district
+  address: 129 W. B St., Pueblo, CO 81003
+  voice: 719-542-7550
+- classification: district
+  address: 225 N. 5th St. Suite 511, Grand Junction, CO 81501
+  voice: 970-241-6631
 - classification: district
-  address: 409 N. Tejon St. Suite 107; Colorado Springs, CO 80903
+  address: 409 N. Tejon St. Suite 107, Colorado Springs, CO 80903
   voice: 719-328-1100
   fax: 719-328-1129
-  name: 'District Office #2'
 - classification: district
-  address: 1244 Speer Blvd.; Denver, CO 80204
+  address: 609 Main St. Suite 206, Alamosa, CO 81101
+  voice: 719-587-0096
+- classification: district
+  address: Cesar E. Chavez Memorial Building 1244 Speer Blvd., Denver, CO 80204
   voice: 303-455-7600
-  fax: 303-455-8851
-  name: 'District Office #3'
+  fax: 720-904-7151
 - classification: district
-  address: 835 E. 2nd Ave. Suite 206; Durango, CO 81301
+  address: Smiley Building 1309 E. 3rd Ave., Suite 101, Durango, CO 81301
   voice: 970-259-1710
-  name: 'District Office #4'
-- classification: district
-  address: 1200 S. College Ave. Suite 211; Fort Collins, CO 80524
-  voice: 970-224-2200
-  fax: 970-224-2205
-  name: 'District Office #5'
-- classification: district
-  address: 225 N. 5th St. Suite 511; Grand Junction, CO 81501
-  voice: 970-241-6631
-  name: 'District Office #6'
-- classification: district
-  address: 129 W. B St.; Pueblo, CO 81003
-  voice: 719-542-7550
-  name: 'District Office #7'
+  fax: 970-259-9789
 links:
 - url: https://www.bennet.senate.gov/public
   note: website
 - url: https://www.bennet.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.bennet.senate.gov/public/
+other_names:
+- name: Bennet (D-CO)
+- name: Bennet, M.
+- name: M. Bennet
+- name: M.F. Bennet
+- name: Michael Bennet
+- name: Michael F. Bennet
 ids:
   twitter: SenatorBennet
   youtube: UCXB3cljpMwTyCUyLr2ZVLow
   facebook: senbennetco
-other_names:
-- name: Michael Bennet
-- name: Bennet (D-CO)
 other_identifiers:
 - scheme: bioguide
   identifier: B001267
@@ -109,3 +107,11 @@ other_identifiers:
   identifier: kg:/m/05b60qf
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Bennet
+- url: https://en.wikipedia.org/wiki/Michael_Bennet
+- url: https://justfacts.votesmart.org/candidate/110942/michael-bennet
+- url: https://michaelbennet.com/meet-michael
+- url: https://theunitedstates.io
+- url: https://www.bennet.senate.gov/public
+- url: https://www.bennet.senate.gov/public/index.cfm/about
+- url: https://www.govtrack.us/congress/members/michael_bennet/412330
diff --git a/data/us/legislature/Michael-Guest-6b015607-c3dd-5867-a1bb-733bf84fe091.yml b/data/us/legislature/Michael-Guest-6b015607-c3dd-5867-a1bb-733bf84fe091.yml
index 63f5b8faa0..ac7683efc0 100644
--- a/data/us/legislature/Michael-Guest-6b015607-c3dd-5867-a1bb-733bf84fe091.yml
+++ b/data/us/legislature/Michael-Guest-6b015607-c3dd-5867-a1bb-733bf84fe091.yml
@@ -2,48 +2,53 @@ id: ocd-person/6b015607-c3dd-5867-a1bb-733bf84fe091
 name: Michael Guest
 given_name: Michael
 family_name: Guest
-gender: M
 birth_date: 1970-02-04
+gender: Male
+email: https://guest.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000591.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-3
 offices:
 - classification: capitol
-  address: 450 Cannon House Office Building Washington DC 20515-2403
+  address: 450 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5031
+  fax: 202-225-5797
 - classification: district
-  address: 308B E Government St; Brandon, MS 39042-3262
-  voice: 769-241-6120
-  name: 'District Office #1'
-- classification: district
-  address: 2214 5th St Suite 2170; Meridian, MS 39301-5809
+  address: 200 22nd Ave., Meridian, MS 39301
   voice: 601-693-6681
-  name: 'District Office #2'
 - classification: district
-  address: 600 Russell St Suite 160; Starkville, MS 39759-8505
+  address: 230 S. Whitworth Ave., Brookhaven, MS 39601
+  voice: 601-823-3400
+- classification: district
+  address: 301 E. Main St. Suite 300, Starkville, MS 39759
   voice: 662-324-0007
-  name: 'District Office #3'
+- classification: district
+  address: 308 B E. Government St., Brandon, MS 39042
+  voice: 769-241-6120
 links:
 - url: https://guest.house.gov
   note: website
+- url: https://guest.house.gov/
+other_names:
+- name: Guest, M.
+- name: M. Guest
+- name: M.P. Guest
 ids:
   twitter: RepMichaelGuest
 other_identifiers:
@@ -67,3 +72,11 @@ other_identifiers:
   identifier: Michael Guest
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Guest
+- url: https://en.wikipedia.org/wiki/Michael_Guest_(politician)
+- url: https://guest.house.gov
+- url: https://guest.house.gov/about
+- url: https://justfacts.votesmart.org/candidate/key-votes/179667/michael-guest
+- url: https://michaelguest.ms/about-michael
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michael_guest/412793
diff --git a/data/us/legislature/Michael-K-Simpson-ba023811-213b-5bb1-a0dc-11a9458364f1.yml b/data/us/legislature/Michael-K-Simpson-ba023811-213b-5bb1-a0dc-11a9458364f1.yml
index a59b0033d8..8f3daf87ca 100644
--- a/data/us/legislature/Michael-K-Simpson-ba023811-213b-5bb1-a0dc-11a9458364f1.yml
+++ b/data/us/legislature/Michael-K-Simpson-ba023811-213b-5bb1-a0dc-11a9458364f1.yml
@@ -1,101 +1,103 @@
 id: ocd-person/ba023811-213b-5bb1-a0dc-11a9458364f1
-name: Michael K. Simpson
-given_name: Michael
+name: Mike Simpson
+given_name: Mike
 family_name: Simpson
-middle_name: K.
-gender: M
 birth_date: 1950-09-08
+gender: Male
+email: https://simpson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S001148.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-2
 offices:
 - classification: capitol
-  address: 2084 Rayburn House Office Building Washington DC 20515-1202
+  address: 2084 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5531
+  fax: 202-225-8216
 - classification: district
-  address: 802 W. Bannock Suite 600; Boise, ID 83702
-  voice: 208-334-1953
-  fax: 208-334-9533
-  name: 'District Office #1'
-- classification: district
-  address: 410 Memorial Dr. Suite 203; Idaho Falls, ID 83402
+  address: '1075 S. Utah Ave. West #240, Idaho Falls, ID 83402'
   voice: 208-523-6701
-  name: 'District Office #2'
 - classification: district
-  address: 650 Addison Ave W Suite 1078; Twin Falls, ID 83301-5851
+  address: '630 Addison Ave. West, #1700, Twin Falls, ID 83301'
   voice: 208-734-7219
-  name: 'District Office #3'
+- classification: district
+  address: 802 W. Bannock St. Suite 600, Boise, ID 83702
+  voice: 208-334-1953
+  fax: 208-334-9533
 links:
 - url: https://simpson.house.gov
   note: website
+- url: https://simpson.house.gov/
+other_names:
+- name: M. Simpson
+- name: M.K. Simpson
+- name: Michael K. Simpson
+- name: Simpson, M.
 ids:
   twitter: CongMikeSimpson
   youtube: UCNXe0rJJeULTAP_7oyQNw8g
@@ -131,3 +133,9 @@ other_identifiers:
   identifier: kg:/m/0255tn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Simpson_(Idaho)
+- url: https://en.wikipedia.org/wiki/Mike_Simpson
+- url: https://justfacts.votesmart.org/candidate/2917/mike-simpson
+- url: https://simpson.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michael_simpson/400376
diff --git a/data/us/legislature/Michael-Lawler-029be488-4aad-5a5f-95f1-7ab1aaf27c29.yml b/data/us/legislature/Michael-Lawler-029be488-4aad-5a5f-95f1-7ab1aaf27c29.yml
index 77dc9571bf..e26f045532 100644
--- a/data/us/legislature/Michael-Lawler-029be488-4aad-5a5f-95f1-7ab1aaf27c29.yml
+++ b/data/us/legislature/Michael-Lawler-029be488-4aad-5a5f-95f1-7ab1aaf27c29.yml
@@ -1,28 +1,38 @@
 id: ocd-person/029be488-4aad-5a5f-95f1-7ab1aaf27c29
-name: Michael Lawler
-given_name: Michael
+name: Mike Lawler
+given_name: Mike
 family_name: Lawler
-middle_name: Vincent
-gender: M
 birth_date: 1986-09-09
+gender: Male
+email: https://lawler.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/L000599.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-17
 offices:
 - classification: capitol
-  address: 1013 Longworth House Office Building Washington DC 20515-3217
+  address: 1013 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6506
+- classification: district
+  address: 60 McAlpin Ave., Mahopac, NY 10541
+  voice: 845-743-7130
+- classification: district
+  address: One Blue Hill Plaza Third Floor P.O. Box 1645, Pearl River, NY 10965
+  voice: 845-201-2060
 links:
 - url: https://lawler.house.gov
   note: website
+- url: https://lawler.house.gov/
+other_names:
+- name: Lawler, M.
+- name: M. Lawler
+- name: M.V. Lawler
+- name: Michael Lawler
 ids:
   twitter: RepMikeLawler
 other_identifiers:
@@ -44,3 +54,10 @@ other_identifiers:
   identifier: '192271'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Lawler_(New_York)
+- url: https://en.wikipedia.org/wiki/Michael_Lawler
+- url: https://justfacts.votesmart.org/candidate/biography/192271/mike-lawler
+- url: https://lawler.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michael_lawler/456924
+- url: https://www.linkedin.com/in/mike-lawler-735903103
diff --git a/data/us/legislature/Michael-R-Turner-bac6c65d-846b-5e60-9532-fa216c99ccf6.yml b/data/us/legislature/Michael-R-Turner-bac6c65d-846b-5e60-9532-fa216c99ccf6.yml
index c83e71dad7..f359f4a011 100644
--- a/data/us/legislature/Michael-R-Turner-bac6c65d-846b-5e60-9532-fa216c99ccf6.yml
+++ b/data/us/legislature/Michael-R-Turner-bac6c65d-846b-5e60-9532-fa216c99ccf6.yml
@@ -1,83 +1,87 @@
 id: ocd-person/bac6c65d-846b-5e60-9532-fa216c99ccf6
-name: Michael R. Turner
-given_name: Michael
+name: Mike Turner
+given_name: Mike
 family_name: Turner
-middle_name: R.
-gender: M
 birth_date: 1960-01-11
+gender: Male
+email: https://turner.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/T000463.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: OH-10
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: OH-10
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: OH-10
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: OH-10
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: OH-10
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-10
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: OH-3
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-10
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: OH-3
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: OH-3
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: OH-3
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: OH-10
+  district: OH-3
 offices:
 - classification: capitol
-  address: 2183 Rayburn House Office Building Washington DC 20515-3510
+  address: 2183 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6465
+  fax: 202-225-6754
 - classification: district
-  address: 120 W. 3rd St. Suite 305; Dayton, OH 45402
+  address: 120 W. 3rd St. Suite 305, Dayton, OH 45402
   voice: 937-225-2843
   fax: 937-225-2752
-  name: 'District Office #1'
 links:
 - url: https://turner.house.gov
   note: website
+- url: https://turner.house.gov/
+other_names:
+- name: M. Turner
+- name: M.R. Turner
+- name: Michael R. Turner
+- name: Turner, M.
 ids:
   twitter: RepMikeTurner
   youtube: UC-6Ss-aZ3OPisf9GdVGtN8g
@@ -115,3 +119,9 @@ other_identifiers:
   identifier: kg:/m/03440l
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Turner_(Ohio)
+- url: https://en.wikipedia.org/wiki/Mike_Turner
+- url: https://justfacts.votesmart.org/candidate/45519/mike-turner
+- url: https://theunitedstates.io
+- url: https://turner.house.gov
+- url: https://www.govtrack.us/congress/members/michael_turner/400411
diff --git a/data/us/legislature/Michael-T-McCaul-15d37180-ddd2-5bb6-8dd4-cdd2690eca86.yml b/data/us/legislature/Michael-T-McCaul-15d37180-ddd2-5bb6-8dd4-cdd2690eca86.yml
index db03b3459c..a827f8f7de 100644
--- a/data/us/legislature/Michael-T-McCaul-15d37180-ddd2-5bb6-8dd4-cdd2690eca86.yml
+++ b/data/us/legislature/Michael-T-McCaul-15d37180-ddd2-5bb6-8dd4-cdd2690eca86.yml
@@ -1,92 +1,86 @@
 id: ocd-person/15d37180-ddd2-5bb6-8dd4-cdd2690eca86
-name: Michael T. McCaul
+name: Michael McCaul
 given_name: Michael
 family_name: McCaul
-middle_name: T.
-gender: M
 birth_date: 1962-01-14
+gender: Male
+email: https://mccaul.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001157.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-10
 offices:
 - classification: capitol
-  address: 2300 Rayburn House Office Building Washington DC 20515-4310
+  address: 2300 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2401
+  fax: 202-225-5955
 - classification: district
-  address: 9009 Mountain Ridge Dr. Suite 230; Austin, TX 78759
-  voice: 512-473-2357
+  address: 11614 Farm to Market 2244 Suite 160, Austin, TX 78738
+  voice: 512-770-8929
   fax: 512-473-0514
-  name: 'District Office #1'
 - classification: district
-  address: 2000 S. Market St. Suite 303; Brenham, TX 77833
-  voice: 979-830-8497
-  fax: 979-830-1984
-  name: 'District Office #2'
-- classification: district
-  address: 1773 Westborough Dr. Suite 223; Katy, TX 77449
-  voice: 281-398-1247
-  name: 'District Office #3'
-- classification: district
-  address: 990 Village Sq. Suite B; Tomball, TX 77375
-  voice: 281-255-8372
-  fax: 281-255-0034
-  name: 'District Office #4'
+  address: 175 Century Square Drive Suite 210, College Station, TX 77840
+  voice: 979-431-6480
+  fax: 979-431-5180
 links:
 - url: https://mccaul.house.gov
   note: website
+- url: https://mccaul.house.gov/
+other_names:
+- name: M. McCaul
+- name: M.T. McCaul
+- name: McCaul, M.
+- name: Michael T. McCaul
 ids:
   twitter: RepMcCaul
   youtube: UCRw6sGE0PH7_FCeTT3PQRaA
@@ -122,3 +116,9 @@ other_identifiers:
   identifier: kg:/m/0492cz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_McCaul
+- url: https://en.wikipedia.org/wiki/Michael_mccaul
+- url: https://justfacts.votesmart.org/candidate/biography/49210/michael-mccaul
+- url: https://mccaul.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michael_mccaul/400654
diff --git a/data/us/legislature/Michael-Waltz-f335088b-3b7b-5009-9dd9-f389ffe59cdb.yml b/data/us/legislature/Michael-Waltz-f335088b-3b7b-5009-9dd9-f389ffe59cdb.yml
index 35be7bf02c..1de748260b 100644
--- a/data/us/legislature/Michael-Waltz-f335088b-3b7b-5009-9dd9-f389ffe59cdb.yml
+++ b/data/us/legislature/Michael-Waltz-f335088b-3b7b-5009-9dd9-f389ffe59cdb.yml
@@ -2,51 +2,52 @@ id: ocd-person/f335088b-3b7b-5009-9dd9-f389ffe59cdb
 name: Michael Waltz
 given_name: Michael
 family_name: Waltz
-gender: M
 birth_date: 1974-01-31
+gender: Male
+email: https://waltz.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000823.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-6
 offices:
 - classification: capitol
-  address: 244 Cannon House Office Building Washington DC 20515-0906
+  address: 244 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2706
 - classification: district
-  address: 120 S Florida Ave Suite 324; Deland, FL 32720-5422
+  address: 120 S. Florida Ave. Suite 324, Deland, FL 32720
   voice: 386-279-0707
   fax: 386-279-0874
-  name: 'District Office #1'
 - classification: district
-  address: 31 Lupi Ct Suite 130; Palm Coast, FL 32137-4761
-  voice: 386-302-0442
+  address: 22 S. Beach St., Ormond Beach, FL 32174
+  voice: 386-281-4949
   fax: 386-283-5164
-  name: 'District Office #2'
 - classification: district
-  address: 1000 City Center Cir 2nd Floor; Port Orange, FL 32129-4144
-  voice: 386-238-9711
-  fax: 386-238-9714
-  name: 'District Office #3'
+  address: 31 Lupi Court Suite 130, Palm Coast, FL 32137
+  voice: 386-302-0442
+  fax: 386-283-5164
 links:
 - url: https://waltz.house.gov
   note: website
+- url: https://waltz.house.gov/
+other_names:
+- name: M. Waltz
+- name: M.G.G. Waltz
+- name: Waltz, M.
 ids:
   twitter: RepWaltzPress
 other_identifiers:
@@ -72,3 +73,10 @@ other_identifiers:
   identifier: '182261'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michael_Waltz
+- url: https://en.wikipedia.org/wiki/Michael_Waltz
+- url: https://justfacts.votesmart.org/candidate/biography/182261/mike-waltz
+- url: https://theunitedstates.io
+- url: https://waltz.house.gov
+- url: https://www.govtrack.us/congress/members/michael_waltz/412764
+- url: https://www.linkedin.com/in/michael-waltz-0557964
diff --git a/data/us/legislature/Michelle-Fischbach-66724fb4-e553-59cb-b8ba-314e3bf9f1ea.yml b/data/us/legislature/Michelle-Fischbach-66724fb4-e553-59cb-b8ba-314e3bf9f1ea.yml
index 5d9b6318dc..15950f6e75 100644
--- a/data/us/legislature/Michelle-Fischbach-66724fb4-e553-59cb-b8ba-314e3bf9f1ea.yml
+++ b/data/us/legislature/Michelle-Fischbach-66724fb4-e553-59cb-b8ba-314e3bf9f1ea.yml
@@ -2,32 +2,42 @@ id: ocd-person/66724fb4-e553-59cb-b8ba-314e3bf9f1ea
 name: Michelle Fischbach
 given_name: Michelle
 family_name: Fischbach
-middle_name: Louise Helene
-gender: F
 birth_date: 1965-11-03
+gender: Female
+email: https://fischbach.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000470.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-7
 offices:
 - classification: capitol
-  address: 1004 Longworth House Office Building Washington DC 20515-2307
+  address: 1004 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2165
+  fax: 202-225-1593
+- classification: district
+  address: 2211 1st St. South Suite 190, Willmar, MN 56201
+  voice: 320-403-6100
+- classification: district
+  address: 2513 8th St. South, Moorhead, MN 56560
+  voice: 218-422-2090
 links:
 - url: https://fischbach.house.gov
   note: website
+- url: https://fischbach.house.gov/
+other_names:
+- name: Fischbach, M.
+- name: M. Fischbach
+- name: M.L.H.S.M. Fischbach
 ids:
   twitter: RepFischbach
 other_identifiers:
@@ -49,3 +59,10 @@ other_identifiers:
   identifier: Michelle Fischbach
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michelle_Fischbach
+- url: https://en.wikipedia.org/wiki/Michelle_Fischbach
+- url: https://fischbach.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/3882/michelle-fischbach
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michelle_fischbach/456828
+- url: https://www.linkedin.com/in/michelle-fischbach-a58ab8a
diff --git a/data/us/legislature/Michelle-Steel-b95a5cd3-53ca-5f03-8b14-703add32cf84.yml b/data/us/legislature/Michelle-Steel-b95a5cd3-53ca-5f03-8b14-703add32cf84.yml
index 721646c996..f8b7309ee5 100644
--- a/data/us/legislature/Michelle-Steel-b95a5cd3-53ca-5f03-8b14-703add32cf84.yml
+++ b/data/us/legislature/Michelle-Steel-b95a5cd3-53ca-5f03-8b14-703add32cf84.yml
@@ -2,32 +2,38 @@ id: ocd-person/b95a5cd3-53ca-5f03-8b14-703add32cf84
 name: Michelle Steel
 given_name: Michelle
 family_name: Steel
-middle_name: Eunjoo
-gender: F
 birth_date: 1955-06-21
+gender: Female
+email: https://steel.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001135.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-48
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-45
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-45
+  district: CA-48
 offices:
 - classification: capitol
-  address: 1127 Longworth House Office Building Washington DC 20515-0545
+  address: 1127 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2415
+- classification: district
+  address: 10805 Holder St. Suite 225, Cypress, CA 90630
+  voice: 714-960-6483
 links:
 - url: https://steel.house.gov
   note: website
+- url: https://steel.house.gov/
+other_names:
+- name: M. Steel
+- name: M.E.P. Steel
+- name: Steel, M.
 ids:
   twitter: RepSteel
 other_identifiers:
@@ -47,3 +53,10 @@ other_identifiers:
   identifier: kg:/m/028bz6v
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Michelle_Steel
+- url: https://en.wikipedia.org/wiki/Michelle_Steel
+- url: https://justfacts.votesmart.org/candidate/biography/157194/michelle-steel
+- url: https://steel.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/michelle_steel/456803
+- url: https://www.linkedin.com/in/michelle-steel-05451a13
diff --git a/data/us/legislature/Mike-Bost-f49d7d57-812e-584d-85f7-0c3b547bfca4.yml b/data/us/legislature/Mike-Bost-f49d7d57-812e-584d-85f7-0c3b547bfca4.yml
index 47ab3b87a3..bf86abfd7e 100644
--- a/data/us/legislature/Mike-Bost-f49d7d57-812e-584d-85f7-0c3b547bfca4.yml
+++ b/data/us/legislature/Mike-Bost-f49d7d57-812e-584d-85f7-0c3b547bfca4.yml
@@ -2,68 +2,63 @@ id: ocd-person/f49d7d57-812e-584d-85f7-0c3b547bfca4
 name: Mike Bost
 given_name: Mike
 family_name: Bost
-gender: M
 birth_date: 1960-12-30
+gender: Male
+email: https://bost.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/B001295.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-12
 offices:
 - classification: capitol
-  address: 352 Cannon House Office Building Washington DC 20515-1312
+  address: 352 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5661
+  fax: 618-448-4233
 - classification: district
-  address: 101 E. Third St.; Alton, IL 62002
-  voice: 618-622-0766
-  name: 'District Office #1'
+  address: 101 N. 4th St. Suite 302, Effingham, IL 62401
+  voice: 217-240-3170
+  fax: 618-448-4233
 - classification: district
-  address: 300 E. Main St. Suite 4; Carbondale, IL 62901
+  address: 1109 Chestnut St. Suite 4, Murphysboro, IL 62966
   voice: 618-457-5787
-  fax: 618-457-2990
-  name: 'District Office #2'
+  fax: 618-448-4233
 - classification: district
-  address: 2000 Edison Ave.; Granite City, IL 62040
+  address: 205 E. Harnett St., Mascoutah, IL 62258
   voice: 618-622-0766
-  name: 'District Office #3'
-- classification: district
-  address: 1100 Main St.; Mt. Vernon, IL 62864
-  voice: 618-513-5294
-  name: 'District Office #4'
-- classification: district
-  address: 302 West State St.; O'Fallon, IL 62269
-  voice: 618-622-0766
-  fax: 618-622-0774
-  name: 'District Office #5'
+  fax: 618-448-4233
 links:
 - url: https://bost.house.gov
   note: website
+- url: https://bost.house.gov/
+other_names:
+- name: Bost, M.
+- name: M. Bost
+- name: M.J. Bost
 ids:
   twitter: RepBost
   youtube: UCYA1psY06vSf3QadHuCrmjQ
@@ -97,3 +92,9 @@ other_identifiers:
   identifier: Mike Bost
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Bost
+- url: https://bost.house.gov
+- url: https://en.wikipedia.org/wiki/Mike_Bost
+- url: https://justfacts.votesmart.org/candidate/biography/6302/mike-bost
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_bost/412629
diff --git a/data/us/legislature/Mike-Braun-c3e17251-9796-592a-a8ed-8dea288dadf7.yml b/data/us/legislature/Mike-Braun-c3e17251-9796-592a-a8ed-8dea288dadf7.yml
index b3a7a92018..f816698e5c 100644
--- a/data/us/legislature/Mike-Braun-c3e17251-9796-592a-a8ed-8dea288dadf7.yml
+++ b/data/us/legislature/Mike-Braun-c3e17251-9796-592a-a8ed-8dea288dadf7.yml
@@ -2,49 +2,44 @@ id: ocd-person/c3e17251-9796-592a-a8ed-8dea288dadf7
 name: Mike Braun
 given_name: Mike
 family_name: Braun
-gender: M
 birth_date: 1954-03-24
+gender: Male
+email: https://www.braun.senate.gov/contact/email/
 image: https://theunitedstates.io/images/congress/450x550/B001310.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Indiana
 offices:
 - classification: capitol
-  address: 404 Russell Senate Office Building Washington DC 20510
+  address: 404 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4814
 - classification: district
-  address: 203 E Berry St 702B; Fort Wayne, IN 46802-2724
-  voice: 260-427-2167
-  name: 'District Office #1'
-- classification: district
-  address: 5400 Federal Plz Suite 3200; Hammond, IN 46320-1840
-  voice: 219-937-9650
-  name: 'District Office #2'
-- classification: district
-  address: 115 N Pennsylvania St; Indianapolis, IN 46204-2410
+  address: 115 N. Pennsylvania St. Suite 100, Indianapolis, IN 46204
   voice: 317-822-8240
   fax: 317-822-8353
-  name: 'District Office #3'
 - classification: district
-  address: 205 W Colfax Ave; South Bend, IN 46601-1606
-  voice: 574-288-6302
-  name: 'District Office #4'
+  address: 203 E. Berry St., Suite 702B, Fort Wayne, IN 46802
+- classification: district
+  address: 5400 Federal Plaza, Suite 3200, Hammond, IN 46320
+  voice: 219-937-9650
 links:
 - url: https://www.braun.senate.gov
   note: website
 - url: https://www.braun.senate.gov/contact-mike
   note: contact form
-ids:
-  twitter: SenatorBraun
+- url: https://www.braun.senate.gov/
 other_names:
 - name: Braun (R-IN)
+- name: Braun, M.
+- name: M. Braun
+- name: M.K. Braun
+ids:
+  twitter: SenatorBraun
 other_identifiers:
 - scheme: bioguide
   identifier: B001310
@@ -70,3 +65,9 @@ other_identifiers:
   identifier: '41900'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Braun
+- url: https://en.wikipedia.org/wiki/Mike_Braun
+- url: https://justfacts.votesmart.org/candidate/148564/mike-braun
+- url: https://theunitedstates.io
+- url: https://www.braun.senate.gov
+- url: https://www.govtrack.us/congress/members/mike_braun/412839
diff --git a/data/us/legislature/Mike-Carey-e2402add-94f2-53fa-9f40-69ba590c744f.yml b/data/us/legislature/Mike-Carey-e2402add-94f2-53fa-9f40-69ba590c744f.yml
index a1a57355a4..01e4820840 100644
--- a/data/us/legislature/Mike-Carey-e2402add-94f2-53fa-9f40-69ba590c744f.yml
+++ b/data/us/legislature/Mike-Carey-e2402add-94f2-53fa-9f40-69ba590c744f.yml
@@ -2,31 +2,39 @@ id: ocd-person/e2402add-94f2-53fa-9f40-69ba590c744f
 name: Mike Carey
 given_name: Mike
 family_name: Carey
-gender: M
 birth_date: 1971-03-13
+gender: Male
+email: https://carey.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001126.jpg
 party:
-- start_date: '2021-11-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-11-04'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-11-04
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-15
 offices:
 - classification: capitol
-  address: 1433 Longworth House Office Building Washington DC 20515-3515
+  address: 1433 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2015
+  fax: 202-225-3529
+- classification: district
+  address: 140 E. Town St. Suite 1200, Columbus, OH 43215
+  voice: 614-927-6902
 links:
 - url: https://carey.house.gov
   note: website
+- url: https://carey.house.gov/
+other_names:
+- name: Carey, M.
+- name: M. Carey
+- name: M.T.W. Carey
 ids:
   twitter: RepMikeCarey
 other_identifiers:
@@ -44,3 +52,9 @@ other_identifiers:
   identifier: Q108010312
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Carey_(Ohio)
+- url: https://carey.house.gov
+- url: https://en.wikipedia.org/wiki/Mike_Carey_(politician)
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_carey/456864
+- url: https://www.linkedin.com/in/michaeltwcarey
diff --git a/data/us/legislature/Mike-Collins-0f7a88d1-4e4c-565a-b905-706181d7b561.yml b/data/us/legislature/Mike-Collins-0f7a88d1-4e4c-565a-b905-706181d7b561.yml
index 6a57acef36..cadb9efa39 100644
--- a/data/us/legislature/Mike-Collins-0f7a88d1-4e4c-565a-b905-706181d7b561.yml
+++ b/data/us/legislature/Mike-Collins-0f7a88d1-4e4c-565a-b905-706181d7b561.yml
@@ -2,31 +2,36 @@ id: ocd-person/0f7a88d1-4e4c-565a-b905-706181d7b561
 name: Mike Collins
 given_name: Mike
 family_name: Collins
-middle_name: Allen
-gender: M
 birth_date: 1967-07-02
+gender: Male
+email: https://collins.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001129.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-10
 offices:
 - classification: capitol
-  address: 1223 Longworth House Office Building Washington DC 20515-1010
+  address: 1223 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4101
+- classification: district
+  address: 100 Court St., Monroe, GA 30655
+  voice: 770-207-1776
 links:
 - url: https://collins.house.gov
   note: website
-ids:
-  twitter: RepMikeCollins
+- url: https://collins.house.gov/
 other_names:
 - name: Collins
+- name: Collins, M.
+- name: M. Collins
+- name: M.A. Collins
+ids:
+  twitter: RepMikeCollins
 other_identifiers:
 - scheme: bioguide
   identifier: C001129
@@ -44,3 +49,9 @@ other_identifiers:
   identifier: Q115806750
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Collins_(Georgia)
+- url: https://collins.house.gov
+- url: https://en.wikipedia.org/wiki/Mike_Collins_(politician)
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_collins/456895
+- url: https://www.linkedin.com/in/michael-collins-2b969a1a
diff --git a/data/us/legislature/Mike-Crapo-9243a3a9-4e91-5fc8-9643-ae46455b688b.yml b/data/us/legislature/Mike-Crapo-9243a3a9-4e91-5fc8-9643-ae46455b688b.yml
index bf8a369afa..f5fb48a00f 100644
--- a/data/us/legislature/Mike-Crapo-9243a3a9-4e91-5fc8-9643-ae46455b688b.yml
+++ b/data/us/legislature/Mike-Crapo-9243a3a9-4e91-5fc8-9643-ae46455b688b.yml
@@ -1,101 +1,98 @@
 id: ocd-person/9243a3a9-4e91-5fc8-9643-ae46455b688b
 name: Mike Crapo
-given_name: Michael
+given_name: Mike
 family_name: Crapo
-middle_name: D.
-gender: M
 birth_date: 1951-05-20
+gender: Male
+email: https://www.crapo.senate.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C000880.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: ID-2
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: ID-2
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: ID-2
-- start_date: '1999-01-06'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 1999-01-06
+  end_date: 2005-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Idaho
+- start_date: 1997-01-07
+  end_date: 1999-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: ID-2
+- start_date: 1995-01-04
+  end_date: 1997-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: ID-2
+- start_date: 1993-01-05
+  end_date: 1995-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: ID-2
 offices:
 - classification: capitol
-  address: 239 Dirksen Senate Office Building Washington DC 20510
+  address: 239 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-6142
+  fax: 202-228-1375
+- classification: district
+  address: 202 Falls Ave. Suite 2, Twin Falls, ID 83301
+  voice: 208-734-2515
+  fax: 208-733-0414
 - classification: district
-  address: 251 E. Front St. Suite 205; Boise, ID 83702
+  address: 251 E. Front St. Suite 205, Boise, ID 83702
   voice: 208-334-1776
   fax: 208-334-9044
-  name: 'District Office #1'
 - classification: district
-  address: 610 Hubbard Ave Suite 209; Coeur d'Alene, ID 83814
-  voice: 208-664-5490
-  fax: 208-664-0889
-  name: 'District Office #2'
-- classification: district
-  address: 410 Memorial Dr. Suite 204; Idaho Falls, ID 83402
-  voice: 208-522-9779
-  fax: 208-529-8367
-  name: 'District Office #3'
+  address: 275 S. 5th Ave. Suite 100, Pocatello, ID 83201
+  voice: 208-236-6775
+  fax: 208-236-6935
 - classification: district
-  address: 313 'D' St. Suite 105; Lewiston, ID 83501
+  address: 313 D St. Suite 105, Lewiston, ID 83501
   voice: 208-743-1492
   fax: 208-743-6484
-  name: 'District Office #4'
 - classification: district
-  address: 275 S. 5th Ave. Suite 100; Pocatello, ID 83201
-  voice: 208-236-6775
-  fax: 208-236-6935
-  name: 'District Office #5'
+  address: 410 Memorial Drive Suite 204, Idaho Falls, ID 83402
+  voice: 208-522-9779
+  fax: 208-529-8367
 - classification: district
-  address: 202 Falls Ave. Suite 2; Twin Falls, ID 83301
-  voice: 208-734-2515
-  fax: 208-733-0414
-  name: 'District Office #6'
+  address: 610 Hubbard St. Suite 209, Coeur d'Alene, ID 83814
+  voice: 208-664-5490
+  fax: 208-664-0889
 links:
 - url: https://www.crapo.senate.gov
   note: website
 - url: https://www.crapo.senate.gov/contact
   note: contact form
+- url: https://www.crapo.senate.gov/
+other_names:
+- name: Crapo (R-ID)
+- name: Crapo, M.
+- name: M. Crapo
+- name: M.D. Crapo
 ids:
   twitter: MikeCrapo
   youtube: UCMHzKHg1BE7dEcFjnayw1lA
   facebook: mikecrapo
-other_names:
-- name: Crapo (R-ID)
 other_identifiers:
 - scheme: bioguide
   identifier: C000880
@@ -131,3 +128,12 @@ other_identifiers:
   identifier: kg:/m/021pgp
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Crapo
+- url: https://crapoforsenate.com/meet-mike
+- url: https://en.wikipedia.org/wiki/Mike_Crapo
+- url: https://justfacts.votesmart.org/candidate/26830/mike-crapo
+- url: https://theunitedstates.io
+- url: https://www.crapo.senate.gov
+- url: https://www.crapo.senate.gov/about/about-mike
+- url: https://www.govtrack.us/congress/members/michael_crapo/300030
+- url: https://www.linkedin.com/in/mikecrapo
diff --git a/data/us/legislature/Mike-Ezell-fef4e629-aa7e-5bc5-9128-abfce1af96d5.yml b/data/us/legislature/Mike-Ezell-fef4e629-aa7e-5bc5-9128-abfce1af96d5.yml
index fba35ce75c..1d304ac69f 100644
--- a/data/us/legislature/Mike-Ezell-fef4e629-aa7e-5bc5-9128-abfce1af96d5.yml
+++ b/data/us/legislature/Mike-Ezell-fef4e629-aa7e-5bc5-9128-abfce1af96d5.yml
@@ -2,26 +2,42 @@ id: ocd-person/fef4e629-aa7e-5bc5-9128-abfce1af96d5
 name: Mike Ezell
 given_name: Mike
 family_name: Ezell
-gender: M
 birth_date: 1959-04-06
+gender: Male
+email: https://ezell.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/E000235.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-4
 offices:
 - classification: capitol
-  address: 443 Cannon House Office Building Washington DC 20515-2404
+  address: 443 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5772
+- classification: district
+  address: 10441 Corporate Drive Suite 2, Gulfport, MS 39503
+  voice: 228-864-7670
+- classification: district
+  address: 3207 Magnolia St. Suite 101, Pascagoula, MS 39567
+  voice: 228-202-5890
+- classification: district
+  address: 515 N. 5th Ave. Suite A, Laurel, MS 39440
+  voice: 601-425-7247
+- classification: district
+  address: 641 Main St. Suite 142, Hattiesburg, MS 39401
+  voice: 601-582-3246
 links:
 - url: https://ezell.house.gov
   note: website
+- url: https://ezell.house.gov/
+other_names:
+- name: Ezell, M.
+- name: M. Ezell
+- name: W.M. Ezell
 ids:
   twitter: RepEzell
 other_identifiers:
@@ -41,3 +57,9 @@ other_identifiers:
   identifier: '202526'
 sources:
 - url: https://theunitedstates.io/
+- url: https://en.wikipedia.org/wiki/Mike_Ezell
+- url: https://ezell.house.gov
+- url: https://ezell.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/mike-ezell-33856880
+- url: https://www.mikeezell.ms/about
diff --git a/data/us/legislature/Mike-Flood-51e14e3d-a2c7-5d16-81d5-6608049b5d7e.yml b/data/us/legislature/Mike-Flood-51e14e3d-a2c7-5d16-81d5-6608049b5d7e.yml
index afee71ff7b..5f5bb56199 100644
--- a/data/us/legislature/Mike-Flood-51e14e3d-a2c7-5d16-81d5-6608049b5d7e.yml
+++ b/data/us/legislature/Mike-Flood-51e14e3d-a2c7-5d16-81d5-6608049b5d7e.yml
@@ -2,31 +2,38 @@ id: ocd-person/51e14e3d-a2c7-5d16-81d5-6608049b5d7e
 name: Mike Flood
 given_name: Mike
 family_name: Flood
-gender: M
 birth_date: 1975-02-23
+gender: Male
+email: https://flood.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000474.jpg
 party:
-- start_date: '2022-07-12'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2022-07-12'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2022-07-12
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NE-1
 offices:
 - classification: capitol
-  address: 343 Cannon House Office Building Washington DC 20515-2701
+  address: 343 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4806
+- classification: district
+  address: 301 S. 13th St. Suite 100, Lincoln, NE 68508
+  voice: 402-438-1598
 links:
 - url: https://flood.house.gov
   note: website
+- url: https://flood.house.gov/
+other_names:
+- name: Flood, M.
+- name: M. Flood
+- name: M.J. Flood
 other_identifiers:
 - scheme: bioguide
   identifier: F000474
@@ -46,3 +53,10 @@ other_identifiers:
   identifier: '41983'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Flood
+- url: https://en.wikipedia.org/wiki/Mike_Flood_(politician)
+- url: https://flood.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/41983/mike-flood
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_flood/456868
+- url: https://www.linkedin.com/in/mike-flood-72a5a262
diff --git a/data/us/legislature/Mike-Garcia-db31d257-8b81-52c8-a2e1-d26c6ee4a8be.yml b/data/us/legislature/Mike-Garcia-db31d257-8b81-52c8-a2e1-d26c6ee4a8be.yml
index bc213c3b33..ad0c12faa3 100644
--- a/data/us/legislature/Mike-Garcia-db31d257-8b81-52c8-a2e1-d26c6ee4a8be.yml
+++ b/data/us/legislature/Mike-Garcia-db31d257-8b81-52c8-a2e1-d26c6ee4a8be.yml
@@ -2,41 +2,50 @@ id: ocd-person/db31d257-8b81-52c8-a2e1-d26c6ee4a8be
 name: Mike Garcia
 given_name: Mike
 family_name: Garcia
-gender: M
 birth_date: 1976-04-24
+gender: Male
+email: https://mikegarcia.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000061.jpg
 party:
-- start_date: '2020-05-19'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2020-05-19'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-25
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-27
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-25
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2020-05-19
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-27
+  district: CA-25
 offices:
 - classification: capitol
-  address: 144 Cannon House Office Building Washington DC 20515-0527
+  address: 144 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-1956
+- classification: district
+  address: 1043 West Ave. M4 Suite A, Palmdale, CA 93551
+  voice: 661-839-0532
+- classification: district
+  address: 27200 Tourney Road Suite 300, Santa Clarita, CA 91355
+  voice: 661-568-4855
 links:
 - url: https://mikegarcia.house.gov
   note: website
+- url: https://mikegarcia.house.gov/
+other_names:
+- name: Garcia, M.
+- name: Garcia, Mike
+- name: M. Garcia
+- name: M.J. Garcia
 ids:
   twitter: RepMikeGarcia
   facebook: RepMikeGarcia
-other_names:
-- name: Garcia, Mike
 other_identifiers:
 - scheme: bioguide
   identifier: G000061
@@ -58,3 +67,12 @@ other_identifiers:
   identifier: '188664'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Garcia
+- url: https://en.wikipedia.org/wiki/Mike_Garcia_(California_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/188664/mike-garcia
+- url: https://mikegarcia.house.gov
+- url: https://mikegarcia.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.electmikegarcia.com/meet-mike
+- url: https://www.govtrack.us/congress/members/mike_garcia/456792
+- url: https://www.linkedin.com/in/michael-garcia-96131b14
diff --git a/data/us/legislature/Mike-Johnson-ef2a1e73-edb7-5f53-9f61-da2020fc417d.yml b/data/us/legislature/Mike-Johnson-ef2a1e73-edb7-5f53-9f61-da2020fc417d.yml
index 96787c9441..c99ceb9f21 100644
--- a/data/us/legislature/Mike-Johnson-ef2a1e73-edb7-5f53-9f61-da2020fc417d.yml
+++ b/data/us/legislature/Mike-Johnson-ef2a1e73-edb7-5f53-9f61-da2020fc417d.yml
@@ -2,59 +2,57 @@ id: ocd-person/ef2a1e73-edb7-5f53-9f61-da2020fc417d
 name: Mike Johnson
 given_name: Mike
 family_name: Johnson
-gender: M
 birth_date: 1972-01-30
+gender: Male
+email: https://mikejohnson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/J000299.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-4
 offices:
 - classification: capitol
-  address: 568 Cannon House Office Building Washington DC 20515-1804
+  address: 568 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2777
 - classification: district
-  address: 2250 Hospital Dr. Suite 248; Bossier City, LA 71111
+  address: 2250 Hospital Drive Suite 248, Bossier City, LA 71111
   voice: 318-840-0309
-  name: 'District Office #1'
 - classification: district
-  address: 444 Caspari Dr. Room 224; Natchitoches, LA 71497
-  voice: 318-357-5731
-  name: 'District Office #2'
-- classification: district
-  address: 3329 University Parkway Room 24; Leesville, LA 71446
-  voice: 337-392-3146
-  name: 'District Office #3'
+  address: P.O. Box 779 3329 University Parkway, Building 552, Room 24, Leesville,
+    LA 71496
+  voice: 337-423-4232
 links:
 - url: https://mikejohnson.house.gov
   note: website
+- url: https://mikejohnson.house.gov/
+other_names:
+- name: J.M. Johnson
+- name: Johnson (LA)
+- name: Johnson, M.
+- name: M. Johnson
 ids:
   twitter: RepMikeJohnson
   youtube: UCzqBEpeIaDEfvAtsA53Fx2Q
   facebook: RepMikeJohnson
-other_names:
-- name: Johnson (LA)
 other_identifiers:
 - scheme: bioguide
   identifier: J000299
@@ -82,3 +80,11 @@ other_identifiers:
   identifier: Mike Johnson (Louisiana)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Johnson_(Louisiana)
+- url: https://en.wikipedia.org/wiki/Mike_Johnson_(Louisiana_politician)
+- url: https://justfacts.votesmart.org/candidate/156097/mike-johnson
+- url: https://mikejohnson.house.gov
+- url: https://mikejohnson.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_johnson/412706
+- url: https://www.mikejohnsonforlouisiana.com/about
diff --git a/data/us/legislature/Mike-Kelly-72511635-46e3-536d-8880-b32c7cf3e470.yml b/data/us/legislature/Mike-Kelly-72511635-46e3-536d-8880-b32c7cf3e470.yml
index 0a25a197d1..dae88b9472 100644
--- a/data/us/legislature/Mike-Kelly-72511635-46e3-536d-8880-b32c7cf3e470.yml
+++ b/data/us/legislature/Mike-Kelly-72511635-46e3-536d-8880-b32c7cf3e470.yml
@@ -2,77 +2,78 @@ id: ocd-person/72511635-46e3-536d-8880-b32c7cf3e470
 name: Mike Kelly
 given_name: Mike
 family_name: Kelly
-gender: M
 birth_date: 1948-05-10
+gender: Male
+email: https://kelly.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000376.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: PA-16
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: PA-16
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: PA-16
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-16
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: PA-3
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-16
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-3
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-16
+  district: PA-3
 offices:
 - classification: capitol
-  address: 1707 Longworth House Office Building Washington DC 20515-3816
+  address: 1707 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5406
+  fax: 202-225-3103
 - classification: district
-  address: 101 E. Diamond St. Suite 218; Butler, PA 16001
-  voice: 724-282-2557
-  fax: 724-282-3682
-  name: 'District Office #1'
-- classification: district
-  address: 208 E. Bayfront Pkwy. Suite 102; Erie, PA 16507
+  address: 17 S. Park Row Suite A430, Erie, PA 16501
   voice: 814-454-8190
   fax: 814-454-8197
-  name: 'District Office #2'
 - classification: district
-  address: 33 Chestnut Ave.; Sharon, PA 16146
+  address: 245 Pittsburgh Road Suite 300, Butler, PA 16001
+  voice: 724-282-2557
+  fax: 724-282-3682
+- classification: district
+  address: 33 Chestnut Ave., Sharon, PA 16146
   voice: 724-342-7170
   fax: 724-342-7242
-  name: 'District Office #3'
 links:
 - url: https://kelly.house.gov
   note: website
+- url: https://kelly.house.gov/
+other_names:
+- name: G.J. Kelly
+- name: Kelly (PA)
+- name: Kelly, M.
+- name: M. Kelly
 ids:
   twitter: MikeKellyPA
   youtube: UCoz6u3ooQxoijsWvhoQ0D-A
   facebook: '191056827594903'
-other_names:
-- name: Kelly (PA)
 other_identifiers:
 - scheme: bioguide
   identifier: K000376
@@ -104,3 +105,10 @@ other_identifiers:
   identifier: kg:/m/0ds6wcw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Kelly_(Pennsylvania)
+- url: https://en.wikipedia.org/wiki/Mike_Kelly_(Pennsylvania_politician)
+- url: https://justfacts.votesmart.org/candidate/119463/mike-kelly-jr
+- url: https://kelly.house.gov
+- url: https://kelly.house.gov/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_kelly/412465
diff --git a/data/us/legislature/Mike-Lee-461257ff-088f-5edd-b342-4652ce1c111f.yml b/data/us/legislature/Mike-Lee-461257ff-088f-5edd-b342-4652ce1c111f.yml
index fb9c9ef29f..5897a43a5e 100644
--- a/data/us/legislature/Mike-Lee-461257ff-088f-5edd-b342-4652ce1c111f.yml
+++ b/data/us/legislature/Mike-Lee-461257ff-088f-5edd-b342-4652ce1c111f.yml
@@ -2,58 +2,62 @@ id: ocd-person/461257ff-088f-5edd-b342-4652ce1c111f
 name: Mike Lee
 given_name: Mike
 family_name: Lee
-gender: M
 birth_date: 1971-06-04
+gender: Male
+email: https://www.lee.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000577.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Utah
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Utah
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Utah
 offices:
 - classification: capitol
-  address: 363 Russell Senate Office Building Washington DC 20510
+  address: 363 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5444
 - classification: district
-  address: 324 25th St. Suite 1410; Ogden, UT 84401
+  address: 111 E. Tabernacle St. Suite 324, St. George, UT 84770
+  voice: 435-628-5514
+- classification: district
+  address: James V. Hansen Federal Building 324  25th St., Suite 1410, Ogden, UT 84401
   voice: 801-392-9633
   fax: 801-392-9630
-  name: 'District Office #1'
 - classification: district
-  address: 125 S. State Suite 4225; Salt Lake City, UT 84138
+  address: Vernal City Hall 374 E. Main St., Suite 261, Vernal, UT 84078
+  voice: 435-503-9335
+- classification: district
+  address: Wallace F. Bennett Federal Building 125 S. State St., Suite 4225, Salt
+    Lake City, UT 84138
   voice: 801-524-5933
   fax: 801-524-5730
-  name: 'District Office #2'
-- classification: district
-  address: 285 W. Tabernacle Suite 200; St. George, UT 84770
-  voice: 435-628-5514
-  name: 'District Office #3'
 links:
 - url: https://www.lee.senate.gov
   note: website
 - url: https://www.lee.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.lee.senate.gov/
+other_names:
+- name: Lee (R-UT)
+- name: Lee, M.
+- name: M. Lee
+- name: M.S. Lee
 ids:
   twitter: SenMikeLee
   youtube: UCplVxs_j_sLAt0fkplXcl4A
   facebook: senatormikelee
-other_names:
-- name: Lee (R-UT)
 other_identifiers:
 - scheme: bioguide
   identifier: L000577
@@ -85,3 +89,11 @@ other_identifiers:
   identifier: kg:/m/09v5q9x
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Lee_(Utah)
+- url: https://en.wikipedia.org/wiki/Mike_Lee_(U.S._politician)
+- url: https://justfacts.votesmart.org/candidate/66395/mike-lee
+- url: https://leeforsenate.com/about-mike
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_lee/412495
+- url: https://www.lee.senate.gov
+- url: https://www.lee.senate.gov/about-mike
diff --git a/data/us/legislature/Mike-Levin-ac0c3c4b-14c8-5bc1-bb8b-001af291ee3d.yml b/data/us/legislature/Mike-Levin-ac0c3c4b-14c8-5bc1-bb8b-001af291ee3d.yml
index 46c16d2642..e5d95727cb 100644
--- a/data/us/legislature/Mike-Levin-ac0c3c4b-14c8-5bc1-bb8b-001af291ee3d.yml
+++ b/data/us/legislature/Mike-Levin-ac0c3c4b-14c8-5bc1-bb8b-001af291ee3d.yml
@@ -2,44 +2,46 @@ id: ocd-person/ac0c3c4b-14c8-5bc1-bb8b-001af291ee3d
 name: Mike Levin
 given_name: Mike
 family_name: Levin
-gender: M
-birth_date: 1978-10-28
+birth_date: 1978-10-20
+gender: Male
+email: https://levin.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/L000593.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-49
 offices:
 - classification: capitol
-  address: 2352 Rayburn House Office Building Washington DC 20515-0549
+  address: 2352 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3906
 - classification: district
-  address: 33282 Golden Lantern St Suite 102; Dana Point, CA 92629-1805
-  voice: 949-281-2449
-  name: 'District Office #1'
-- classification: district
-  address: 2204 S El Camino Real Suite 314; Oceanside, CA 92054-6306
+  address: 2204 El Camino Real Suite 314, Oceanside, CA 92054
   voice: 760-599-5000
-  name: 'District Office #2'
+- classification: district
+  address: 33282 Golden Lantern St. Suite 102, Dana Point, CA 92629
+  voice: 949-281-2449
 links:
 - url: https://levin.house.gov
   note: website
+- url: https://levin.house.gov/
+other_names:
+- name: Levin, M.
+- name: M. Levin
+- name: M.T. Levin
 ids:
   twitter: RepMikeLevin
 other_identifiers:
@@ -63,3 +65,12 @@ other_identifiers:
   identifier: kg:/g/11gfd5mdpc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Levin
+- url: https://chci.org/staff-and-leadership/rep-mike-levin
+- url: https://en.wikipedia.org/wiki/Mike_Levin
+- url: https://justfacts.votesmart.org/candidate/biography/179416/mike-levin
+- url: https://levin.house.gov
+- url: https://levin.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_levin/412760
+- url: https://www.linkedin.com/in/mikelevin
diff --git a/data/us/legislature/Mike-Quigley-b8578429-a84d-5542-a903-02feaee3a7d4.yml b/data/us/legislature/Mike-Quigley-b8578429-a84d-5542-a903-02feaee3a7d4.yml
index a0895dad05..d360d56283 100644
--- a/data/us/legislature/Mike-Quigley-b8578429-a84d-5542-a903-02feaee3a7d4.yml
+++ b/data/us/legislature/Mike-Quigley-b8578429-a84d-5542-a903-02feaee3a7d4.yml
@@ -2,70 +2,70 @@ id: ocd-person/b8578429-a84d-5542-a903-02feaee3a7d4
 name: Mike Quigley
 given_name: Mike
 family_name: Quigley
-gender: M
 birth_date: 1958-10-17
+gender: Male
+email: https://quigleyforms.house.gov/forms/writeyourrep/
 image: https://theunitedstates.io/images/congress/450x550/Q000023.jpg
 party:
-- start_date: '2009-04-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-04-07'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-04-07
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-5
 offices:
 - classification: capitol
-  address: 2083 Rayburn House Office Building Washington DC 20515-1305
+  address: 2083 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4061
+  fax: 202-225-5603
 - classification: district
-  address: 4345 N. Milwaukee Ave.; Chicago, IL 60641
+  address: 1925 N. Clybourn Ave., Chicago, IL 60614
   voice: 773-267-5926
-  fax: 773-267-6583
-  name: 'District Office #1'
-- classification: district
-  address: 3223 N. Sheffield Ave.; Chicago, IL 60657
-  voice: 773-267-5926
-  name: 'District Office #2'
+  fax: 202-225-5603
 links:
 - url: https://quigley.house.gov
   note: website
+- url: https://quigley.house.gov/
+other_names:
+- name: M. Quigley
+- name: M.B. Quigley
+- name: Quigley, M.
 ids:
   twitter: RepMikeQuigley
   youtube: UCDP13XegdoZ4bxYHxM34yAA
@@ -101,3 +101,11 @@ other_identifiers:
   identifier: kg:/m/0fccwh
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Quigley
+- url: https://en.wikipedia.org/wiki/Mike_Quigley_(politician)
+- url: https://justfacts.votesmart.org/candidate/83310/mike-quigley
+- url: https://quigley.house.gov
+- url: https://quigley.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_quigley/412331
+- url: https://www.linkedin.com/in/mikequigleyforcongress
diff --git a/data/us/legislature/Mike-Rogers-612162b9-752c-50f4-b2e5-de10dae5c160.yml b/data/us/legislature/Mike-Rogers-612162b9-752c-50f4-b2e5-de10dae5c160.yml
index a8d7faa384..effece5dfb 100644
--- a/data/us/legislature/Mike-Rogers-612162b9-752c-50f4-b2e5-de10dae5c160.yml
+++ b/data/us/legislature/Mike-Rogers-612162b9-752c-50f4-b2e5-de10dae5c160.yml
@@ -2,92 +2,94 @@ id: ocd-person/612162b9-752c-50f4-b2e5-de10dae5c160
 name: Mike Rogers
 given_name: Mike
 family_name: Rogers
-gender: M
 birth_date: 1958-07-16
+gender: Male
+email: https://mikerogers.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/R000575.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-3
 offices:
 - classification: capitol
-  address: 2469 Rayburn House Office Building Washington DC 20515-0103
+  address: 2469 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3261
+  fax: 202-226-8485
 - classification: district
-  address: '1129 Noble St. # 104; Anniston, AL 36201'
+  address: 149 E. Hamric Drive Suite D, Oxford, AL 36203
   voice: 256-236-5655
-  fax: 256-237-9203
-  name: 'District Office #1'
+  fax: 844-635-4276
 - classification: district
-  address: 701 Avenue A Suite 300; Opelika, AL 36801
+  address: G.W. Andrews Federal Building 701 Avenue A, Suite 300, Opelika, AL 36801
   voice: 334-745-6221
   fax: 334-742-0109
-  name: 'District Office #2'
 links:
 - url: https://mikerogers.house.gov
   note: website
+- url: https://mikerogers.house.gov/
+other_names:
+- name: M. Rogers
+- name: M.D. Rogers
+- name: Rogers (AL)
+- name: Rogers, M.
 ids:
   twitter: RepMikeRogersAL
   youtube: UCH-WUWuY0_dlKwJDSqKTJsg
   facebook: CongressmanMikeDRogers
-other_names:
-- name: Rogers (AL)
 other_identifiers:
 - scheme: bioguide
   identifier: R000575
@@ -119,3 +121,11 @@ other_identifiers:
   identifier: kg:/m/024n_s
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Rogers_(Alabama)
+- url: https://en.wikipedia.org/wiki/Mike_D._Rogers
+- url: https://mikerogers.house.gov
+- url: https://mikerogers.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_rogers/400341
+- url: https://www.linkedin.com/in/repmikerogersal
+- url: https://www.mikerogersforcongress.com/about
diff --git a/data/us/legislature/Mike-Rounds-bfd392c5-2d61-56fa-94c6-ea12aaee7ea6.yml b/data/us/legislature/Mike-Rounds-bfd392c5-2d61-56fa-94c6-ea12aaee7ea6.yml
index 4df13951c1..e22fa08707 100644
--- a/data/us/legislature/Mike-Rounds-bfd392c5-2d61-56fa-94c6-ea12aaee7ea6.yml
+++ b/data/us/legislature/Mike-Rounds-bfd392c5-2d61-56fa-94c6-ea12aaee7ea6.yml
@@ -2,58 +2,58 @@ id: ocd-person/bfd392c5-2d61-56fa-94c6-ea12aaee7ea6
 name: Mike Rounds
 given_name: Mike
 family_name: Rounds
-gender: M
 birth_date: 1954-10-24
+gender: Male
+email: https://www.rounds.senate.gov/contact/email-mike
 image: https://theunitedstates.io/images/congress/450x550/R000605.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Dakota
 offices:
 - classification: capitol
-  address: 716 Hart Senate Office Building Washington DC 20510
+  address: 716 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5842
-- classification: district
-  address: 514 S. Main St. Suite 100; Aberdeen, SD 57401
-  voice: 605-225-0366
-  name: 'District Office #1'
-- classification: district
-  address: 111 W. Capitol Ave. Suite 210; Pierre, SD 57501
+  fax: 202-224-7482
+- classification: capitol
+  address: P.O. Box 309 111 W. Capitol Ave., Suite 210, Pierre, SD 57501
   voice: 605-224-1450
   fax: 605-224-1379
-  name: 'District Office #2'
 - classification: district
-  address: 1313 W. Main St.; Rapid City, SD 57701
-  voice: 605-343-5035
-  fax: 605-343-5348
-  name: 'District Office #3'
+  address: 221 Brown County Highway 19 South Suite 112, Aberdeen, SD 57401
+  voice: 605-225-0366
 - classification: district
-  address: 320 N. Main Ave. Suite A; Sioux Falls, SD 57104
+  address: 320 N. Main Ave. Suite A, Sioux Falls, SD 57104
   voice: 605-336-0486
   fax: 605-336-6624
-  name: 'District Office #4'
+- classification: district
+  address: 603 Omaha St. Suite 100, Rapid City, SD 57701
+  voice: 605-343-5035
+  fax: 605-343-5348
 links:
 - url: https://www.rounds.senate.gov
   note: website
 - url: https://www.rounds.senate.gov/contact/email-mike
   note: contact form
+- url: https://www.rounds.senate.gov/
+other_names:
+- name: M. Rounds
+- name: M.M. Rounds
+- name: Rounds (R-SD)
+- name: Rounds, M.
 ids:
   twitter: SenatorRounds
   youtube: UC-pvzimyBdpdkcIfsicrfrQ
   facebook: SenatorMikeRounds
-other_names:
-- name: Rounds (R-SD)
 other_identifiers:
 - scheme: bioguide
   identifier: R000605
@@ -85,3 +85,9 @@ other_identifiers:
   identifier: Mike Rounds
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Rounds
+- url: https://en.wikipedia.org/wiki/Mike_Rounds
+- url: https://justfacts.votesmart.org/candidate/biography/7455/mike-rounds
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_rounds/412669
+- url: https://www.rounds.senate.gov
diff --git a/data/us/legislature/Mike-Thompson-237700e9-fd25-5daa-a301-2fde714f5923.yml b/data/us/legislature/Mike-Thompson-237700e9-fd25-5daa-a301-2fde714f5923.yml
index f0aef66c0e..92cd0eb373 100644
--- a/data/us/legislature/Mike-Thompson-237700e9-fd25-5daa-a301-2fde714f5923.yml
+++ b/data/us/legislature/Mike-Thompson-237700e9-fd25-5daa-a301-2fde714f5923.yml
@@ -2,108 +2,107 @@ id: ocd-person/237700e9-fd25-5daa-a301-2fde714f5923
 name: Mike Thompson
 given_name: Mike
 family_name: Thompson
-middle_name: Michael
-gender: M
 birth_date: 1951-01-24
+gender: Male
+email: https://mikethompsonforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/T000460.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-4
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-5
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-5
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-5
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: CA-5
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-5
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-1
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-1
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-1
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-1
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-1
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-4
+  district: CA-1
 offices:
 - classification: capitol
-  address: 268 Cannon House Office Building Washington DC 20515-0504
+  address: 268 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3311
+  fax: 202-225-4335
 - classification: district
-  address: 2721 Napa Valley Corporate Dr.; Napa, CA 94558
-  voice: 707-226-9898
-  fax: 707-251-9800
-  name: 'District Office #1'
-- classification: district
-  address: 2300 County Center Dr. Suite A100; Santa Rosa, CA 95403
+  address: 2300 County Center Drive Suite A100, Santa Rosa, CA 95403
   voice: 707-542-7182
   fax: 707-542-2745
-  name: 'District Office #2'
 - classification: district
-  address: 420 Virginia St. Suite 1C; Vallejo, CA 94590
-  voice: 707-645-1888
-  fax: 707-645-1870
-  name: 'District Office #3'
+  address: 2721 Napa Valley Corporate Drive, Napa, CA 94558
+  voice: 707-226-9898
+  fax: 707-251-9800
+- classification: district
+  address: 622 Main St. Suite 106, Woodland, CA 95695
+  voice: 530-753-5301
 links:
 - url: https://mikethompson.house.gov
   note: website
+- url: https://mikethompson.house.gov/
+other_names:
+- name: C.M. Thompson
+- name: M. Thompson
+- name: Thompson (CA)
+- name: Thompson, M.
 ids:
   twitter: RepThompson
   youtube: UC6pGbtqHZYZmScFGSz5bbdg
   facebook: RepMikeThompson
-other_names:
-- name: Thompson (CA)
 other_identifiers:
 - scheme: bioguide
   identifier: T000460
@@ -135,3 +134,9 @@ other_identifiers:
   identifier: Mike Thompson (California)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mike_Thompson_(California)
+- url: https://en.wikipedia.org/wiki/Mike_Thompson_(California_politician)
+- url: https://justfacts.votesmart.org/candidate/biography/3564/mike-thompson
+- url: https://mikethompson.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mike_thompson/400403
diff --git a/data/us/legislature/Mikie-Sherrill-bbe70084-5f54-5897-8518-a9467558a4b1.yml b/data/us/legislature/Mikie-Sherrill-bbe70084-5f54-5897-8518-a9467558a4b1.yml
index e8062c64db..b67e0e0996 100644
--- a/data/us/legislature/Mikie-Sherrill-bbe70084-5f54-5897-8518-a9467558a4b1.yml
+++ b/data/us/legislature/Mikie-Sherrill-bbe70084-5f54-5897-8518-a9467558a4b1.yml
@@ -2,40 +2,44 @@ id: ocd-person/bbe70084-5f54-5897-8518-a9467558a4b1
 name: Mikie Sherrill
 given_name: Mikie
 family_name: Sherrill
-gender: F
 birth_date: 1972-01-19
+gender: Female
+email: https://sherrill.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001207.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-11
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-11
 offices:
 - classification: capitol
-  address: 1427 Longworth House Office Building Washington DC 20515-3011
+  address: 1427 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5034
+  fax: 202-225-3186
 - classification: district
-  address: 8 Woodhollow Rd Suite 203; Parsippany, NJ 07054-2828
+  address: 357 S. Livingston Ave. Suite 201, Livingston, NJ 07039
   voice: 973-526-5668
-  name: 'District Office #1'
 links:
 - url: https://sherrill.house.gov
   note: website
+- url: https://sherrill.house.gov/
+other_names:
+- name: M. Sherrill
+- name: R.M. Sherrill
+- name: Sherrill, M.
 ids:
   twitter: RepSherrill
 other_identifiers:
@@ -61,3 +65,11 @@ other_identifiers:
   identifier: kg:/g/11f3r4x6x5
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mikie_Sherrill
+- url: https://en.wikipedia.org/wiki/Mikie_Sherrill
+- url: https://justfacts.votesmart.org/candidate/biography/179651/mikie-sherrill
+- url: https://sherrill.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mikie_sherrill/412799
+- url: https://www.linkedin.com/in/mikie-sherrill-6500275a
+- url: https://www.mikiesherrill.com/meet-mikie
diff --git a/data/us/legislature/Mitch-McConnell-200bd7b3-ce8e-5541-a649-b53e30862567.yml b/data/us/legislature/Mitch-McConnell-200bd7b3-ce8e-5541-a649-b53e30862567.yml
index bb33795e66..83fc8bf81c 100644
--- a/data/us/legislature/Mitch-McConnell-200bd7b3-ce8e-5541-a649-b53e30862567.yml
+++ b/data/us/legislature/Mitch-McConnell-200bd7b3-ce8e-5541-a649-b53e30862567.yml
@@ -2,87 +2,85 @@ id: ocd-person/200bd7b3-ce8e-5541-a649-b53e30862567
 name: Mitch McConnell
 given_name: Mitch
 family_name: McConnell
-gender: M
 birth_date: 1942-02-20
+gender: Male
+email: https://www.mcconnell.senate.gov/public/index.cfm?p=contactform
 image: https://theunitedstates.io/images/congress/450x550/M000355.jpg
 party:
-- start_date: '1985-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1985-01-03'
-  end_date: '1991-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '1991-01-03'
-  end_date: '1997-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '1997-01-07'
-  end_date: '2003-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
+- start_date: 2003-01-07
+  end_date: 2009-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 1997-01-07
+  end_date: 2003-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 1991-01-03
+  end_date: 1997-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 1985-01-03
+  end_date: 1991-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
 offices:
 - classification: capitol
-  address: 317 Russell Senate Office Building Washington DC 20510
+  address: 317 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-2541
+  fax: 202-224-2499
 - classification: district
-  address: 241 E. Main St. Room 102; Bowling Green, KY 42101
-  voice: 270-781-1673
-  name: 'District Office #1'
-- classification: district
-  address: 1885 Dixie Hwy. Suite 345; Fort Wright, KY 41011
+  address: 1885 Dixie Highway Suite 345, Fort Wright, KY 41011
   voice: 859-578-0188
-  name: 'District Office #2'
-- classification: district
-  address: 771 Corporate Dr. Suite 108; Lexington, KY 40503
-  voice: 859-224-8286
-  name: 'District Office #3'
 - classification: district
-  address: 300 S. Main St. Suite 310; London, KY 40741
+  address: 300 S. Main St. Suite 310, London, KY 40741
   voice: 606-864-2026
-  name: 'District Office #4'
 - classification: district
-  address: 601 W. Broadway Room 630; Louisville, KY 40202
+  address: 501 Broadway St. Suite 3B36, Paducah, KY 42001
+  voice: 270-442-4554
+- classification: district
+  address: 601 W. Broadway Room 630, Louisville, KY 40202
   voice: 502-582-6304
-  name: 'District Office #5'
 - classification: district
-  address: 100 Fountain Ave. Suite 300; Paducah, KY 42001
-  voice: 270-442-4554
-  name: 'District Office #6'
+  address: 771 Corporate Drive Suite 108, Lexington, KY 40503
+  voice: 859-224-8286
+- classification: district
+  address: Federal Building 241 E. Main St., Suite 102, Bowling Green, KY 42101
+  voice: 270-781-1673
 links:
 - url: https://www.mcconnell.senate.gov
   note: website
 - url: https://www.mcconnell.senate.gov/public/index.cfm?p=contact
   note: contact form
+- url: https://www.mcconnell.senate.gov/
+other_names:
+- name: A.M. McConnell
+- name: M. McConnell
+- name: McConnell (R-KY)
+- name: McConnell, M.
 ids:
   twitter: McConnellPress
   facebook: mitchmcconnell
-other_names:
-- name: McConnell (R-KY)
 other_identifiers:
 - scheme: bioguide
   identifier: M000355
@@ -114,3 +112,10 @@ other_identifiers:
   identifier: kg:/m/01z6ls
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mitch_McConnell
+- url: https://en.wikipedia.org/wiki/Mitch_McConnell
+- url: https://justfacts.votesmart.org/candidate/biography/53298/mitch-mcconnell-jr
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mitch_mcconnell/300072
+- url: https://www.mcconnell.senate.gov
+- url: https://www.mcconnell.senate.gov/public/index.cfm/biography
diff --git a/data/us/legislature/Mitt-Romney-2279327b-86e8-5baf-ad04-7b3e20f3da0c.yml b/data/us/legislature/Mitt-Romney-2279327b-86e8-5baf-ad04-7b3e20f3da0c.yml
index b7775c6c8e..520f97dfaf 100644
--- a/data/us/legislature/Mitt-Romney-2279327b-86e8-5baf-ad04-7b3e20f3da0c.yml
+++ b/data/us/legislature/Mitt-Romney-2279327b-86e8-5baf-ad04-7b3e20f3da0c.yml
@@ -2,36 +2,48 @@ id: ocd-person/2279327b-86e8-5baf-ad04-7b3e20f3da0c
 name: Mitt Romney
 given_name: Mitt
 family_name: Romney
-gender: M
 birth_date: 1947-03-12
+gender: Male
+email: https://www.romney.senate.gov/contact-senator-romney/
 image: https://theunitedstates.io/images/congress/450x550/R000615.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-02
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Utah
 offices:
 - classification: capitol
-  address: 354 Russell Senate Office Building Washington DC 20510
+  address: 354 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5251
+  fax: 202-228-0836
 - classification: district
-  address: 125 S State St Suite 8402; Salt Lake City, UT 84138-1102
+  address: 125 S. State St. Suite 8402, Salt Lake City, UT 84138
   voice: 801-524-4380
-  name: 'District Office #1'
+- classification: district
+  address: 196 E. Tabernacle St. Suite 14, St. George, UT 84770
+  voice: 435-522-7100
+- classification: district
+  address: 648 N. 900 East Suite 8, Spanish Fork, UT 84660
+  voice: 801-515-7230
+- classification: district
+  address: James V. Hansen Federal Building 324 25th St. Suite 1018, Ogden, UT 84401
+  voice: 385-264-7885
 links:
 - url: https://www.romney.senate.gov
   note: website
 - url: https://www.romney.senate.gov/contact-senator-romney
   note: contact form
-ids:
-  twitter: SenatorRomney
+- url: https://www.romney.senate.gov/
 other_names:
+- name: M. Romney
 - name: Romney (R-UT)
+- name: Romney, M.
+- name: W.M. Romney
+ids:
+  twitter: SenatorRomney
 other_identifiers:
 - scheme: bioguide
   identifier: R000615
@@ -59,3 +71,10 @@ other_identifiers:
   identifier: '41902'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Mitt_Romney
+- url: https://en.wikipedia.org/wiki/Mitt_Romney
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/mitt_romney/412841
+- url: https://www.romney.senate.gov
+- url: https://www.romney.senate.gov/biography
+- url: https://www.romneyforutah.com/about-mitt
diff --git a/data/us/legislature/Monica-De-La-Cruz-c03dd126-0872-5937-9967-68aedb1ab964.yml b/data/us/legislature/Monica-De-La-Cruz-c03dd126-0872-5937-9967-68aedb1ab964.yml
index dc8ee2d1b5..5fd3010338 100644
--- a/data/us/legislature/Monica-De-La-Cruz-c03dd126-0872-5937-9967-68aedb1ab964.yml
+++ b/data/us/legislature/Monica-De-La-Cruz-c03dd126-0872-5937-9967-68aedb1ab964.yml
@@ -1,27 +1,40 @@
 id: ocd-person/c03dd126-0872-5937-9967-68aedb1ab964
 name: Monica De La Cruz
-given_name: "M\xF3nica"
+given_name: Monica
 family_name: De La Cruz
-gender: F
 birth_date: 1974-11-11
+gender: Female
+email: https://delacruz.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/D000594.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-15
 offices:
 - classification: capitol
-  address: 1415 Longworth House Office Building Washington DC 20515-4315
+  address: 1415 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-9901
+- classification: district
+  address: 221 W. Court St., Seguin, TX 78155
+  voice: 830-463-0800
+- classification: district
+  address: Commerce Center West Building 1400 N. McColl Road, Suite 103, McAllen,
+    TX 78501
+  voice: 956-800-6069
+- classification: district
+  address: County Courthouse Annex III, 1103 4th St. Room 10, Floresville, TX 78114
+  voice: 956-800-6069
 links:
 - url: https://delacruz.house.gov
   note: website
+- url: https://delacruz.house.gov/
+other_names:
+- name: De La Cruz, M.
+- name: M. De La Cruz
 other_identifiers:
 - scheme: bioguide
   identifier: D000594
@@ -39,3 +52,12 @@ other_identifiers:
   identifier: '188292'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Monica_De_La_Cruz
+- url: https://delacruz.house.gov
+- url: https://delacruz.house.gov/about
+- url: https://en.wikipedia.org/wiki/Monica_De_La_Cruz
+- url: https://justfacts.votesmart.org/candidate/188292/monica-de-la-cruz
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/monica_de_la_cruz/456943
+- url: https://www.linkedin.com/in/monica-de-la-cruz-250978169
+- url: https://www.linkedin.com/in/monica-de-la-cruz-tx15
diff --git a/data/us/legislature/Morgan-Luttrell-868d6300-e9e7-5df4-bfe1-2e7fd1a632ac.yml b/data/us/legislature/Morgan-Luttrell-868d6300-e9e7-5df4-bfe1-2e7fd1a632ac.yml
index 2a0f28703c..1335a7d80f 100644
--- a/data/us/legislature/Morgan-Luttrell-868d6300-e9e7-5df4-bfe1-2e7fd1a632ac.yml
+++ b/data/us/legislature/Morgan-Luttrell-868d6300-e9e7-5df4-bfe1-2e7fd1a632ac.yml
@@ -2,27 +2,33 @@ id: ocd-person/868d6300-e9e7-5df4-bfe1-2e7fd1a632ac
 name: Morgan Luttrell
 given_name: Morgan
 family_name: Luttrell
-middle_name: Joe
-gender: M
 birth_date: 1975-11-07
+gender: Male
+email: https://luttrell.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000603.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-8
 offices:
 - classification: capitol
-  address: 1320 Longworth House Office Building Washington DC 20515-4308
+  address: 1320 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4901
+- classification: district
+  address: 18230 Farm to Market Road 1488 Suite 308, Magnolia, TX 77354
+  voice: 281-305-7890
 links:
 - url: https://luttrell.house.gov
   note: website
+- url: https://luttrell.house.gov/
+other_names:
+- name: Luttrell, M.
+- name: M. Luttrell
+- name: M.J. Luttrell
 ids:
   twitter: RepLuttrell
 other_identifiers:
@@ -42,3 +48,10 @@ other_identifiers:
   identifier: '200930'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Morgan_Luttrell
+- url: https://en.wikipedia.org/wiki/Marcus_Luttrell
+- url: https://justfacts.votesmart.org/candidate/biography/200930/morgan-luttrell
+- url: https://luttrell.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/morgan_luttrell/456942
+- url: https://www.linkedin.com/in/morgan-luttrell-169623195
diff --git a/data/us/legislature/Morgan-McGarvey-d9c43ab0-97c8-565b-80cf-9da35c1ccbee.yml b/data/us/legislature/Morgan-McGarvey-d9c43ab0-97c8-565b-80cf-9da35c1ccbee.yml
index d5a8006631..75ca210cc8 100644
--- a/data/us/legislature/Morgan-McGarvey-d9c43ab0-97c8-565b-80cf-9da35c1ccbee.yml
+++ b/data/us/legislature/Morgan-McGarvey-d9c43ab0-97c8-565b-80cf-9da35c1ccbee.yml
@@ -2,26 +2,35 @@ id: ocd-person/d9c43ab0-97c8-565b-80cf-9da35c1ccbee
 name: Morgan McGarvey
 given_name: Morgan
 family_name: McGarvey
-gender: M
 birth_date: 1979-12-23
+gender: Male
+email: https://mcgarvey.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001220.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-3
 offices:
 - classification: capitol
-  address: 1527 Longworth House Office Building Washington DC 20515-1703
+  address: 1527 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5401
+- classification: district
+  address: Romano Mazzoli Federal Building 600 Martin Luther King Jr. Place, Suite
+    216, Louisville, KY 40202
+  voice: 502-582-5129
+  fax: 502-582-5897
 links:
 - url: https://mcgarvey.house.gov
   note: website
+- url: https://mcgarvey.house.gov/
+other_names:
+- name: J.M. McGarvey
+- name: M. McGarvey
+- name: McGarvey, M.
 ids:
   twitter: RepMcGarvey
 other_identifiers:
@@ -41,3 +50,10 @@ other_identifiers:
   identifier: '139826'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Morgan_McGarvey
+- url: https://en.wikipedia.org/wiki/Morgan_McGarvey
+- url: https://justfacts.votesmart.org/candidate/139826/morgan-mcgarvey
+- url: https://mcgarvey.house.gov
+- url: https://mcgarvey.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/morgan-mcgarvey-4b54885a
diff --git a/data/us/legislature/Nancy-Mace-c50627f5-6447-55e3-9ca9-183daf188b58.yml b/data/us/legislature/Nancy-Mace-c50627f5-6447-55e3-9ca9-183daf188b58.yml
index d7174e3154..6adf088707 100644
--- a/data/us/legislature/Nancy-Mace-c50627f5-6447-55e3-9ca9-183daf188b58.yml
+++ b/data/us/legislature/Nancy-Mace-c50627f5-6447-55e3-9ca9-183daf188b58.yml
@@ -2,32 +2,42 @@ id: ocd-person/c50627f5-6447-55e3-9ca9-183daf188b58
 name: Nancy Mace
 given_name: Nancy
 family_name: Mace
-middle_name: Ruth
-gender: F
 birth_date: 1977-12-04
+gender: Female
+email: https://mace.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M000194.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-1
 offices:
 - classification: capitol
-  address: 1728 Longworth House Office Building Washington DC 20515-4001
+  address: 1728 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3176
+- classification: district
+  address: 652 Coleman Blvd. Suite 102, Mount Pleasant, SC 29464
+  voice: 843-352-7572
+- classification: district
+  address: 710 Boundary St., Beaufort, SC 29902
+  voice: 843-521-2530
 links:
 - url: https://mace.house.gov
   note: website
+- url: https://www.scstatehouse.gov/member.php?code=1127840774
+- url: https://mace.house.gov/
+other_names:
+- name: Mace, N.
+- name: N. Mace
+- name: N.R. Mace
 ids:
   twitter: RepNancyMace
 other_identifiers:
@@ -49,3 +59,11 @@ other_identifiers:
   identifier: Nancy Mace
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nancy_Mace
+- url: https://en.wikipedia.org/wiki/Nancy_Mace
+- url: https://justfacts.votesmart.org/candidate/biography/146076/nancy-mace
+- url: https://mace.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nancy_mace/456843
+- url: https://www.linkedin.com/in/macenancy
+- url: https://www.scstatehouse.gov/member.php?code=1127840774
diff --git a/data/us/legislature/Nancy-Pelosi-8056c810-7170-5009-88c3-a670ab30164b.yml b/data/us/legislature/Nancy-Pelosi-8056c810-7170-5009-88c3-a670ab30164b.yml
index 869bd35327..e107b61a64 100644
--- a/data/us/legislature/Nancy-Pelosi-8056c810-7170-5009-88c3-a670ab30164b.yml
+++ b/data/us/legislature/Nancy-Pelosi-8056c810-7170-5009-88c3-a670ab30164b.yml
@@ -2,120 +2,126 @@ id: ocd-person/8056c810-7170-5009-88c3-a670ab30164b
 name: Nancy Pelosi
 given_name: Nancy
 family_name: Pelosi
-gender: F
 birth_date: 1940-03-26
+gender: Female
+email: https://pelosi.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/P000197.jpg
 party:
-- start_date: '1987-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+  district: CA-11
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+  district: CA-12
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+  district: CA-12
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-8
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: CA-12
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-8
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: CA-12
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-8
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-12
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-8
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-8
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-8
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-8
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-5
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-5
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-11
+  district: CA-5
 offices:
 - classification: capitol
-  address: 1236 Longworth House Office Building Washington DC 20515-0511
+  address: 1236 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4965
+  fax: 202-225-8259
 - classification: district
-  address: 90 7th St. Suite 2-800; San Francisco, CA 94103
+  address: San Francisco Federal Building 90 7th St., Suite 2-800, San Francisco,
+    CA 94103
   voice: 415-556-4862
-  name: 'District Office #1'
+  fax: 415-861-1670
 links:
 - url: https://pelosi.house.gov
   note: website
+- url: https://pelosi.house.gov/
+other_names:
+- name: N. Pelosi
+- name: N.P. Pelosi
+- name: Pelosi, N.
 ids:
   twitter: SpeakerPelosi
   youtube: UCxPeEcH0xaCK9nBK98EFhDg
@@ -151,3 +157,11 @@ other_identifiers:
   identifier: kg:/m/012v1t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nancy_Pelosi
+- url: https://en.wikipedia.org/wiki/Nancy_Pelosi
+- url: https://justfacts.votesmart.org/candidate/26732/nancy-pelosi
+- url: https://pelosi.house.gov
+- url: https://pelosi.house.gov/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nancy_pelosi/400314
+- url: https://www.pelosiforcongress.org/about
diff --git a/data/us/legislature/Nanette-Diaz-Barragn-5ec7a759-2c3a-5270-8328-13c7ac611580.yml b/data/us/legislature/Nanette-Diaz-Barragn-5ec7a759-2c3a-5270-8328-13c7ac611580.yml
index e83e94f893..a5d297b4bd 100644
--- a/data/us/legislature/Nanette-Diaz-Barragn-5ec7a759-2c3a-5270-8328-13c7ac611580.yml
+++ b/data/us/legislature/Nanette-Diaz-Barragn-5ec7a759-2c3a-5270-8328-13c7ac611580.yml
@@ -1,64 +1,63 @@
 id: ocd-person/5ec7a759-2c3a-5270-8328-13c7ac611580
-name: "Nanette Diaz Barrag\xE1n"
+name: "Nanette Barrag\xE1n"
 given_name: Nanette
 family_name: "Barrag\xE1n"
-middle_name: Diaz
-gender: F
 birth_date: 1976-09-15
+gender: Female
+email: https://barragan.house.gov/email/
 image: https://theunitedstates.io/images/congress/450x550/B001300.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-44
 offices:
 - classification: capitol
-  address: 2312 Rayburn House Office Building Washington DC 20515-0544
+  address: 2312 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8220
 - classification: district
-  address: 701 E. Carson St.; Carson, CA 90745
+  address: 302 W. 5th St. Suite 201, San Pedro, CA 90731
   voice: 310-831-1799
-  name: 'District Office #1'
 - classification: district
-  address: 205 S. Willowbrook Ave.; Compton, CA 90220
+  address: 4201 Long Beach Blvd. Suite 422, Long Beach, CA 90807
   voice: 310-831-1799
-  name: 'District Office #2'
 - classification: district
-  address: 302 W. Fifth St. Suite 201; San Pedro, CA 90731
+  address: 701 E. Carson St., Carson, CA 90745
   voice: 310-831-1799
-  name: 'District Office #3'
 - classification: district
-  address: 8650 California Ave.; South Gate, CA 90280
+  address: 8650 California Ave., South Gate, CA 90280
   voice: 310-831-1799
-  name: 'District Office #4'
 links:
 - url: https://barragan.house.gov
   note: website
+- url: https://barragan.house.gov/
+other_names:
+- name: Barragan
+- name: "Barrag\xE1n, N."
+- name: "N. Barrag\xE1n"
+- name: "N.D. Barrag\xE1n"
+- name: "Nanette Diaz Barrag\xE1n"
 ids:
   twitter: RepBarragan
   facebook: CongresswomanBarragan
-other_names:
-- name: Barragan
 other_identifiers:
 - scheme: bioguide
   identifier: B001300
@@ -86,3 +85,9 @@ other_identifiers:
   identifier: "Nanette Barrag\xE1n"
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nanette_Barragan
+- url: https://barragan.house.gov
+- url: https://en.wikipedia.org/wiki/Nanette_Barrag%c3%a1n
+- url: https://justfacts.votesmart.org/candidate/biography/166270/nanette-barragan
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/nanette-barragan-4482605
diff --git a/data/us/legislature/Nathaniel-Moran-0c6bf250-87f0-5c8b-8c0f-31366a703a37.yml b/data/us/legislature/Nathaniel-Moran-0c6bf250-87f0-5c8b-8c0f-31366a703a37.yml
index 52c25b5052..8cecf50736 100644
--- a/data/us/legislature/Nathaniel-Moran-0c6bf250-87f0-5c8b-8c0f-31366a703a37.yml
+++ b/data/us/legislature/Nathaniel-Moran-0c6bf250-87f0-5c8b-8c0f-31366a703a37.yml
@@ -2,29 +2,43 @@ id: ocd-person/0c6bf250-87f0-5c8b-8c0f-31366a703a37
 name: Nathaniel Moran
 given_name: Nathaniel
 family_name: Moran
-middle_name: Quentin
-gender: M
-birth_date: 1974-07-22
+birth_date: 1974-09-23
+gender: Male
+email: https://moran.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/M001224.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-1
 offices:
 - classification: capitol
-  address: 1541 Longworth House Office Building Washington DC 20515-4301
+  address: 1541 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3035
+- classification: district
+  address: 100 N. Bolivar St. Suite 205, Marshall, TX 75670
+  voice: 903-561-6349
+- classification: district
+  address: 101 E. Methvin St. Suite 302, Longview, TX 75601
+  voice: 903-561-6349
+- classification: district
+  address: 1121 ESE Loop 323 Suite 206, Tyler, TX 75701
+  voice: 903-561-6349
+- classification: district
+  address: 2500 N. Robison Road Suite 190, Texarkana, TX 75501
+  voice: 903-561-6349
 links:
 - url: https://moran.house.gov
   note: website
+- url: https://moran.house.gov/
 other_names:
 - name: Moran
+- name: Moran, N.
+- name: N. Moran
+- name: N.Q. Moran
 other_identifiers:
 - scheme: bioguide
   identifier: M001224
@@ -44,3 +58,10 @@ other_identifiers:
   identifier: Nathaniel Moran
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nathaniel_Moran
+- url: https://en.wikipedia.org/wiki/Nathaniel_Moran
+- url: https://justfacts.votesmart.org/candidate/79156/nathaniel-moran
+- url: https://moran.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nathaniel_moran/456940
+- url: https://www.linkedin.com/in/nathaniel-moran-1b9a4016
diff --git a/data/us/legislature/Neal-P-Dunn-cebc95c4-7c20-58c5-829c-c3391f0761fa.yml b/data/us/legislature/Neal-P-Dunn-cebc95c4-7c20-58c5-829c-c3391f0761fa.yml
index c5cf87d296..553d259141 100644
--- a/data/us/legislature/Neal-P-Dunn-cebc95c4-7c20-58c5-829c-c3391f0761fa.yml
+++ b/data/us/legislature/Neal-P-Dunn-cebc95c4-7c20-58c5-829c-c3391f0761fa.yml
@@ -1,59 +1,61 @@
 id: ocd-person/cebc95c4-7c20-58c5-829c-c3391f0761fa
-name: Neal P. Dunn
+name: Neal Dunn
 given_name: Neal
 family_name: Dunn
-middle_name: P.
-gender: M
 birth_date: 1953-02-16
+gender: Male
+email: https://dunn.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/D000628.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-2
 offices:
 - classification: capitol
-  address: 466 Cannon House Office Building Washington DC 20515-0902
+  address: 300 S. Adams St., Tallahassee, FL 32301
+  voice: 850-891-8610
+  fax: 850-891-8620
+- classification: capitol
+  address: 466 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5235
+  fax: 202-225-5615
 - classification: district
-  address: 840 W. 11th St. Suite 2250; Panama City, FL 32401
+  address: 840 W. 11th St. Suite 2250, Panama City, FL 32401
   voice: 850-785-0812
   fax: 850-763-3764
-  name: 'District Office #1'
-- classification: district
-  address: 300 S. Adams St.; Tallahassee, FL 32301
-  voice: 850-891-8610
-  fax: 850-891-8620
-  name: 'District Office #2'
 links:
 - url: https://dunn.house.gov
   note: website
+- url: https://dunn.house.gov/
+other_names:
+- name: Dunn (FL)
+- name: Dunn, N.
+- name: N. Dunn
+- name: N.P. Dunn
+- name: Neal P. Dunn
 ids:
   twitter: DrNealDunnFL2
   youtube: UCRTGfrYP-RuDzJ2KGok7TRA
   facebook: drnealdunnfl2
-other_names:
-- name: Dunn (FL)
 other_identifiers:
 - scheme: bioguide
   identifier: D000628
@@ -81,3 +83,10 @@ other_identifiers:
   identifier: Neal Dunn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Neal_Dunn
+- url: https://dunn.house.gov
+- url: https://en.wikipedia.org/wiki/Neal_Dunn
+- url: https://justfacts.votesmart.org/candidate/biography/166297/neal-dunn
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/neal_dunn/412691
+- url: https://www.linkedin.com/in/neal-p-dunn-md-facs-1b977632
diff --git a/data/us/legislature/Nicholas-A-Langworthy-a4321566-0258-5d46-bc51-c1f77ba95ba0.yml b/data/us/legislature/Nicholas-A-Langworthy-a4321566-0258-5d46-bc51-c1f77ba95ba0.yml
index e4eef37215..db60e03cfb 100644
--- a/data/us/legislature/Nicholas-A-Langworthy-a4321566-0258-5d46-bc51-c1f77ba95ba0.yml
+++ b/data/us/legislature/Nicholas-A-Langworthy-a4321566-0258-5d46-bc51-c1f77ba95ba0.yml
@@ -1,28 +1,44 @@
 id: ocd-person/a4321566-0258-5d46-bc51-c1f77ba95ba0
-name: Nicholas A. Langworthy
-given_name: Nicholas
+name: Nick Langworthy
+given_name: Nick
 family_name: Langworthy
-middle_name: A.
-gender: M
 birth_date: 1981-02-27
+gender: Male
+email: https://langworthy.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000600.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-23
 offices:
 - classification: capitol
-  address: 1630 Longworth House Office Building Washington DC 20515-3223
+  address: 1630 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3161
+- classification: district
+  address: 1 Bluebird Square, Olean, NY 14760
+  voice: 585-543-5033
+- classification: district
+  address: 8201 Main St. Suite 13-14, Williamsville, NY 14221
+  voice: 716-547-6844
+- classification: district
+  address: 89 W. Market St., Corning, NY 14830
+  voice: 607-377-3130
+- classification: district
+  address: The Fenton Building 2-6 E. 2nd St., Room 208, Jamestown, NY 14701
+  voice: 716-488-8111
 links:
 - url: https://langworthy.house.gov
   note: website
+- url: https://langworthy.house.gov/
+other_names:
+- name: Langworthy, N.
+- name: N. Langworthy
+- name: N.A. Langworthy
+- name: Nicholas A. Langworthy
 other_identifiers:
 - scheme: bioguide
   identifier: L000600
@@ -42,3 +58,9 @@ other_identifiers:
   identifier: '208663'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nicholas_A._Langworthy
+- url: https://en.wikipedia.org/wiki/Nick_Langworthy
+- url: https://langworthy.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nicholas_langworthy/456927
+- url: https://www.linkedin.com/in/nicklangworthy
diff --git a/data/us/legislature/Nick-LaLota-30fe5d74-0224-5d11-92d2-5766471e6cc5.yml b/data/us/legislature/Nick-LaLota-30fe5d74-0224-5d11-92d2-5766471e6cc5.yml
index 9d6f602bcd..6067d21eaf 100644
--- a/data/us/legislature/Nick-LaLota-30fe5d74-0224-5d11-92d2-5766471e6cc5.yml
+++ b/data/us/legislature/Nick-LaLota-30fe5d74-0224-5d11-92d2-5766471e6cc5.yml
@@ -1,28 +1,37 @@
 id: ocd-person/30fe5d74-0224-5d11-92d2-5766471e6cc5
 name: Nick LaLota
-given_name: Nicolas
+given_name: Nick
 family_name: LaLota
-middle_name: Joseph
-gender: M
 birth_date: 1978-06-23
+gender: Male
+email: https://lalota.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000598.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-1
 offices:
 - classification: capitol
-  address: 1530 Longworth House Office Building Washington DC 20515-3201
+  address: 1530 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3826
+- classification: district
+  address: 515 Route 111 Suite 3B, Hauppauge, NY 11788
+  voice: 631-289-1097
+- classification: district
+  address: Rocky Point VFW Post 6249 109 King Road, Rocky Point, NY 11778
+  voice: 631-289-1097
 links:
 - url: https://lalota.house.gov
   note: website
+- url: https://lalota.house.gov/
+other_names:
+- name: LaLota, N.
+- name: N. LaLota
+- name: N.J. LaLota
 ids:
   twitter: RepLaLota
 other_identifiers:
@@ -42,3 +51,9 @@ other_identifiers:
   identifier: '191957'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nicholas_J._Lalota
+- url: https://en.wikipedia.org/wiki/Nick_LaLota
+- url: https://lalota.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nicolas_lalota/456920
+- url: https://www.linkedin.com/in/nicklalota
diff --git a/data/us/legislature/Nicole-Malliotakis-d47735a4-c407-5389-bfd2-f638ffccdd06.yml b/data/us/legislature/Nicole-Malliotakis-d47735a4-c407-5389-bfd2-f638ffccdd06.yml
index e5178e7988..9c1cf9aec4 100644
--- a/data/us/legislature/Nicole-Malliotakis-d47735a4-c407-5389-bfd2-f638ffccdd06.yml
+++ b/data/us/legislature/Nicole-Malliotakis-d47735a4-c407-5389-bfd2-f638ffccdd06.yml
@@ -2,31 +2,41 @@ id: ocd-person/d47735a4-c407-5389-bfd2-f638ffccdd06
 name: Nicole Malliotakis
 given_name: Nicole
 family_name: Malliotakis
-gender: F
 birth_date: 1980-11-11
+gender: Female
+email: https://malliotakis.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M000317.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-11
 offices:
 - classification: capitol
-  address: 351 Cannon House Office Building Washington DC 20515-3211
+  address: 351 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3371
+- classification: district
+  address: 1698 Victory Blvd. Suite 2L, Staten Island, NY 10314
+  voice: 718-568-2870
+- classification: district
+  address: 7716 3rd Ave., Brooklyn, NY 11209
+  voice: 718-306-1620
 links:
 - url: https://malliotakis.house.gov
   note: website
+- url: https://malliotakis.house.gov/
+other_names:
+- name: Malliotakis, N.
+- name: N. Malliotakis
+- name: N.R. Malliotakis
 ids:
   twitter: RepMalliotakis
 other_identifiers:
@@ -46,3 +56,9 @@ other_identifiers:
   identifier: kg:/m/0g5817m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nicole_Malliotakis
+- url: https://en.wikipedia.org/wiki/Nicole_Malliotakis
+- url: https://justfacts.votesmart.org/candidate/biography/127929/nicole-malliotakis
+- url: https://malliotakis.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nicole_malliotakis/456837
diff --git a/data/us/legislature/Nikema-Williams-132a1bba-204a-5d4f-a406-40b4342bad1b.yml b/data/us/legislature/Nikema-Williams-132a1bba-204a-5d4f-a406-40b4342bad1b.yml
index 395daa0e45..6c74aa863b 100644
--- a/data/us/legislature/Nikema-Williams-132a1bba-204a-5d4f-a406-40b4342bad1b.yml
+++ b/data/us/legislature/Nikema-Williams-132a1bba-204a-5d4f-a406-40b4342bad1b.yml
@@ -2,36 +2,42 @@ id: ocd-person/132a1bba-204a-5d4f-a406-40b4342bad1b
 name: Nikema Williams
 given_name: Nikema
 family_name: Williams
-middle_name: Natassha
-gender: F
 birth_date: 1978-07-30
+gender: Female
+email: https://nikemawilliams.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/W000788.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-5
 offices:
 - classification: capitol
-  address: 1406 Longworth House Office Building Washington DC 20515-1005
+  address: 1406 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3801
+- classification: district
+  address: 100 Peachtree St. NW Suite 1920, Atlanta, GA 30303
+  voice: 404-659-0116
+  fax: 404-331-0947
 links:
 - url: https://nikemawilliams.house.gov
   note: website
-ids:
-  twitter: RepNikema
+- url: https://nikemawilliams.house.gov/
 other_names:
+- name: N. Williams
+- name: N.N. Williams
 - name: Williams (GA)
+- name: Williams, N.
+ids:
+  twitter: RepNikema
 other_identifiers:
 - scheme: bioguide
   identifier: W000788
@@ -51,3 +57,10 @@ other_identifiers:
   identifier: Nikema Williams
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nikema_Williams
+- url: https://en.wikipedia.org/wiki/Nikema_Williams
+- url: https://justfacts.votesmart.org/candidate/biography/176751/nikema-williams
+- url: https://nikemawilliams.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/nikemawilliams
+- url: https://www.nikemaforcongress.com/meet-nikema
diff --git a/data/us/legislature/Nikki-Budzinski-f2c67d83-e6fb-5fa9-aa38-663e9f62e81b.yml b/data/us/legislature/Nikki-Budzinski-f2c67d83-e6fb-5fa9-aa38-663e9f62e81b.yml
index feed676088..3995a86d75 100644
--- a/data/us/legislature/Nikki-Budzinski-f2c67d83-e6fb-5fa9-aa38-663e9f62e81b.yml
+++ b/data/us/legislature/Nikki-Budzinski-f2c67d83-e6fb-5fa9-aa38-663e9f62e81b.yml
@@ -1,28 +1,43 @@
 id: ocd-person/f2c67d83-e6fb-5fa9-aa38-663e9f62e81b
 name: Nikki Budzinski
-given_name: Nicole (Nikki)
+given_name: Nikki
 family_name: Budzinski
-middle_name: Jai
-gender: F
 birth_date: 1977-03-11
+gender: Female
+email: https://budzinski.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/B001315.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-13
 offices:
 - classification: capitol
-  address: 1009 Longworth House Office Building Washington DC 20515-1313
+  address: 1009 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2371
+- classification: capitol
+  address: 133 S. 4th St. Suite 300, Springfield, IL 62701
+  voice: 217-814-2880
+- classification: district
+  address: 1 S. Church St., Suite 500-B, Belleville, IL 62260
+  voice: 618-212-7333
+- classification: district
+  address: 1210 S. Jasper St. Suite 1, Decatur, IL 62521
+  voice: 217-859-5313
+- classification: district
+  address: 44 E. Main St. Suite 205, Champaign, IL 61820
+  voice: 217-305-6991
 links:
 - url: https://budzinski.house.gov
   note: website
+- url: https://budzinski.house.gov/
+other_names:
+- name: Budzinski, N.
+- name: N. Budzinski
+- name: N.J. Budzinski
 ids:
   twitter: RepNikkiB
 other_identifiers:
@@ -42,3 +57,9 @@ other_identifiers:
   identifier: '204328'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nikki_Budzinski
+- url: https://budzinski.house.gov
+- url: https://en.wikipedia.org/wiki/Nikki_Budzinski
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/nicole_nikki_budzinski/456901
+- url: https://www.linkedin.com/in/nikkibudzinski
diff --git a/data/us/legislature/Norma-J-Torres-32caaab6-5712-57c2-83c6-7b226b2c1056.yml b/data/us/legislature/Norma-J-Torres-32caaab6-5712-57c2-83c6-7b226b2c1056.yml
index b79159bc1c..5e089fa745 100644
--- a/data/us/legislature/Norma-J-Torres-32caaab6-5712-57c2-83c6-7b226b2c1056.yml
+++ b/data/us/legislature/Norma-J-Torres-32caaab6-5712-57c2-83c6-7b226b2c1056.yml
@@ -1,62 +1,62 @@
 id: ocd-person/32caaab6-5712-57c2-83c6-7b226b2c1056
-name: Norma J. Torres
+name: Norma Torres
 given_name: Norma
 family_name: Torres
-middle_name: J.
-gender: F
 birth_date: 1965-04-04
+gender: Female
+email: https://torres.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/T000474.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-35
 offices:
 - classification: capitol
-  address: 2227 Rayburn House Office Building Washington DC 20515-0535
+  address: 2227 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6161
+  fax: 202-225-8671
 - classification: district
-  address: 3200 Inland Empire Blvd. Suite 200B; Ontario, CA 91764
+  address: 3200 Inland Empire Blvd. Suite 200B, Ontario, CA 91764
   voice: 909-481-6474
   fax: 909-941-1362
-  name: 'District Office #1'
-- classification: district
-  address: 141 S. Riverside Ave.; Rialto, CA 92376
-  name: 'District Office #2'
 links:
 - url: https://torres.house.gov
   note: website
+- url: https://torres.house.gov/
+other_names:
+- name: N. Torres
+- name: N.J. Torres
+- name: Norma J. Torres
+- name: Torres (CA)
+- name: Torres, N.
 ids:
   twitter: NormaJTorres
   youtube: UCvWY4qKP6--o3pIJY7hhKDg
   facebook: RepNormaTorres
-other_names:
-- name: Torres (CA)
 other_identifiers:
 - scheme: bioguide
   identifier: T000474
@@ -88,3 +88,10 @@ other_identifiers:
   identifier: Norma Torres
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Norma_Torres
+- url: https://en.wikipedia.org/wiki/Norma_Torres
+- url: https://justfacts.votesmart.org/candidate/biography/71284/norma-torres
+- url: https://theunitedstates.io
+- url: https://torres.house.gov
+- url: https://www.govtrack.us/congress/members/norma_torres/412617
+- url: https://www.linkedin.com/in/norma-torres-3187a254
diff --git a/data/us/legislature/Nydia-M-Velzquez-bc18d350-32b2-5e37-8b43-6f85ae9b5b09.yml b/data/us/legislature/Nydia-M-Velzquez-bc18d350-32b2-5e37-8b43-6f85ae9b5b09.yml
index 0efc4855f1..a88e388ec3 100644
--- a/data/us/legislature/Nydia-M-Velzquez-bc18d350-32b2-5e37-8b43-6f85ae9b5b09.yml
+++ b/data/us/legislature/Nydia-M-Velzquez-bc18d350-32b2-5e37-8b43-6f85ae9b5b09.yml
@@ -1,118 +1,120 @@
 id: ocd-person/bc18d350-32b2-5e37-8b43-6f85ae9b5b09
-name: "Nydia M. Vel\xE1zquez"
+name: "Nydia Vel\xE1zquez"
 given_name: Nydia
 family_name: "Vel\xE1zquez"
-middle_name: M.
-gender: F
 birth_date: 1953-03-28
+gender: Female
+email: https://velazquez.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/V000081.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: NY-7
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: NY-7
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: NY-7
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: NY-7
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: NY-7
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-12
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: NY-7
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-12
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-12
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-12
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-12
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: NY-12
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: NY-12
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: NY-12
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NY-12
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-12
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-7
+  district: NY-12
 offices:
 - classification: capitol
-  address: 2302 Rayburn House Office Building Washington DC 20515-3207
+  address: 2302 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2361
+  fax: 202-226-0327
 - classification: district
-  address: 266 Broadway Suite 201; Brooklyn, NY 11211
+  address: 266 Broadway Suite 201, Brooklyn, NY 11211
   voice: 718-599-3658
-  name: 'District Office #1'
 - classification: district
-  address: 500 Pearl St. Suite 973; New York, NY 10007
-  voice: 212-619-2606
-  name: 'District Office #2'
+  address: 3916 47th Ave., Sunnyside, NY 11104
+  voice: 718-340-6244
 links:
 - url: https://velazquez.house.gov
   note: website
+- url: https://velazquez.house.gov/
+other_names:
+- name: "N. Vel\xE1zquez"
+- name: "N.M. Vel\xE1zquez"
+- name: NYDIA M. VELAZQUEZ
+- name: "Nydia M. Vel\xE1zquez"
+- name: Velazquez
+- name: "Vel\xE1zquez, N."
 ids:
   twitter: NydiaVelazquez
   youtube: UCqMKPkKeeHFOOiZ9vxhXGVg
   facebook: '8037068318'
-other_names:
-- name: NYDIA M. VELAZQUEZ
-- name: Velazquez
 other_identifiers:
 - scheme: bioguide
   identifier: V000081
@@ -144,3 +146,11 @@ other_identifiers:
   identifier: Nydia Velazquez
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Nydia_Velazquez
+- url: https://chci.org/staff-and-leadership/rep-nydia-velazquez
+- url: https://en.wikipedia.org/wiki/Nydia_Vel%C3%A1zquez
+- url: https://justfacts.votesmart.org/candidate/26975/nydia-velazquez
+- url: https://theunitedstates.io
+- url: https://velazquez.house.gov
+- url: https://velazquez.house.gov/about/full-biography
+- url: https://www.govtrack.us/congress/members/nydia_velazquez/400416
diff --git a/data/us/legislature/Pat-Fallon-425d847d-6fbf-55a7-a117-76bca5e3f299.yml b/data/us/legislature/Pat-Fallon-425d847d-6fbf-55a7-a117-76bca5e3f299.yml
index 9c4c132642..f84a1ae847 100644
--- a/data/us/legislature/Pat-Fallon-425d847d-6fbf-55a7-a117-76bca5e3f299.yml
+++ b/data/us/legislature/Pat-Fallon-425d847d-6fbf-55a7-a117-76bca5e3f299.yml
@@ -1,33 +1,46 @@
 id: ocd-person/425d847d-6fbf-55a7-a117-76bca5e3f299
 name: Pat Fallon
-given_name: Patrick
+given_name: Pat
 family_name: Fallon
-middle_name: Edward
-gender: M
 birth_date: 1967-12-19
+gender: Male
+email: https://fallon.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000246.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-4
 offices:
 - classification: capitol
-  address: 2416 Rayburn House Office Building Washington DC 20515-4304
+  address: 2416 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6673
+- classification: district
+  address: 100 W. Houston St. Suite 14, Sherman, TX 75090
+  voice: 903-820-5170
+- classification: district
+  address: 15 James Carlow Drive, New Boston, TX 75570
+  voice: 903-716-7500
+- classification: district
+  address: 6531 Horizon Road Suite A, Rockwall, TX 75032
+  voice: 972-771-0100
+  fax: 972-771-1222
 links:
 - url: https://fallon.house.gov
   note: website
+- url: https://fallon.house.gov/
+other_names:
+- name: Fallon, P.
+- name: P. Fallon
+- name: P.E. Fallon
 ids:
   twitter: RepPatFallon
 other_identifiers:
@@ -47,3 +60,10 @@ other_identifiers:
   identifier: kg:/m/0100nvdw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pat_Fallon
+- url: https://en.wikipedia.org/wiki/Pat_Fallon
+- url: https://fallon.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/115056/pat-fallon
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/patrick_fallon/456845
+- url: https://www.linkedin.com/in/patrick-fallon-09261b63
diff --git a/data/us/legislature/Patrick-Ryan-10de7024-4b40-57b0-ae78-101372fd4a02.yml b/data/us/legislature/Patrick-Ryan-10de7024-4b40-57b0-ae78-101372fd4a02.yml
index 902a7dd2c3..e6d3000665 100644
--- a/data/us/legislature/Patrick-Ryan-10de7024-4b40-57b0-ae78-101372fd4a02.yml
+++ b/data/us/legislature/Patrick-Ryan-10de7024-4b40-57b0-ae78-101372fd4a02.yml
@@ -1,32 +1,43 @@
 id: ocd-person/10de7024-4b40-57b0-ae78-101372fd4a02
-name: Patrick Ryan
-given_name: Patrick
+name: Pat Ryan
+given_name: Pat
 family_name: Ryan
-gender: M
 birth_date: 1982-03-28
+gender: Male
+email: https://patryan.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/R000579.jpg
 party:
-- start_date: '2022-09-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2022-09-13'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-19
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-18
+- start_date: 2022-09-13
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-18
+  district: NY-19
 offices:
 - classification: capitol
-  address: 1030 Longworth House Office Building Washington DC 20515-3218
+  address: 1030 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5614
+- classification: district
+  address: 307 Wall St. Suite 6, Kingston, NY 12401
+  voice: 845-443-2930
+- classification: district
+  address: 605 Broadway, Newburgh, NY 12550
+  voice: 845-443-2930
 links:
 - url: https://patryan.house.gov
   note: website
+- url: https://patryan.house.gov/
+other_names:
+- name: P. Ryan
+- name: P.K. Ryan
+- name: Patrick Ryan
+- name: Ryan, P.
 ids:
   twitter: RepPatRyanNY
 other_identifiers:
@@ -50,3 +61,9 @@ other_identifiers:
   identifier: '180314'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pat_Ryan_(New_York)
+- url: https://en.wikipedia.org/wiki/Pat_Ryan_(politician)
+- url: https://patryan.house.gov
+- url: https://patryan.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/pkryan04
diff --git a/data/us/legislature/Patrick-T-McHenry-3ae689a1-81a2-5c40-b26e-ee49648945d6.yml b/data/us/legislature/Patrick-T-McHenry-3ae689a1-81a2-5c40-b26e-ee49648945d6.yml
index 39d6e43a6d..b599cb97c4 100644
--- a/data/us/legislature/Patrick-T-McHenry-3ae689a1-81a2-5c40-b26e-ee49648945d6.yml
+++ b/data/us/legislature/Patrick-T-McHenry-3ae689a1-81a2-5c40-b26e-ee49648945d6.yml
@@ -1,87 +1,82 @@
 id: ocd-person/3ae689a1-81a2-5c40-b26e-ee49648945d6
-name: Patrick T. McHenry
+name: Patrick McHenry
 given_name: Patrick
 family_name: McHenry
-middle_name: T.
-gender: M
 birth_date: 1975-10-22
+gender: Male
+email: https://mchenry.house.gov/contact/zipauth.htm
 image: https://theunitedstates.io/images/congress/450x550/M001156.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-10
 offices:
 - classification: capitol
-  address: 2134 Rayburn House Office Building Washington DC 20515-3310
+  address: 2134 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2576
+  fax: 202-225-0316
 - classification: district
-  address: 160 Midland Ave.; Black Mountain, NC 28711
-  voice: 828-669-0600
-  name: 'District Office #1'
-- classification: district
-  address: 128 W. Main Ave. Suite 115; Gastonia, NC 28052
-  voice: 704-833-0096
-  fax: 704-833-0887
-  name: 'District Office #2'
-- classification: district
-  address: 1990 Main Ave. SE PO Box 1830; Hickory, NC 28603
+  address: P.O. Box 1830 1990 Main Ave. SE, Hickory, NC 28603
   voice: 828-327-6100
   fax: 828-327-8311
-  name: 'District Office #3'
 links:
 - url: https://mchenry.house.gov
   note: website
+- url: https://mchenry.house.gov/
+other_names:
+- name: McHenry, P.
+- name: P. McHenry
+- name: P.T. McHenry
+- name: Patrick T. McHenry
 ids:
   twitter: PatrickMcHenry
   youtube: UCY3PTRhkSH-eoltxPVZKD-w
@@ -117,3 +112,11 @@ other_identifiers:
   identifier: kg:/m/02b4rz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Patrick_McHenry
+- url: https://en.wikipedia.org/wiki/Patrick_McHenry
+- url: https://justfacts.votesmart.org/candidate/21031/patrick-mchenry
+- url: https://mchenry.house.gov
+- url: https://mchenry.house.gov/biography
+- url: https://mchenryforcongress.com/meet-patrick
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/patrick_mchenry/400644
diff --git a/data/us/legislature/Patty-Murray-eb3ab543-13a1-53db-a8a1-459e8e91b701.yml b/data/us/legislature/Patty-Murray-eb3ab543-13a1-53db-a8a1-459e8e91b701.yml
index 9263689935..cfe6864b3f 100644
--- a/data/us/legislature/Patty-Murray-eb3ab543-13a1-53db-a8a1-459e8e91b701.yml
+++ b/data/us/legislature/Patty-Murray-eb3ab543-13a1-53db-a8a1-459e8e91b701.yml
@@ -2,88 +2,85 @@ id: ocd-person/eb3ab543-13a1-53db-a8a1-459e8e91b701
 name: Patty Murray
 given_name: Patty
 family_name: Murray
-gender: F
 birth_date: 1950-10-11
+gender: Female
+email: https://www.murray.senate.gov/write-to-patty/
 image: https://theunitedstates.io/images/congress/450x550/M001111.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '1999-01-06'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2011-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2005-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 1993-01-05
+  end_date: 1999-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Washington
 offices:
 - classification: capitol
-  address: 154 Russell Senate Office Building Washington DC 20510
+  address: 154 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-2621
+  fax: 202-224-0238
 - classification: district
-  address: 2930 Wetmore Ave. Suite 9D; Everett, WA 98201
+  address: 2930 Wetmore Ave. Suite 9D, Everett, WA 98201
   voice: 425-259-6515
   fax: 425-259-7152
-  name: 'District Office #1'
 - classification: district
-  address: '915 2nd Ave. #2988; Seattle, WA 98174'
+  address: 2988 Jackson Federal Building 915 2nd Ave., Seattle, WA 98174
   voice: 206-553-5545
   fax: 206-553-0891
-  name: 'District Office #2'
 - classification: district
-  address: 10 N. Post St. Suite 600; Spokane, WA 99201
+  address: 825 Jadwin Ave. Suite 160K, Richland, WA 99352
+  voice: 509-453-7462
+- classification: district
+  address: 920 W. Riverside Ave. Suite 485, Spokane, WA 99201
   voice: 509-624-9515
   fax: 509-624-9561
-  name: 'District Office #3'
 - classification: district
-  address: 950 Pacific Ave. Suite 650; Tacoma, WA 98402
+  address: 950 Pacific Ave. Suite 650, Tacoma, WA 98402
   voice: 253-572-3636
   fax: 253-572-9488
-  name: 'District Office #4'
 - classification: district
-  address: 1323 Officer's Row; Vancouver, WA 98661
+  address: The Marshall House 1323 Officer's Row, Vancouver, WA 98661
   voice: 360-696-7797
   fax: 360-696-7798
-  name: 'District Office #5'
-- classification: district
-  address: 402 E. Yakima Ave. Suite 420; Yakima, WA 98901
-  voice: 509-453-7462
-  fax: 509-453-7731
-  name: 'District Office #6'
 links:
 - url: https://www.murray.senate.gov
   note: website
 - url: https://www.murray.senate.gov/write-to-patty/
   note: contact form
+- url: https://www.murray.senate.gov/
+other_names:
+- name: Murray (D-WA)
+- name: Murray, P.
+- name: P. Murray
+- name: P.L. Murray
 ids:
   twitter: PattyMurray
   youtube: UCb8jq3TvQ3AzKsexhWfFLoA
-other_names:
-- name: Murray (D-WA)
 other_identifiers:
 - scheme: bioguide
   identifier: M001111
@@ -117,3 +114,11 @@ other_identifiers:
   identifier: kg:/m/018qx5
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Patty_Murray
+- url: https://en.wikipedia.org/wiki/Patty_Murray
+- url: https://justfacts.votesmart.org/candidate/53358/patty-murray
+- url: https://pattymurray.com/bio
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/patty_murray/300076
+- url: https://www.murray.senate.gov
+- url: https://www.murray.senate.gov/biography
diff --git a/data/us/legislature/Paul-A-Gosar-5eae38e3-8420-5c09-831a-db73d9cba978.yml b/data/us/legislature/Paul-A-Gosar-5eae38e3-8420-5c09-831a-db73d9cba978.yml
index 40133dcd10..0d363b3d4f 100644
--- a/data/us/legislature/Paul-A-Gosar-5eae38e3-8420-5c09-831a-db73d9cba978.yml
+++ b/data/us/legislature/Paul-A-Gosar-5eae38e3-8420-5c09-831a-db73d9cba978.yml
@@ -1,69 +1,65 @@
 id: ocd-person/5eae38e3-8420-5c09-831a-db73d9cba978
-name: Paul A. Gosar
+name: Paul Gosar
 given_name: Paul
 family_name: Gosar
-middle_name: A.
-gender: M
-birth_date: 1958-11-22
+birth_date: 1958-11-27
+gender: Male
+email: https://gosar.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/G000565.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: AZ-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-9
+  district: AZ-1
 offices:
 - classification: capitol
-  address: 2057 Rayburn House Office Building Washington DC 20515-0309
+  address: 2057 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2315
 - classification: district
-  address: 220 N. 4th St.; Kingman, AZ 86401
-  name: 'District Office #1'
-- classification: district
-  address: '6499 S. Kings Ranch Rd. #4; Gold Canyon, AZ 85118'
-  voice: 480-882-2697
-  name: 'District Office #2'
-- classification: district
-  address: 122 N. Cortez St. Suite 104; Prescott, AZ 86301
-  voice: 928-445-1683
-  name: 'District Office #3'
+  address: 1300 S. Litchfield Road Suite 115-H, Goodyear, AZ 85338
+  voice: 623-707-0530
 links:
 - url: https://gosar.house.gov
   note: website
+- url: https://gosar.house.gov/
+other_names:
+- name: Gosar, P.
+- name: P. Gosar
+- name: P.A. Gosar
+- name: Paul A. Gosar
 ids:
   twitter: RepGosar
   youtube: UC5orqw_9acsKWSRbrqTDXBw
@@ -99,3 +95,12 @@ other_identifiers:
   identifier: kg:/m/0czdqz0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Paul_Gosar
+- url: https://en.wikipedia.org/wiki/Paul_Gosar
+- url: https://gosar.house.gov
+- url: https://justfacts.votesmart.org/candidate/123491/paul-gosar
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/paul_gosar/412397
+- url: https://www.linkedin.com/in/dr-paul-a-gosar-a55920a0
+- url: https://www.linkedin.com/in/paul-gosar-68650716
+- url: https://www.linkedin.com/in/paul-gosar-68650716
diff --git a/data/us/legislature/Paul-Tonko-19360ce3-5ad4-5b67-b253-0239a5360fbb.yml b/data/us/legislature/Paul-Tonko-19360ce3-5ad4-5b67-b253-0239a5360fbb.yml
index 5ef71d0cbf..be7c0a877f 100644
--- a/data/us/legislature/Paul-Tonko-19360ce3-5ad4-5b67-b253-0239a5360fbb.yml
+++ b/data/us/legislature/Paul-Tonko-19360ce3-5ad4-5b67-b253-0239a5360fbb.yml
@@ -2,76 +2,74 @@ id: ocd-person/19360ce3-5ad4-5b67-b253-0239a5360fbb
 name: Paul Tonko
 given_name: Paul
 family_name: Tonko
-gender: M
 birth_date: 1949-06-18
+gender: Male
+email: https://tonko.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/T000469.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-21
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: NY-20
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-21
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: NY-20
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-20
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-20
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-20
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-20
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-20
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-21
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-20
+  district: NY-21
 offices:
 - classification: capitol
-  address: 2369 Rayburn House Office Building Washington DC 20515-3220
-  voice: 202-225-5076
-- classification: district
-  address: 19 Dove St. Suite 302; Albany, NY 12210
+  address: 19 Dove St. Unit 302, Albany, NY 12210
   voice: 518-465-0700
   fax: 518-427-5107
-  name: 'District Office #1'
-- classification: district
-  address: 61 Church St. Room 309; Amsterdam, NY 12010
-  voice: 518-843-3400
-  fax: 518-843-8874
-  name: 'District Office #2'
+- classification: capitol
+  address: 2369 Rayburn House Office Building, Washington, DC 20515
+  voice: 202-225-5076
+  fax: 202-225-5077
 - classification: district
-  address: 105 Jay St. Room 15; Schenectady, NY 12305
+  address: 433 Broadway Suite 201, Saratoga Springs, NY 12866
   voice: 518-374-4547
-  fax: 518-374-7908
-  name: 'District Office #3'
+  fax: 202-427-5107
 links:
 - url: https://tonko.house.gov
   note: website
+- url: https://tonko.house.gov/
+other_names:
+- name: P. Tonko
+- name: P.D. Tonko
+- name: Tonko, P.
 ids:
   twitter: RepPaulTonko
   youtube: UC3P2SGFmmuCYRsjeso0hOQQ
@@ -107,3 +105,10 @@ other_identifiers:
   identifier: Paul Tonko
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Paul_Tonko
+- url: https://en.wikipedia.org/wiki/Paul_Tonko
+- url: https://justfacts.votesmart.org/candidate/4403/paul-tonko
+- url: https://paultonko.com/meet-paul
+- url: https://theunitedstates.io
+- url: https://tonko.house.gov
+- url: https://www.govtrack.us/congress/members/paul_tonko/412319
diff --git a/data/us/legislature/Pete-Aguilar-705749f4-c12c-5090-88fa-012d36611500.yml b/data/us/legislature/Pete-Aguilar-705749f4-c12c-5090-88fa-012d36611500.yml
index 90f3d50c9e..576a902cb2 100644
--- a/data/us/legislature/Pete-Aguilar-705749f4-c12c-5090-88fa-012d36611500.yml
+++ b/data/us/legislature/Pete-Aguilar-705749f4-c12c-5090-88fa-012d36611500.yml
@@ -2,51 +2,55 @@ id: ocd-person/705749f4-c12c-5090-88fa-012d36611500
 name: Pete Aguilar
 given_name: Pete
 family_name: Aguilar
-gender: M
 birth_date: 1979-06-19
+gender: Male
+email: https://aguilar.house.gov/email-me/
 image: https://theunitedstates.io/images/congress/450x550/A000371.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-31
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-33
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-31
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-31
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-31
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-33
+  district: CA-31
 offices:
 - classification: capitol
-  address: 108 Cannon House Office Building Washington DC 20515-0533
+  address: 108 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3201
+  fax: 202-226-6962
 - classification: district
-  address: 685 E. Carnegie Dr. Suite 100; San Bernardino, CA 92408
+  address: 685 E. Carnegie Drive Suite 100, San Bernardino, CA 92408
   voice: 909-890-4445
   fax: 909-890-9643
-  name: 'District Office #1'
 links:
 - url: https://aguilar.house.gov
   note: website
+- url: https://aguilar.house.gov/
+other_names:
+- name: Aguilar, P.
+- name: P. Aguilar
+- name: P.R. Aguilar
 ids:
   twitter: RepPeteAguilar
   youtube: UCxwbFLOlKDsXrwizV5jah7g
@@ -80,3 +84,10 @@ other_identifiers:
   identifier: Pete Aguilar
 sources:
 - url: https://theunitedstates.io/
+- url: https://aguilar.house.gov
+- url: https://ballotpedia.org/Pete_Aguilar
+- url: https://en.wikipedia.org/wiki/Pete_Aguilar
+- url: https://justfacts.votesmart.org/candidate/biography/70114/pete-aguilar
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/pete_aguilar/412615
+- url: https://www.linkedin.com/in/aguilarpete
diff --git a/data/us/legislature/Pete-Ricketts-e1b9405a-e695-5bc5-b3b0-6cdc1415f53c.yml b/data/us/legislature/Pete-Ricketts-e1b9405a-e695-5bc5-b3b0-6cdc1415f53c.yml
index 930e88f1d5..fbba297f6f 100644
--- a/data/us/legislature/Pete-Ricketts-e1b9405a-e695-5bc5-b3b0-6cdc1415f53c.yml
+++ b/data/us/legislature/Pete-Ricketts-e1b9405a-e695-5bc5-b3b0-6cdc1415f53c.yml
@@ -2,30 +2,45 @@ id: ocd-person/e1b9405a-e695-5bc5-b3b0-6cdc1415f53c
 name: Pete Ricketts
 given_name: Pete
 family_name: Ricketts
-gender: M
 birth_date: 1964-08-19
+gender: Male
+email: https://www.ricketts.senate.gov/share-your-opinion/
 image: https://theunitedstates.io/images/congress/450x550/R000618.jpg
 party:
-- start_date: '2023-01-23'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-23'
-  end_date: '2025-01-03'
+- start_date: 2023-01-23
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Nebraska
 offices:
 - classification: capitol
-  address: 139 Russell Senate Office Building Washington DC 20510
+  address: 139 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4224
+- classification: district
+  address: 115 Railway St. Suite C102, Scottsbluff, NE 69361
+  voice: 308-632-6032
+- classification: district
+  address: 1248 O St. Suite 1000, Lincoln, NE 68508
+  voice: 402-476-1400
+- classification: district
+  address: 304 N. 168th Circle Suite 213, Omaha, NE 68118
+  voice: 402-550-8040
+- classification: district
+  address: 4111 4th Ave. Suite 26, Kearney, NE 68845
+  voice: 308-233-3677
 links:
 - url: https://www.ricketts.senate.gov
   note: website
 - url: https://www.ricketts.senate.gov/contact/
   note: contact form
+- url: https://www.ricketts.senate.gov/
 other_names:
+- name: J.P. Ricketts
+- name: P. Ricketts
 - name: Ricketts (R-NE)
+- name: Ricketts, P.
 other_identifiers:
 - scheme: bioguide
   identifier: R000618
@@ -49,3 +64,11 @@ other_identifiers:
   identifier: Pete Ricketts
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pete_Ricketts
+- url: https://en.wikipedia.org/wiki/Pete_Ricketts
+- url: https://justfacts.votesmart.org/candidate/key-votes/57777/pete-ricketts
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/pete_ricketts/456952
+- url: https://www.linkedin.com/in/pete-ricketts-9090a0162
+- url: https://www.ricketts.senate.gov
+- url: https://www.ricketts.senate.gov/about
diff --git a/data/us/legislature/Pete-Sessions-4325bd84-1297-5481-a6b7-80534123c81f.yml b/data/us/legislature/Pete-Sessions-4325bd84-1297-5481-a6b7-80534123c81f.yml
index 86645b4858..a2da51f3b7 100644
--- a/data/us/legislature/Pete-Sessions-4325bd84-1297-5481-a6b7-80534123c81f.yml
+++ b/data/us/legislature/Pete-Sessions-4325bd84-1297-5481-a6b7-80534123c81f.yml
@@ -2,87 +2,100 @@ id: ocd-person/4325bd84-1297-5481-a6b7-80534123c81f
 name: Pete Sessions
 given_name: Pete
 family_name: Sessions
-middle_name: A.
-gender: M
 birth_date: 1955-03-22
+gender: Male
+email: https://sessions.house.gov/send-me-an-email
 image: https://theunitedstates.io/images/congress/450x550/S000250.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-5
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: TX-17
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-5
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: TX-17
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-5
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: TX-32
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-32
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-32
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: TX-5
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-17
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: TX-5
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-17
+  district: TX-5
 offices:
 - classification: capitol
-  address: 2204 Rayburn House Office Building Washington DC 20515-4317
+  address: 2204 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6105
+- classification: district
+  address: 300 E. Shepherd Ave. Suite 210, Lufkin, TX 75902
+- classification: district
+  address: 3034 Raguet St., Nacogdoches, TX 75965
+- classification: district
+  address: 400 Austin Ave. Suite 302, Waco, TX 76701
+  voice: 254-633-4500
+  fax: 254-300-5736
+- classification: district
+  address: 901 Normal Park Drive Suite 208, Huntsville, TX 77320
 links:
 - url: https://sessions.house.gov
   note: website
+- url: https://sessions.house.gov/
+other_names:
+- name: P. Sessions
+- name: P.A. Sessions
+- name: Sessions, P.
 ids:
   twitter: PeteSessions
 other_identifiers:
@@ -116,3 +129,10 @@ other_identifiers:
   identifier: kg:/m/03v39l
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pete_Sessions
+- url: https://en.wikipedia.org/wiki/Pete_Sessions
+- url: https://justfacts.votesmart.org/candidate/288/pete-sessions
+- url: https://sessions.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/pete_sessions/400367
+- url: https://www.linkedin.com/in/petesessions
diff --git a/data/us/legislature/Pete-Stauber-54c25fbc-b91d-5d2b-8403-9b8fb1fb6792.yml b/data/us/legislature/Pete-Stauber-54c25fbc-b91d-5d2b-8403-9b8fb1fb6792.yml
index 064eb31ba6..27de4a9cf1 100644
--- a/data/us/legislature/Pete-Stauber-54c25fbc-b91d-5d2b-8403-9b8fb1fb6792.yml
+++ b/data/us/legislature/Pete-Stauber-54c25fbc-b91d-5d2b-8403-9b8fb1fb6792.yml
@@ -2,51 +2,52 @@ id: ocd-person/54c25fbc-b91d-5d2b-8403-9b8fb1fb6792
 name: Pete Stauber
 given_name: Pete
 family_name: Stauber
-gender: M
 birth_date: 1966-05-10
+gender: Male
+email: https://stauber.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/S001212.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-8
 offices:
 - classification: capitol
-  address: 145 Cannon House Office Building Washington DC 20515-2308
+  address: 145 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6211
 - classification: district
-  address: 501 Laurel St; Brainerd, MN 56401-3595
-  voice: 218-355-0862
-  name: 'District Office #1'
+  address: 5094 Miller Trunk Highway Suite 900, Hermantown, MN 55811
+  voice: 218-481-6396
 - classification: district
-  address: 300 3rd Ave NE; Cambridge, MN 55008-1281
-  name: 'District Office #2'
+  address: Brainerd City Hall 501 Laurel St., Brainerd, MN 56401
+  voice: 218-355-0862
 - classification: district
-  address: 316 W Lake St Suite 7; Chisholm, MN 55719-3708
-  voice: 218-355-0726
-  name: 'District Office #3'
+  address: Cambridge City Hall 300 3rd Ave. NE, Cambridge, MN 55008
+  voice: 763-310-6208
 - classification: district
-  address: 5094 Miller Trunk Hwy Suite 900; Hermantown, MN 55811-1626
-  voice: 218-481-6396
-  name: 'District Office #4'
+  address: Chisholm City Hall 316 W. Lake St., Room 7, Chisholm, MN 55719
+  voice: 218-355-0240
 links:
 - url: https://stauber.house.gov
   note: website
+- url: https://stauber.house.gov/
+other_names:
+- name: P. Stauber
+- name: P.A. Stauber
+- name: Stauber, P.
 ids:
   twitter: RepPeteStauber
 other_identifiers:
@@ -72,3 +73,10 @@ other_identifiers:
   identifier: kg:/g/11gjy6v3nv
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pete_Stauber
+- url: https://en.wikipedia.org/wiki/Pete_Stauber
+- url: https://justfacts.votesmart.org/candidate/159954/peter-stauber
+- url: https://petestauberforcongress.com/about
+- url: https://stauber.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/pete_stauber/412792
diff --git a/data/us/legislature/Peter-Welch-8addb5a8-a569-54b2-811b-b5d091350411.yml b/data/us/legislature/Peter-Welch-8addb5a8-a569-54b2-811b-b5d091350411.yml
index a105413b65..7bbdbbef12 100644
--- a/data/us/legislature/Peter-Welch-8addb5a8-a569-54b2-811b-b5d091350411.yml
+++ b/data/us/legislature/Peter-Welch-8addb5a8-a569-54b2-811b-b5d091350411.yml
@@ -2,79 +2,82 @@ id: ocd-person/8addb5a8-a569-54b2-811b-b5d091350411
 name: Peter Welch
 given_name: Peter
 family_name: Welch
-gender: M
 birth_date: 1947-05-02
+gender: Male
+email: https://www.welch.senate.gov/email-peter/#email-peter
 image: https://theunitedstates.io/images/congress/450x550/W000800.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Vermont
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VT-AL
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Vermont
 offices:
 - classification: capitol
-  address: 124 Russell Senate Office Building Washington DC 20510
+  address: 124 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4242
+  fax: 802-651-1674
 - classification: district
-  address: 199 Main St. 4th Floor; Burlington, VT 05401
+  address: 199 Main St. 4th Floor, Burlington, VT 05401
   voice: 802-863-2525
   fax: 202-228-7575
-  name: 'District Office #1'
 links:
 - url: https://www.welch.senate.gov
   note: website
 - url: https://www.welch.senate.gov/email-peter/
   note: contact form
+- url: https://www.welch.senate.gov/
+other_names:
+- name: P. Welch
+- name: P.F. Welch
+- name: Welch (D-VT)
+- name: Welch, P.
 ids:
   twitter: PeterWelch
   youtube: UC0YfApJx6qNaAQ-ir93U8xA
   facebook: PeterWelch
-other_names:
-- name: Welch (D-VT)
 other_identifiers:
 - scheme: bioguide
   identifier: W000800
@@ -110,3 +113,9 @@ other_identifiers:
   identifier: kg:/m/0db4gl
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Peter_Welch
+- url: https://en.wikipedia.org/wiki/Peter_Welch
+- url: https://justfacts.votesmart.org/candidate/51272/peter-welch
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/peter_welch/412239
+- url: https://www.welch.senate.gov
diff --git a/data/us/legislature/Pramila-Jayapal-7849cc06-924b-5f36-a446-1f97d9fbdc63.yml b/data/us/legislature/Pramila-Jayapal-7849cc06-924b-5f36-a446-1f97d9fbdc63.yml
index 3d2c29ba77..bcce961a7f 100644
--- a/data/us/legislature/Pramila-Jayapal-7849cc06-924b-5f36-a446-1f97d9fbdc63.yml
+++ b/data/us/legislature/Pramila-Jayapal-7849cc06-924b-5f36-a446-1f97d9fbdc63.yml
@@ -2,45 +2,49 @@ id: ocd-person/7849cc06-924b-5f36-a446-1f97d9fbdc63
 name: Pramila Jayapal
 given_name: Pramila
 family_name: Jayapal
-gender: F
 birth_date: 1965-09-21
+gender: Female
+email: https://jayapal.house.gov/contact/email/
 image: https://theunitedstates.io/images/congress/450x550/J000298.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-7
 offices:
 - classification: capitol
-  address: 2346 Rayburn House Office Building Washington DC 20515-4707
+  address: 2346 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3106
+  fax: 202-225-6197
 - classification: district
-  address: 1904 3rd Ave. Suite 510; Seattle, WA 98101
+  address: 2033 6th Ave. Suite 1011, Seattle, WA 98121
   voice: 206-674-0040
-  name: 'District Office #1'
+  fax: 771-200-5813
 links:
 - url: https://jayapal.house.gov
   note: website
+- url: https://jayapal.house.gov/
+other_names:
+- name: Jayapal, P.
+- name: P. Jayapal
 ids:
   twitter: RepJayapal
   youtube: UCmyD0_-2Oowkfwc_Raghclw
@@ -72,3 +76,11 @@ other_identifiers:
   identifier: Pramila Jayapal
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Pramila_Jayapal
+- url: https://en.wikipedia.org/wiki/Pramila_Jayapal
+- url: https://jayapal.house.gov
+- url: https://jayapal.house.gov/about-me
+- url: https://justfacts.votesmart.org/candidate/biography/153141/pramila-jayapal
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/pramila-jayapal-80b7488
+- url: https://www.pramilaforcongress.com/about-pramila
diff --git a/data/us/legislature/Raja-Krishnamoorthi-b13e8680-abc9-51dc-a6b6-bed78927bfff.yml b/data/us/legislature/Raja-Krishnamoorthi-b13e8680-abc9-51dc-a6b6-bed78927bfff.yml
index 9a68915f35..b4034e2611 100644
--- a/data/us/legislature/Raja-Krishnamoorthi-b13e8680-abc9-51dc-a6b6-bed78927bfff.yml
+++ b/data/us/legislature/Raja-Krishnamoorthi-b13e8680-abc9-51dc-a6b6-bed78927bfff.yml
@@ -2,45 +2,49 @@ id: ocd-person/b13e8680-abc9-51dc-a6b6-bed78927bfff
 name: Raja Krishnamoorthi
 given_name: Raja
 family_name: Krishnamoorthi
-gender: M
 birth_date: 1973-07-19
+gender: Male
+email: https://krishnamoorthi.house.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/K000391.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-8
 offices:
 - classification: capitol
-  address: 2367 Rayburn House Office Building Washington DC 20515-1308
+  address: 2367 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3711
+  fax: 202-225-7830
 - classification: district
-  address: 1701 E. Woodfield Rd. Suite 704; Schaumburg, IL 60173
+  address: 1701 E. Woodfield Road Suite 704, Schaumburg, IL 60173
   voice: 847-413-1959
-  name: 'District Office #1'
 links:
 - url: https://krishnamoorthi.house.gov
   note: website
+- url: https://krishnamoorthi.house.gov/
+other_names:
+- name: Krishnamoorthi, R.
+- name: R. Krishnamoorthi
+- name: S.R. Krishnamoorthi
 ids:
   twitter: CongressmanRaja
   facebook: congressmanraja
@@ -71,3 +75,10 @@ other_identifiers:
   identifier: Raja Krishnamoorthi
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Raja_Krishnamoorthi
+- url: https://en.wikipedia.org/wiki/Raja_Krishnamoorthi
+- url: https://justfacts.votesmart.org/candidate/biography/117519/raja-krishnamoorthi
+- url: https://krishnamoorthi.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/raja_krishnamoorthi/412701
+- url: https://www.linkedin.com/in/rajakrishnamoorthi
diff --git a/data/us/legislature/Ral-M-Grijalva-06cee575-8fbe-5552-9f2b-9fe5aa2a3725.yml b/data/us/legislature/Ral-M-Grijalva-06cee575-8fbe-5552-9f2b-9fe5aa2a3725.yml
index 67885f2fec..ec6d328c27 100644
--- a/data/us/legislature/Ral-M-Grijalva-06cee575-8fbe-5552-9f2b-9fe5aa2a3725.yml
+++ b/data/us/legislature/Ral-M-Grijalva-06cee575-8fbe-5552-9f2b-9fe5aa2a3725.yml
@@ -1,93 +1,96 @@
 id: ocd-person/06cee575-8fbe-5552-9f2b-9fe5aa2a3725
-name: "Ra\xFAl M. Grijalva"
+name: "Ra\xFAl Grijalva"
 given_name: "Ra\xFAl"
 family_name: Grijalva
-middle_name: M.
-gender: M
 birth_date: 1948-02-19
+gender: Male
+email: https://grijalva.house.gov/about-raul/contact-raul/
 image: https://theunitedstates.io/images/congress/450x550/G000551.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-7
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-7
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: AZ-3
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-7
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: AZ-3
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: AZ-3
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: AZ-3
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: AZ-7
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: AZ-7
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: AZ-7
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: AZ-7
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-7
 offices:
 - classification: capitol
-  address: 1203 Longworth House Office Building Washington DC 20515-0307
+  address: 1203 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2435
+  fax: 202-225-1541
 - classification: district
-  address: 1412 N. Central Ave. Suite B; Avondale, AZ 85323
-  voice: 623-536-3388
-  fax: 623-535-7479
-  name: 'District Office #1'
+  address: El Pueblo Community Center 101 W. Irvington Road, Buildings 4 and 5, Tucson,
+    AZ 85714
+  voice: 520-622-6788
+  fax: 520-622-0198
 - classification: district
-  address: 146 N. State Ave.; Somerton, AZ 85350
+  address: P.O. Box 4105 146 N. State Ave., Somerton, AZ 85350
   voice: 928-343-7933
   fax: 928-343-7949
-  name: 'District Office #2'
 - classification: district
-  address: 101 W. Irvington Road Buildings 4 and 5; Tucson, AZ 85714
-  voice: 520-622-6788
+  address: Tolleson, AZ 85353
+  voice: 623-536-3388
   fax: 520-622-0198
-  name: 'District Office #3'
 links:
 - url: https://grijalva.house.gov
   note: website
+- url: https://grijalva.house.gov/
+other_names:
+- name: Grijalva, R.
+- name: R. Grijalva
+- name: R.M. Grijalva
+- name: "Ra\xFAl M. Grijalva"
 ids:
   twitter: RepRaulGrijalva
   youtube: UC8JZLnXS21bhNbcvpoM8O7g
@@ -123,3 +126,9 @@ other_identifiers:
   identifier: kg:/m/024s1z
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Raul_Grijalva
+- url: https://en.wikipedia.org/wiki/Ra%c3%bal_Grijalva
+- url: https://grijalva.house.gov
+- url: https://justfacts.votesmart.org/candidate/28253/raul-grijalva
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/raul_grijalva/400162
diff --git a/data/us/legislature/Ralph-Norman-9b2b75b5-2641-51be-91c3-9d14d40e4d1a.yml b/data/us/legislature/Ralph-Norman-9b2b75b5-2641-51be-91c3-9d14d40e4d1a.yml
index a81f1d089b..863c30f7bc 100644
--- a/data/us/legislature/Ralph-Norman-9b2b75b5-2641-51be-91c3-9d14d40e4d1a.yml
+++ b/data/us/legislature/Ralph-Norman-9b2b75b5-2641-51be-91c3-9d14d40e4d1a.yml
@@ -2,49 +2,50 @@ id: ocd-person/9b2b75b5-2641-51be-91c3-9d14d40e4d1a
 name: Ralph Norman
 given_name: Ralph
 family_name: Norman
-gender: M
 birth_date: 1953-06-20
+gender: Male
+email: https://norman.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/N000190.jpg
 party:
-- start_date: '2017-06-26'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-06-26'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-06-26
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-5
 offices:
 - classification: capitol
-  address: 569 Cannon House Office Building Washington DC 20515-4005
+  address: 569 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5501
+  fax: 202-225-0464
 - classification: district
-  address: 454 South Anderson Rd. Suite 302 B; Rock Hill, SC 29730
+  address: 454 S. Anderson Road Suite 302 B, Rock Hill, SC 29730
   voice: 803-327-1114
   fax: 803-327-4330
-  name: 'District Office #1'
-- classification: district
-  address: 110 Railroad Ave.; Gaffney, SC 29340
-  name: 'District Office #2'
 links:
 - url: https://norman.house.gov
   note: website
+- url: https://norman.house.gov/
+other_names:
+- name: Norman, R.
+- name: R. Norman
+- name: R.W. Norman
 ids:
   twitter: RepRalphNorman
   facebook: RepRalphNorman
@@ -77,3 +78,11 @@ other_identifiers:
   identifier: '21753'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ralph_W._Norman
+- url: https://en.wikipedia.org/wiki/Ralph_Norman
+- url: https://justfacts.votesmart.org/candidate/47930/ralph-norman-jr
+- url: https://norman.house.gov
+- url: https://norman.house.gov/meet-ralph
+- url: https://theunitedstates.io
+- url: https://www.electralphnorman.com/meet-ralph
+- url: https://www.govtrack.us/congress/members/ralph_norman/412738
diff --git a/data/us/legislature/Rand-Paul-7a1c13f9-1aac-5461-aa2a-11642749828d.yml b/data/us/legislature/Rand-Paul-7a1c13f9-1aac-5461-aa2a-11642749828d.yml
index d39c6163c8..f4e12d454e 100644
--- a/data/us/legislature/Rand-Paul-7a1c13f9-1aac-5461-aa2a-11642749828d.yml
+++ b/data/us/legislature/Rand-Paul-7a1c13f9-1aac-5461-aa2a-11642749828d.yml
@@ -2,48 +2,50 @@ id: ocd-person/7a1c13f9-1aac-5461-aa2a-11642749828d
 name: Rand Paul
 given_name: Rand
 family_name: Paul
-gender: M
 birth_date: 1963-01-07
+gender: Male
+email: https://www.paul.senate.gov/connect/
 image: https://theunitedstates.io/images/congress/450x550/P000603.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Kentucky
 offices:
 - classification: capitol
-  address: 295 Russell Senate Office Building Washington DC 20510
+  address: 295 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4343
 - classification: district
-  address: 1029 State St.; Bowling Green, KY 42101
+  address: 563 Hub Blvd. Suite 201, Bowling Green, KY 42103
   voice: 270-782-8303
-  name: 'District Office #1'
 links:
 - url: https://www.paul.senate.gov
   note: website
 - url: https://www.paul.senate.gov/connect/email-rand
   note: contact form
+- url: https://www.paul.senate.gov/
+other_names:
+- name: Paul (R-KY)
+- name: Paul, R.
+- name: R. Paul
+- name: R.H. Paul
 ids:
   twitter: SenRandPaul
   youtube: UCeM9I-20oWUs8daIIpsNHoQ
   facebook: SenatorRandPaul
-other_names:
-- name: Paul (R-KY)
 other_identifiers:
 - scheme: bioguide
   identifier: P000603
@@ -75,3 +77,10 @@ other_identifiers:
   identifier: kg:/m/05pdb7q
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rand_Paul
+- url: https://en.wikipedia.org/wiki/Rand_Paul
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rand_paul/412492
+- url: https://www.linkedin.com/in/drrandpaul
+- url: https://www.paul.senate.gov
+- url: https://www.paul.senate.gov/about
diff --git a/data/us/legislature/Randy-Feenstra-31a92a8a-f498-5ca5-a37b-fd92b162c913.yml b/data/us/legislature/Randy-Feenstra-31a92a8a-f498-5ca5-a37b-fd92b162c913.yml
index f1eed1660f..1326bf1c4f 100644
--- a/data/us/legislature/Randy-Feenstra-31a92a8a-f498-5ca5-a37b-fd92b162c913.yml
+++ b/data/us/legislature/Randy-Feenstra-31a92a8a-f498-5ca5-a37b-fd92b162c913.yml
@@ -2,32 +2,46 @@ id: ocd-person/31a92a8a-f498-5ca5-a37b-fd92b162c913
 name: Randy Feenstra
 given_name: Randy
 family_name: Feenstra
-middle_name: L.
-gender: M
 birth_date: 1969-01-14
+gender: Male
+email: https://feenstra.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000446.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IA-4
 offices:
 - classification: capitol
-  address: 1440 Longworth House Office Building Washington DC 20515-1504
+  address: 1440 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4426
+  fax: 202-225-3193
+- classification: district
+  address: 149 W. Broadway, Council Bluffs, IA 51503
+  voice: 712-256-5653
+- classification: district
+  address: 320 6th St. Room 112, Sioux City, IA 51101
+  voice: 712-224-4692
+- classification: district
+  address: 723 Central Ave., Fort Dodge, IA 50501
+  voice: 515-302-7060
 links:
 - url: https://feenstra.house.gov
   note: website
+- url: https://www.legis.iowa.gov/legislators/legislator/legislatorAllYears?personID=6565&error=invalidGA
+- url: https://feenstra.house.gov/
+other_names:
+- name: Feenstra, R.
+- name: R. Feenstra
+- name: R.L. Feenstra
 ids:
   twitter: RepFeenstra
 other_identifiers:
@@ -51,3 +65,12 @@ other_identifiers:
   identifier: Randy Feenstra
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Randy_Feenstra
+- url: https://en.wikipedia.org/wiki/Randy_Feenstra
+- url: https://feenstra.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/103301/randy-feenstra
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/randy_feenstra/456818
+- url: https://www.legis.iowa.gov/legislators/legislator/legislatorAllYears?personID=6565&error=invalidGA
+- url: https://www.linkedin.com/in/randy-feenstra-30b072a3
+- url: https://www.linkedin.com/in/randy-feenstra-971793149
diff --git a/data/us/legislature/Randy-K-Weber-Sr-4662eadc-a9a7-500c-b9c2-521a013d3729.yml b/data/us/legislature/Randy-K-Weber-Sr-4662eadc-a9a7-500c-b9c2-521a013d3729.yml
index 2b7f3c6d28..40552ab8ca 100644
--- a/data/us/legislature/Randy-K-Weber-Sr-4662eadc-a9a7-500c-b9c2-521a013d3729.yml
+++ b/data/us/legislature/Randy-K-Weber-Sr-4662eadc-a9a7-500c-b9c2-521a013d3729.yml
@@ -1,74 +1,75 @@
 id: ocd-person/4662eadc-a9a7-500c-b9c2-521a013d3729
-name: Randy K. Weber, Sr.
+name: Randy Weber
 given_name: Randy
 family_name: Weber
-middle_name: K.
-gender: M
 birth_date: 1953-07-02
+gender: Male
+email: https://weber.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000814.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-14
 offices:
 - classification: capitol
-  address: 107 Cannon House Office Building Washington DC 20515-4314
+  address: 107 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2831
+  fax: 202-225-0271
 - classification: district
-  address: 505 Orleans St. Suite 103; Beaumont, TX 77701
-  voice: 409-835-0108
-  fax: 409-835-0578
-  name: 'District Office #1'
-- classification: district
-  address: 122 West Way Suite 301; Lake Jackson, TX 77566
+  address: 122 West Way Suite 301, Lake Jackson, TX 77566
   voice: 979-285-0231
   fax: 979-285-0271
-  name: 'District Office #2'
 - classification: district
-  address: 174 Calder Rd. Suite 150; League City, TX 77573
+  address: 174 Calder Drive Suite 600, League City, TX 77573
   voice: 281-316-0231
   fax: 281-316-0271
-  name: 'District Office #3'
+- classification: district
+  address: 350 Pine St. Suite 1450, Beaumont, TX 77701
+  voice: 409-835-0108
+  fax: 409-835-0578
 links:
 - url: https://weber.house.gov
   note: website
+- url: https://weber.house.gov/
+other_names:
+- name: R. Weber
+- name: R.K. Weber
+- name: Randy K. Weber, Sr.
+- name: Weber (TX)
+- name: Weber, R.
 ids:
   twitter: TXRandy14
   youtube: UCJSZRrAcd5i1bHLjR66PZdg
   facebook: TXRandy14
-other_names:
-- name: Weber (TX)
 other_identifiers:
 - scheme: govtrack
   identifier: '412574'
@@ -98,3 +99,9 @@ other_identifiers:
   identifier: kg:/m/0km63t0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Randy_Weber
+- url: https://en.wikipedia.org/wiki/Randy_Weber
+- url: https://justfacts.votesmart.org/candidate/biography/102026/randy-weber-sr
+- url: https://theunitedstates.io
+- url: https://weber.house.gov
+- url: https://www.govtrack.us/congress/members/randy_weber/412574
diff --git a/data/us/legislature/Raphael-G-Warnock-37f5a4b9-98b2-5c3d-857b-6e02f5123345.yml b/data/us/legislature/Raphael-G-Warnock-37f5a4b9-98b2-5c3d-857b-6e02f5123345.yml
index c7df8e469e..b56465a7fb 100644
--- a/data/us/legislature/Raphael-G-Warnock-37f5a4b9-98b2-5c3d-857b-6e02f5123345.yml
+++ b/data/us/legislature/Raphael-G-Warnock-37f5a4b9-98b2-5c3d-857b-6e02f5123345.yml
@@ -1,40 +1,47 @@
 id: ocd-person/37f5a4b9-98b2-5c3d-857b-6e02f5123345
-name: Raphael G. Warnock
+name: Raphael Warnock
 given_name: Raphael
 family_name: Warnock
-middle_name: Gamaliel
-gender: M
 birth_date: 1969-07-23
+gender: Male
+email: https://www.warnock.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/W000790.jpg
 party:
-- start_date: '2021-01-20'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-20'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Georgia
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2021-01-20
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Georgia
 offices:
 - classification: capitol
-  address: 416 Russell Senate Office Building Washington DC 20510
+  address: 416 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3643
+- classification: district
+  address: 201 17th St. NW Suite 530, Atlanta, GA 30303
+  voice: 770-694-7828
+  fax: 770-953-2678
 links:
 - url: https://www.warnock.senate.gov
   note: website
 - url: https://www.warnock.senate.gov/contact/
   note: contact form
-ids:
-  twitter: SenatorWarnock
+- url: https://www.warnock.senate.gov/
 other_names:
+- name: R. Warnock
+- name: R.G. Warnock
+- name: Raphael G. Warnock
 - name: Raphael Warnock
 - name: Warnock (D-GA)
+- name: Warnock, R.
+ids:
+  twitter: SenatorWarnock
 other_identifiers:
 - scheme: bioguide
   identifier: W000790
@@ -58,3 +65,9 @@ other_identifiers:
   identifier: kg:/g/11b5lw9q73
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Raphael_Warnock
+- url: https://en.wikipedia.org/wiki/Raphael_Warnock
+- url: https://justfacts.votesmart.org/candidate/biography/189794/raphael-warnock
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/raphael_warnock/456858
+- url: https://www.warnock.senate.gov
diff --git a/data/us/legislature/Rashida-Tlaib-e7497932-512f-5b6f-8830-aa4b6737cd2e.yml b/data/us/legislature/Rashida-Tlaib-e7497932-512f-5b6f-8830-aa4b6737cd2e.yml
index 6b7ae01f87..ef54784ca2 100644
--- a/data/us/legislature/Rashida-Tlaib-e7497932-512f-5b6f-8830-aa4b6737cd2e.yml
+++ b/data/us/legislature/Rashida-Tlaib-e7497932-512f-5b6f-8830-aa4b6737cd2e.yml
@@ -2,40 +2,49 @@ id: ocd-person/e7497932-512f-5b6f-8830-aa4b6737cd2e
 name: Rashida Tlaib
 given_name: Rashida
 family_name: Tlaib
-gender: F
 birth_date: 1976-07-24
+gender: Female
+email: https://tlaib.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/T000481.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: MI-12
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-12
+  district: MI-13
 offices:
 - classification: capitol
-  address: 2438 Rayburn House Office Building Washington DC 20515-2212
+  address: 2438 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5126
 - classification: district
-  address: 10600 W Jefferson Ave; River Rouge, MI 48218-1296
+  address: 26080 Berg Road, Southfield, MI 48033
   voice: 313-203-7540
-  name: 'District Office #1'
+- classification: district
+  address: 26215 Trowbridge St., Inkster, MI 48141
+  voice: 313-463-6220
+- classification: district
+  address: 7800 W. Outer Drive, Detroit, MI 48235
+  voice: 313-463-6220
 links:
 - url: https://tlaib.house.gov
   note: website
+- url: https://tlaib.house.gov/
+other_names:
+- name: R. Tlaib
+- name: R.H. Tlaib
+- name: Tlaib, R.
 ids:
   twitter: RepRashida
 other_identifiers:
@@ -61,3 +70,10 @@ other_identifiers:
   identifier: Rashida Tlaib
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rashida_Tlaib
+- url: https://en.wikipedia.org/wiki/Rashida_Tlaib
+- url: https://justfacts.votesmart.org/candidate/biography/105368/rashida-tlaib
+- url: https://theunitedstates.io
+- url: https://tlaib.house.gov
+- url: https://www.govtrack.us/congress/members/rashida_tlaib/412787
+- url: https://www.linkedin.com/in/rashida-tlaib-b829737
diff --git a/data/us/legislature/Raul-Ruiz-4db06595-7db2-51a8-8574-703e9af111b9.yml b/data/us/legislature/Raul-Ruiz-4db06595-7db2-51a8-8574-703e9af111b9.yml
index b80ddb9ab1..150783e6b4 100644
--- a/data/us/legislature/Raul-Ruiz-4db06595-7db2-51a8-8574-703e9af111b9.yml
+++ b/data/us/legislature/Raul-Ruiz-4db06595-7db2-51a8-8574-703e9af111b9.yml
@@ -2,61 +2,66 @@ id: ocd-person/4db06595-7db2-51a8-8574-703e9af111b9
 name: Raul Ruiz
 given_name: Raul
 family_name: Ruiz
-gender: M
 birth_date: 1972-08-25
+gender: Male
+email: https://ruiz.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/R000599.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-36
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-25
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-36
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-36
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-36
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-36
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-25
+  district: CA-36
 offices:
 - classification: capitol
-  address: 2342 Rayburn House Office Building Washington DC 20515-0525
+  address: 2342 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5330
+  fax: 202-225-1238
 - classification: district
-  address: 445 E. Florida Ave. 2nd Floor; Hemet, CA 92543
-  voice: 951-765-2304
-  fax: 951-765-3784
-  name: 'District Office #1'
+  address: 343 S. 8th St. Suite A, El Centro, CA 92243
+  voice: 760-592-2646
 - classification: district
-  address: 43875 Washington Street Suite F; Palm Desert, CA 92211
+  address: 81719 Doctor Carreon Blvd. Suite G, Indio, CA 92201
   voice: 760-424-8888
   fax: 760-424-8993
-  name: 'District Office #2'
+- classification: district
+  address: Hemet City Hall 445 E. Florida Ave., 2nd Floor, Hemet, CA 92543
+  voice: 951-765-2304
+  fax: 951-765-3784
 links:
 - url: https://ruiz.house.gov
   note: website
+- url: https://ruiz.house.gov/
+other_names:
+- name: R. Ruiz
+- name: Ruiz, R.
 ids:
   twitter: RepRaulRuizMD
   youtube: UCSDk-cyNPCo1iy6rweSPmBw
@@ -90,3 +95,12 @@ other_identifiers:
   identifier: kg:/m/02p8pz0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Raul_Ruiz
+- url: https://chci.org/staff-and-leadership/rep-raul-ruiz-m-d
+- url: https://drraulruiz.com/about
+- url: https://en.wikipedia.org/wiki/Raul_Ruiz_(politician)
+- url: https://justfacts.votesmart.org/candidate/136407/raul-ruiz
+- url: https://ruiz.house.gov
+- url: https://ruiz.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/raul_ruiz/412519
diff --git a/data/us/legislature/Richard-Blumenthal-62fd9e8b-80ea-5484-b1f1-3f3b4c350cc3.yml b/data/us/legislature/Richard-Blumenthal-62fd9e8b-80ea-5484-b1f1-3f3b4c350cc3.yml
index 3f7f7c98ca..5905de1695 100644
--- a/data/us/legislature/Richard-Blumenthal-62fd9e8b-80ea-5484-b1f1-3f3b4c350cc3.yml
+++ b/data/us/legislature/Richard-Blumenthal-62fd9e8b-80ea-5484-b1f1-3f3b4c350cc3.yml
@@ -2,54 +2,56 @@ id: ocd-person/62fd9e8b-80ea-5484-b1f1-3f3b4c350cc3
 name: Richard Blumenthal
 given_name: Richard
 family_name: Blumenthal
-gender: M
 birth_date: 1946-02-13
+gender: Male
+email: https://www.blumenthal.senate.gov/contact/write-to-senator-blumenthal
 image: https://theunitedstates.io/images/congress/450x550/B001277.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Connecticut
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Connecticut
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Connecticut
 offices:
 - classification: capitol
-  address: 706 Hart Senate Office Building Washington DC 20510
+  address: 706 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2823
+  fax: 202-224-9673
+- classification: capitol
+  address: 90 State House Square 10th Floor, Hartford, CT 06103
+  voice: 860-258-6940
+  fax: 860-258-6958
 - classification: district
-  address: 915 Lafayette Blvd. Suite 304; Bridgeport, CT 06604
+  address: Brien McMahon Federal Building 915 Lafayette Blvd., Suite 304, Bridgeport,
+    CT 06604
   voice: 203-330-0598
   fax: 203-330-0608
-  name: 'District Office #1'
-- classification: district
-  address: 90 State House Sq. 10th Floor; Hartford, CT 06103
-  voice: 860-258-6940
-  fax: 860-258-6958
-  name: 'District Office #2'
 links:
 - url: https://www.blumenthal.senate.gov
   note: website
 - url: https://www.blumenthal.senate.gov/contact/
   note: contact form
+- url: https://www.blumenthal.senate.gov/
+other_names:
+- name: Blumenthal (D-CT)
+- name: Blumenthal, R.
+- name: R. Blumenthal
 ids:
   twitter: SenBlumenthal
   youtube: UCHH-fn3_LVt0Q4od56rOi5g
   facebook: SenBlumenthal
-other_names:
-- name: Blumenthal (D-CT)
 other_identifiers:
 - scheme: bioguide
   identifier: B001277
@@ -81,3 +83,11 @@ other_identifiers:
   identifier: kg:/m/03tg8m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Richard_Blumenthal
+- url: https://en.wikipedia.org/wiki/Richard_Blumenthal
+- url: https://justfacts.votesmart.org/candidate/biography/1568/richard-blumenthal
+- url: https://richardblumenthal.com/about
+- url: https://theunitedstates.io
+- url: https://www.blumenthal.senate.gov
+- url: https://www.blumenthal.senate.gov/about/biography
+- url: https://www.govtrack.us/congress/members/richard_blumenthal/412490
diff --git a/data/us/legislature/Richard-E-Neal-882d0f96-61bb-57b0-9683-c72425d337e9.yml b/data/us/legislature/Richard-E-Neal-882d0f96-61bb-57b0-9683-c72425d337e9.yml
index ec6a4fc2e7..4f3293f3fb 100644
--- a/data/us/legislature/Richard-E-Neal-882d0f96-61bb-57b0-9683-c72425d337e9.yml
+++ b/data/us/legislature/Richard-E-Neal-882d0f96-61bb-57b0-9683-c72425d337e9.yml
@@ -1,123 +1,126 @@
 id: ocd-person/882d0f96-61bb-57b0-9683-c72425d337e9
-name: Richard E. Neal
+name: Richard Neal
 given_name: Richard
 family_name: Neal
-middle_name: E.
-gender: M
 birth_date: 1949-02-14
+gender: Male
+email: https://neal.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/N000015.jpg
 party:
-- start_date: '1989-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+  district: MA-1
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+  district: MA-1
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+  district: MA-1
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: MA-1
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: MA-1
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-2
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: MA-1
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: MA-2
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: MA-2
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: MA-2
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: MA-2
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: MA-2
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-1
+  district: MA-2
 offices:
 - classification: capitol
-  address: 372 Cannon House Office Building Washington DC 20515-2101
+  address: 300 State St. Suite 200, Springfield, MA 01105
+  voice: 413-785-0325
+  fax: 413-747-0604
+- classification: capitol
+  address: 372 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5601
+  fax: 202-225-8112
 - classification: district
-  address: 78 Center St.; Pittsfield, MA 01201
+  address: 78 Center St., Pittsfield, MA 01201
   voice: 413-442-0946
   fax: 413-443-2792
-  name: 'District Office #1'
-- classification: district
-  address: 300 State St. Suite 200; Springfield, MA 01105
-  voice: 413-785-0325
-  fax: 413-747-0604
-  name: 'District Office #2'
 links:
 - url: https://neal.house.gov
   note: website
+- url: https://neal.house.gov/
+other_names:
+- name: Neal, R.
+- name: R. Neal
+- name: R.E. Neal
+- name: Richard E. Neal
 ids:
   twitter: RepRichardNeal
   youtube: UCZVtTydu0-MSK6G12GaKA4g
@@ -153,3 +156,9 @@ other_identifiers:
   identifier: Richard Neal
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Richard_Neal
+- url: https://en.wikipedia.org/wiki/Richard_Neal
+- url: https://justfacts.votesmart.org/candidate/26895/richard-neal
+- url: https://neal.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/richard_neal/400291
diff --git a/data/us/legislature/Richard-Hudson-18943ddd-9052-5b22-905b-65ff2ac3abf7.yml b/data/us/legislature/Richard-Hudson-18943ddd-9052-5b22-905b-65ff2ac3abf7.yml
index fb22c60434..6d3fd64bad 100644
--- a/data/us/legislature/Richard-Hudson-18943ddd-9052-5b22-905b-65ff2ac3abf7.yml
+++ b/data/us/legislature/Richard-Hudson-18943ddd-9052-5b22-905b-65ff2ac3abf7.yml
@@ -2,65 +2,63 @@ id: ocd-person/18943ddd-9052-5b22-905b-65ff2ac3abf7
 name: Richard Hudson
 given_name: Richard
 family_name: Hudson
-gender: M
 birth_date: 1971-11-04
+gender: Male
+email: https://hudson.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001067.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NC-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: NC-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NC-9
+  district: NC-8
 offices:
 - classification: capitol
-  address: 2112 Rayburn House Office Building Washington DC 20515-3309
+  address: 2112 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3715
+  fax: 202-225-4036
 - classification: district
-  address: 325 Mcgill Ave, NW Suite 500; Concord, NC 28027
-  voice: 704-786-1612
-  fax: 704-782-1004
-  name: 'District Office #1'
-- classification: district
-  address: 225 Green Street Suite 202; Fayetteville, NC 28301
+  address: 225 Green St. Suite 202, Fayetteville, NC 28301
   voice: 910-997-2070
   fax: 910-817-7202
-  name: 'District Office #2'
 - classification: district
-  address: 3395 Airport Rd Suite 114; Pinehurst, NC 28374
-  voice: 910-246-5374
-  name: 'District Office #3'
+  address: 340 Commerce Ave. Suite 16, Southern Pines, NC 28387
+  voice: 910-910-1924
 links:
 - url: https://hudson.house.gov
   note: website
+- url: https://hudson.house.gov/
+other_names:
+- name: Hudson, R.
+- name: R. Hudson
+- name: R.L. Hudson
 ids:
   twitter: RepRichHudson
   youtube: UC9Q1qCvnQR7rHERjTjJl5Pg
@@ -94,3 +92,10 @@ other_identifiers:
   identifier: kg:/m/0nbwfxs
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Richard_Hudson
+- url: https://en.wikipedia.org/wiki/Richard_Hudson_(American_politician)
+- url: https://hudson.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/136448/richard-hudson-jr
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/richard_hudson/412550
+- url: https://www.linkedin.com/in/richardhudson
diff --git a/data/us/legislature/Richard-J-Durbin-7d0c4665-2bcf-5e53-b450-25461cd13d85.yml b/data/us/legislature/Richard-J-Durbin-7d0c4665-2bcf-5e53-b450-25461cd13d85.yml
index 2fa87ebe4e..c270c2c096 100644
--- a/data/us/legislature/Richard-J-Durbin-7d0c4665-2bcf-5e53-b450-25461cd13d85.yml
+++ b/data/us/legislature/Richard-J-Durbin-7d0c4665-2bcf-5e53-b450-25461cd13d85.yml
@@ -1,111 +1,112 @@
 id: ocd-person/7d0c4665-2bcf-5e53-b450-25461cd13d85
-name: Richard J. Durbin
-given_name: Richard
+name: Dick Durbin
+given_name: Dick
 family_name: Durbin
-middle_name: J.
-gender: M
 birth_date: 1944-11-21
+gender: Male
+email: https://www.durbin.senate.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/D000563.jpg
 party:
-- start_date: '1983-01-03'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Illinois
+- start_date: 2015-01-06
+  end_date: 2021-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Illinois
+- start_date: 2009-01-06
+  end_date: 2015-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Illinois
+- start_date: 2003-01-07
+  end_date: 2009-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Illinois
+- start_date: 1997-01-07
+  end_date: 2003-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Illinois
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-20
-- start_date: '1997-01-07'
-  end_date: '2003-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Illinois
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Illinois
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Illinois
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Illinois
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Illinois
 offices:
 - classification: capitol
-  address: 711 Hart Senate Office Building Washington DC 20510
+  address: 525 S. 8th St., Springfield, IL 62703
+  voice: 217-492-4062
+  fax: 217-492-4382
+- classification: capitol
+  address: 711 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2152
+  fax: 202-228-0400
+- classification: district
+  address: 1504 3rd Ave. Suite 227, Rock Island, IL 61201
+  voice: 309-786-5173
+  fax: 309-786-5404
 - classification: district
-  address: 250 W. Cherry St. Suite 115-D; Carbondale, IL 62901
+  address: 250 W. Cherry St. Suite 115-D, Carbondale, IL 62901
   voice: 618-351-1122
   fax: 618-351-1124
-  name: 'District Office #1'
 - classification: district
-  address: 230 S. Dearborn St. Suite 3892; Chicago, IL 60604
+  address: Kluczynski Federal Building 230 S. Dearborn St., Suite 3892, Chicago, IL
+    60604
   voice: 312-353-4952
   fax: 312-353-0150
-  name: 'District Office #2'
-- classification: district
-  address: 1504 Third Ave. Suite 227; Rock Island, IL 61201
-  voice: 309-786-5173
-  fax: 309-786-5404
-  name: 'District Office #3'
-- classification: district
-  address: 525 S. 8th St.; Springfield, IL 62703
-  voice: 217-492-4062
-  fax: 217-492-4382
-  name: 'District Office #4'
 links:
 - url: https://www.durbin.senate.gov
   note: website
 - url: https://www.durbin.senate.gov/contact/
   note: contact form
+- url: https://www.durbin.senate.gov/
+other_names:
+- name: D. Durbin
+- name: Durbin (D-IL)
+- name: Durbin, D.
+- name: R.J. Durbin
+- name: Richard J. Durbin
 ids:
   twitter: SenatorDurbin
   youtube: UCkbixlNCxcKAffEhe3X5-lw
   facebook: SenatorDurbin
-other_names:
-- name: Durbin (D-IL)
 other_identifiers:
 - scheme: bioguide
   identifier: D000563
@@ -141,3 +142,9 @@ other_identifiers:
   identifier: kg:/m/01xcd1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Dick_Durbin
+- url: https://en.wikipedia.org/wiki/Dick_Durbin
+- url: https://justfacts.votesmart.org/candidate/biography/26847/dick-durbin
+- url: https://theunitedstates.io
+- url: https://www.durbin.senate.gov
+- url: https://www.govtrack.us/congress/members/richard_durbin/300038
diff --git a/data/us/legislature/Richard-McCormick-3056cc98-9ca1-5293-8064-fc12fd9c689f.yml b/data/us/legislature/Richard-McCormick-3056cc98-9ca1-5293-8064-fc12fd9c689f.yml
index e07719e9d9..572a19580a 100644
--- a/data/us/legislature/Richard-McCormick-3056cc98-9ca1-5293-8064-fc12fd9c689f.yml
+++ b/data/us/legislature/Richard-McCormick-3056cc98-9ca1-5293-8064-fc12fd9c689f.yml
@@ -1,28 +1,35 @@
 id: ocd-person/3056cc98-9ca1-5293-8064-fc12fd9c689f
-name: Richard McCormick
+name: Rich McCormick
 given_name: Rich
 family_name: McCormick
-middle_name: Dean
-gender: M
 birth_date: 1968-10-07
+gender: Male
+email: https://mccormick.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001218.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-6
 offices:
 - classification: capitol
-  address: 1213 Longworth House Office Building Washington DC 20515-1006
+  address: 1213 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4272
+- classification: district
+  address: 115 W. Courthouse Square, Cumming, GA 30040
+  voice: 770-232-3005
 links:
 - url: https://mccormick.house.gov
   note: website
+- url: https://mccormick.house.gov/
+other_names:
+- name: McCormick, R.
+- name: R. McCormick
+- name: R.D. McCormick
+- name: Richard McCormick
 ids:
   twitter: RepMcCormick
 other_identifiers:
@@ -42,3 +49,9 @@ other_identifiers:
   identifier: '189765'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rich_McCormick
+- url: https://en.wikipedia.org/wiki/Rich_McCormick
+- url: https://justfacts.votesmart.org/candidate/biography/189765/richard-mccormick
+- url: https://mccormick.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/richard-mccormick-md-mba-bb337991
diff --git a/data/us/legislature/Rick-Larsen-9f1d5b03-66ab-5d94-9b92-aed4e8168c4d.yml b/data/us/legislature/Rick-Larsen-9f1d5b03-66ab-5d94-9b92-aed4e8168c4d.yml
index 7719d6bed9..0481042ed8 100644
--- a/data/us/legislature/Rick-Larsen-9f1d5b03-66ab-5d94-9b92-aed4e8168c4d.yml
+++ b/data/us/legislature/Rick-Larsen-9f1d5b03-66ab-5d94-9b92-aed4e8168c4d.yml
@@ -2,97 +2,99 @@ id: ocd-person/9f1d5b03-66ab-5d94-9b92-aed4e8168c4d
 name: Rick Larsen
 given_name: Rick
 family_name: Larsen
-gender: M
 birth_date: 1965-06-15
+gender: Male
+email: https://larsen.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/L000560.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-2
 offices:
 - classification: capitol
-  address: 2163 Rayburn House Office Building Washington DC 20515-4702
+  address: 2163 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2605
+  fax: 202-225-4420
 - classification: district
-  address: 119 N. Commercial St. Suite 275; Bellingham, WA 98225
+  address: 119 N. Commercial St. Suite 275, Bellingham, WA 98225
   voice: 360-733-4500
   fax: 360-733-5144
-  name: 'District Office #1'
 - classification: district
-  address: 2930 Wetmore Ave. Suite 9F; Everett, WA 98201
+  address: Wall Street Building 2930 Wetmore Ave., Suite 9F, Everett, WA 98201
   voice: 425-252-3188
-  fax: 425-252-6606
-  name: 'District Office #2'
+  fax: 833-696-6499
 links:
 - url: https://larsen.house.gov
   note: website
+- url: https://larsen.house.gov/
+other_names:
+- name: Larsen (WA)
+- name: Larsen, R.
+- name: R. Larsen
+- name: R.R. Larsen
 ids:
   twitter: RepRickLarsen
   youtube: UCMv7LsJtiyO4AJcbRux5CxQ
   facebook: RepRickLarsen
-other_names:
-- name: Larsen (WA)
 other_identifiers:
 - scheme: bioguide
   identifier: L000560
@@ -124,3 +126,9 @@ other_identifiers:
   identifier: Rick Larsen
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rick_Larsen
+- url: https://en.wikipedia.org/wiki/Rick_Larsen
+- url: https://justfacts.votesmart.org/candidate/56231/rick-larsen
+- url: https://larsen.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rick_larsen/400232
diff --git a/data/us/legislature/Rick-Scott-3a57e816-1e10-58b5-8394-0272542ca567.yml b/data/us/legislature/Rick-Scott-3a57e816-1e10-58b5-8394-0272542ca567.yml
index 1f74473bb7..5ed4f31bfa 100644
--- a/data/us/legislature/Rick-Scott-3a57e816-1e10-58b5-8394-0272542ca567.yml
+++ b/data/us/legislature/Rick-Scott-3a57e816-1e10-58b5-8394-0272542ca567.yml
@@ -2,70 +2,63 @@ id: ocd-person/3a57e816-1e10-58b5-8394-0272542ca567
 name: Rick Scott
 given_name: Rick
 family_name: Scott
-gender: M
 birth_date: 1952-12-01
+gender: Male
+email: https://www.rickscott.senate.gov/contact/contact
 image: https://theunitedstates.io/images/congress/450x550/S001217.jpg
 party:
-- start_date: '2019-01-08'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-08'
-  end_date: '2025-01-03'
+- start_date: 2019-01-08
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Florida
 offices:
 - classification: capitol
-  address: 110 Hart Senate Office Building Washington DC 20510
+  address: 110 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5274
-- classification: district
-  address: 111 N Adams St 208,; Tallahassee, FL 32301-7736
+- classification: capitol
+  address: 111 N. Adams St. Suite 208, Tallahassee, FL 32301
   voice: 850-942-8415
-  name: 'District Office #1'
 - classification: district
-  address: 221 Palafox Place Suite 420; Pensacola, FL 32502
-  voice: 850-760-5151
-  name: 'District Office #2'
+  address: 1 Courthouse Square Suite 300, Kissimmee, FL 34741
+  voice: 407-586-7879
 - classification: district
-  address: 400 West Bay Street Suite 289; Jacksonville, FL 32202
-  voice: 904-479-7227
-  name: 'District Office #3'
+  address: 221 Palafox Place Suite 420, Pensacola, FL 32502
+  voice: 850-760-5151
 - classification: district
-  address: 225 East Robinson Street Suite 410; Orlando, FL 32801
+  address: 225 E. Robinson St. Suite 410, Orlando, FL 32801
   voice: 407-872-7161
-  name: 'District Office #4'
 - classification: district
-  address: 801 North Florida Avenue Suite 421; Tampa, FL 33602
-  voice: 813-225-7040
-  name: 'District Office #5'
+  address: 3299 Tamiami Trail East Building F, Suite 106, Naples, FL 34112
+  voice: 239-231-7890
 - classification: district
-  address: 1 Courthouse Square Suite 300; Kissimmee, FL 34741
-  voice: 407-586-7879
-  name: 'District Office #6'
+  address: 400 W. Bay St. Suite 289, Jacksonville, FL 32202
+  voice: 904-479-7227
 - classification: district
-  address: 415 Clematis Street Suite 201; West Palm Beach, FL 33401
+  address: 415 Clematis St. Suite 201, West Palm Beach, FL 33401
   voice: 561-514-0189
-  name: 'District Office #7'
 - classification: district
-  address: 3299 Tamiami Trail East Building F, Suite 106; Naples, FL 34112
-  voice: 239-231-7890
-  name: 'District Office #8'
+  address: 801 N. Florida Ave. Suite 421, Tampa, FL 33602
+  voice: 813-225-7040
 - classification: district
-  address: 901 Ponce de Leon Boulevard Suite 505; Miami, FL 33134
+  address: 901 Ponce de Leon Blvd. Suite 505, Coral Gables, FL 33134
   voice: 786-501-7141
-  name: 'District Office #9'
 links:
-- url: https://www.rickscott.senate.gov
-  note: website
 - url: https://www.rickscott.senate.gov/contact/contact
   note: contact form
+- url: https://www.rickscott.senate.gov
+  note: website
+other_names:
+- name: R. Scott
+- name: R.L. Scott
+- name: Scott (R-FL)
+- name: Scott, R.
 ids:
   twitter: SenRickScott
   youtube: UC-Y9pFmW4PYGZHkC8lcqSkQ
   facebook: RickScottSenOffice
-other_names:
-- name: Scott (R-FL)
 other_identifiers:
 - scheme: bioguide
   identifier: S001217
@@ -91,3 +84,10 @@ other_identifiers:
   identifier: '41903'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rick_Scott
+- url: https://en.wikipedia.org/wiki/Rick_Scott
+- url: https://justfacts.votesmart.org/candidate/biography/124204/rick-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rick_scott/412838
+- url: https://www.linkedin.com/in/rick-scott-9b43839
+- url: https://www.rickscott.senate.gov
diff --git a/data/us/legislature/Rick-W-Allen-4cdf55a7-a62e-5b3d-a07f-305f4e9dc5c1.yml b/data/us/legislature/Rick-W-Allen-4cdf55a7-a62e-5b3d-a07f-305f4e9dc5c1.yml
index 0e767e1ceb..cdfe9529a0 100644
--- a/data/us/legislature/Rick-W-Allen-4cdf55a7-a62e-5b3d-a07f-305f4e9dc5c1.yml
+++ b/data/us/legislature/Rick-W-Allen-4cdf55a7-a62e-5b3d-a07f-305f4e9dc5c1.yml
@@ -1,67 +1,65 @@
 id: ocd-person/4cdf55a7-a62e-5b3d-a07f-305f4e9dc5c1
-name: Rick W. Allen
+name: Rick Allen
 given_name: Rick
 family_name: Allen
-middle_name: W.
-gender: M
 birth_date: 1951-11-07
+gender: Male
+email: https://allen.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/A000372.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-12
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-12
 offices:
 - classification: capitol
-  address: 462 Cannon House Office Building Washington DC 20515-1012
+  address: 462 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2823
+  fax: 202-225-3377
 - classification: district
-  address: 2743 Perimeter Pkwy Suite 225; Augusta, GA 30909
-  voice: 706-228-1980
+  address: 100 S. Church St., Dublin, GA 31021
+  voice: 478-291-6324
   fax: 706-228-1954
-  name: 'District Office #1'
 - classification: district
-  address: 100 S. Church St.; Dublin, GA 31021
-  voice: 478-272-4030
-  fax: 478-277-0113
-  name: 'District Office #2'
+  address: 2743 Perimeter Parkway Building 200, Suite 105, Augusta, GA 30909
+  voice: 706-228-1980
+  fax: 706-228-1954
 - classification: district
-  address: 50 E. Main St.; Statesboro, GA 30458
+  address: 50 E. Main St., Statesboro, GA 30458
   voice: 912-243-9452
   fax: 912-243-9453
-  name: 'District Office #3'
-- classification: district
-  address: 107 Old Airport Rd. Suite A; Vidalia, GA 30475
-  voice: 912-403-3311
-  name: 'District Office #4'
 links:
 - url: https://allen.house.gov
   note: website
+- url: https://allen.house.gov/
+other_names:
+- name: Allen, R.
+- name: R. Allen
+- name: R.W. Allen
+- name: Rick W. Allen
 ids:
   twitter: RepRickAllen
   youtube: UCZPoYXHFDAV17BGLMzGAmpg
@@ -95,3 +93,9 @@ other_identifiers:
   identifier: Rick Allen
 sources:
 - url: https://theunitedstates.io/
+- url: https://allen.house.gov
+- url: https://ballotpedia.org/Rick_Allen
+- url: https://en.wikipedia.org/wiki/Rick_W._Allen
+- url: https://justfacts.votesmart.org/candidate/biography/136062/rick-allen
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rick_allen/412625
diff --git a/data/us/legislature/Ritchie-Torres-3a4aef6c-28c5-5cb7-a664-0e8c9d0c4fd2.yml b/data/us/legislature/Ritchie-Torres-3a4aef6c-28c5-5cb7-a664-0e8c9d0c4fd2.yml
index 3c3c0a4b7c..b5f6b0021a 100644
--- a/data/us/legislature/Ritchie-Torres-3a4aef6c-28c5-5cb7-a664-0e8c9d0c4fd2.yml
+++ b/data/us/legislature/Ritchie-Torres-3a4aef6c-28c5-5cb7-a664-0e8c9d0c4fd2.yml
@@ -2,36 +2,43 @@ id: ocd-person/3a4aef6c-28c5-5cb7-a664-0e8c9d0c4fd2
 name: Ritchie Torres
 given_name: Ritchie
 family_name: Torres
-middle_name: John
-gender: M
 birth_date: 1988-03-12
+gender: Male
+email: https://ritchietorres.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/T000486.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-15
 offices:
 - classification: capitol
-  address: 1414 Longworth House Office Building Washington DC 20515-3215
+  address: 1414 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4361
+  fax: 202-225-6001
+- classification: district
+  address: 540 E. Fordham Road Unit 2A, Bronx, NY 10458
+  voice: 718-503-9610
+  fax: 718-620-0658
 links:
 - url: https://ritchietorres.house.gov
   note: website
-ids:
-  twitter: RepRitchie
+- url: https://ritchietorres.house.gov/
 other_names:
+- name: R. Torres
+- name: R.J. Torres
 - name: Torres (NY)
+- name: Torres, R.
+ids:
+  twitter: RepRitchie
 other_identifiers:
 - scheme: bioguide
   identifier: T000486
@@ -51,3 +58,10 @@ other_identifiers:
   identifier: Ritchie Torres
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ritchie_Torres
+- url: https://chci.org/staff-and-leadership/rep-ritchie-torres
+- url: https://en.wikipedia.org/wiki/Ritchie_Torres
+- url: https://justfacts.votesmart.org/candidate/biography/161718/ritchie-torres
+- url: https://ritchietorres.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ritchie_torres/456838
diff --git a/data/us/legislature/Ro-Khanna-1256e24c-ef63-5a90-9cf6-1da0dcd63ce8.yml b/data/us/legislature/Ro-Khanna-1256e24c-ef63-5a90-9cf6-1da0dcd63ce8.yml
index 51236eb71d..d8a879adec 100644
--- a/data/us/legislature/Ro-Khanna-1256e24c-ef63-5a90-9cf6-1da0dcd63ce8.yml
+++ b/data/us/legislature/Ro-Khanna-1256e24c-ef63-5a90-9cf6-1da0dcd63ce8.yml
@@ -2,46 +2,48 @@ id: ocd-person/1256e24c-ef63-5a90-9cf6-1da0dcd63ce8
 name: Ro Khanna
 given_name: Ro
 family_name: Khanna
-gender: M
 birth_date: 1976-09-13
+gender: Male
+email: https://khanna.house.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/K000389.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-17
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-17
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-17
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-17
 offices:
 - classification: capitol
-  address: 306 Cannon House Office Building Washington DC 20515-0517
+  address: 306 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2631
 - classification: district
-  address: 900 Lafayette St. Suite 206; Santa Clara, CA 95050
+  address: 3150 De La Cruz Blvd. Suite 240, Santa Clara, CA 95054
   voice: 408-436-2720
   fax: 408-436-2721
-  name: 'District Office #1'
 links:
 - url: https://khanna.house.gov
   note: website
+- url: https://khanna.house.gov/
+other_names:
+- name: Khanna, R.
+- name: R. Khanna
 ids:
   twitter: RepRoKhanna
   youtube: UCr4KOYv1o1oEQhy1jhhm3pQ
@@ -73,3 +75,9 @@ other_identifiers:
   identifier: Ro Khanna
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ro_Khanna
+- url: https://en.wikipedia.org/wiki/Ro_Khanna
+- url: https://khanna.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ro_khanna/412684
+- url: https://www.linkedin.com/in/ro-khanna-72a8013
diff --git a/data/us/legislature/Robert-B-Aderholt-1a69c825-1015-5d72-a8d8-a720d586c3b4.yml b/data/us/legislature/Robert-B-Aderholt-1a69c825-1015-5d72-a8d8-a720d586c3b4.yml
index cf3b909638..1c9ffa715c 100644
--- a/data/us/legislature/Robert-B-Aderholt-1a69c825-1015-5d72-a8d8-a720d586c3b4.yml
+++ b/data/us/legislature/Robert-B-Aderholt-1a69c825-1015-5d72-a8d8-a720d586c3b4.yml
@@ -1,113 +1,114 @@
 id: ocd-person/1a69c825-1015-5d72-a8d8-a720d586c3b4
-name: Robert B. Aderholt
+name: Robert Aderholt
 given_name: Robert
 family_name: Aderholt
-middle_name: B.
-gender: M
 birth_date: 1965-07-22
+gender: Male
+email: https://aderholt.house.gov/contact-robert
 image: https://theunitedstates.io/images/congress/450x550/A000055.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-4
 offices:
 - classification: capitol
-  address: 266 Cannon House Office Building Washington DC 20515-0104
+  address: 266 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-4876
+  fax: 202-225-5587
 - classification: district
-  address: 205 4th Ave. NE Suite 104; Cullman, AL 35055
-  voice: 256-734-6043
-  fax: 256-737-0885
-  name: 'District Office #1'
+  address: 1011 George Wallace Blvd. Suite 146, Tuscumbia, AL 35674
+  voice: 256-381-3450
+  fax: 202-225-5587
 - classification: district
-  address: 600 Broad St. Suite 107; Gadsden, AL 35901
-  voice: 256-546-0201
-  fax: 256-546-8778
-  name: 'District Office #2'
+  address: 205 4th Ave. NE Suite 104, Cullman, AL 35055
+  voice: 256-734-6043
+  fax: 202-225-5587
 - classification: district
-  address: 1710 Alabama Ave. 247; Jasper, AL 35501
+  address: 247 Carl Elliott Building 1710 Alabama Ave., Jasper, AL 35501
   voice: 205-221-2310
-  fax: 205-221-9035
-  name: 'District Office #3'
+  fax: 202-225-5587
 - classification: district
-  address: 1011 George Wallace Blvd. Suite 146; Tuscumbia, AL 35674
-  voice: 256-381-3450
-  fax: 256-381-7659
-  name: 'District Office #4'
+  address: Federal Building 600 Broad St., Suite 107, Gadsden, AL 35901
+  voice: 256-546-0201
+  fax: 202-225-5587
 links:
 - url: https://aderholt.house.gov
   note: website
+- url: https://aderholt.house.gov/
+other_names:
+- name: Aderholt, R.
+- name: R. Aderholt
+- name: R.B. Aderholt
+- name: Robert B. Aderholt
 ids:
   twitter: Robert_Aderholt
   youtube: UC71CAgpg1gbLTew_pfTneGA
@@ -143,3 +144,10 @@ other_identifiers:
   identifier: kg:/m/024p03
 sources:
 - url: https://theunitedstates.io/
+- url: https://aderholt.house.gov
+- url: https://ballotpedia.org/Robert_Aderholt
+- url: https://en.wikipedia.org/wiki/Robert_Aderholt
+- url: https://justfacts.votesmart.org/candidate/biography/441/robert-aderholt
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robert_aderholt/400004
+- url: https://www.linkedin.com/in/robert-aderholt-46656310
diff --git a/data/us/legislature/Robert-C-Bobby-Scott-b20b2d62-fa4a-5014-baac-2f86e1c691eb.yml b/data/us/legislature/Robert-C-Bobby-Scott-b20b2d62-fa4a-5014-baac-2f86e1c691eb.yml
index 9aa4a5d34b..615a47140e 100644
--- a/data/us/legislature/Robert-C-Bobby-Scott-b20b2d62-fa4a-5014-baac-2f86e1c691eb.yml
+++ b/data/us/legislature/Robert-C-Bobby-Scott-b20b2d62-fa4a-5014-baac-2f86e1c691eb.yml
@@ -1,114 +1,117 @@
 id: ocd-person/b20b2d62-fa4a-5014-baac-2f86e1c691eb
-name: Robert C. "Bobby" Scott
-given_name: Robert
+name: Bobby Scott
+given_name: Bobby
 family_name: Scott
-middle_name: C.
-gender: M
 birth_date: 1947-04-30
+gender: Male
+email: https://bobbyscott.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S000185.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-3
 offices:
 - classification: capitol
-  address: 2328 Rayburn House Office Building Washington DC 20515-4603
+  address: 2328 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8351
+  fax: 202-225-8354
 - classification: district
-  address: 2600 Washington Ave. Suite 1010; Newport News, VA 23607
+  address: 2600 Washington Ave. Suite 1010, Newport News, VA 23607
   voice: 757-380-1000
   fax: 757-928-6694
-  name: 'District Office #1'
 links:
 - url: https://bobbyscott.house.gov
   note: website
+- url: https://bobbyscott.house.gov/
+other_names:
+- name: B. Scott
+- name: R.C. Scott
+- name: Robert C. "Bobby" Scott
+- name: Scott (VA)
+- name: Scott, B.
 ids:
   twitter: BobbyScott
   youtube: UCdNNcpw8arCsUp55JwK_QAA
   facebook: RepBobbyScott
-other_names:
-- name: Scott (VA)
 other_identifiers:
 - scheme: bioguide
   identifier: S000185
@@ -140,3 +143,10 @@ other_identifiers:
   identifier: kg:/m/03twgl
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bobby_Scott_(Virginia)
+- url: https://bobbyscott.house.gov
+- url: https://en.wikipedia.org/wiki/Bobby_Scott_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/27117/bobby-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robert_scott/400364
+- url: https://www.linkedin.com/in/bobby-scott-02267123
diff --git a/data/us/legislature/Robert-E-Latta-2158a719-5cfa-5c41-92f7-4f0853782d2b.yml b/data/us/legislature/Robert-E-Latta-2158a719-5cfa-5c41-92f7-4f0853782d2b.yml
index c7dc672c60..809d1ce934 100644
--- a/data/us/legislature/Robert-E-Latta-2158a719-5cfa-5c41-92f7-4f0853782d2b.yml
+++ b/data/us/legislature/Robert-E-Latta-2158a719-5cfa-5c41-92f7-4f0853782d2b.yml
@@ -1,80 +1,83 @@
 id: ocd-person/2158a719-5cfa-5c41-92f7-4f0853782d2b
-name: Robert E. Latta
-given_name: Robert
+name: Bob Latta
+given_name: Bob
 family_name: Latta
-middle_name: E.
-gender: M
 birth_date: 1956-04-18
+gender: Male
+email: https://latta.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/L000566.jpg
 party:
-- start_date: '2007-12-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-12-13'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-12-13
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-5
 offices:
 - classification: capitol
-  address: 2467 Rayburn House Office Building Washington DC 20515-3505
+  address: 2467 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6405
+  fax: 202-225-1985
 - classification: district
-  address: 1045 N. Main St. Suite 6; Bowling Green, OH 43402
+  address: 1045 N. Main St. Suite 6, Bowling Green, OH 43402
   voice: 419-354-8700
-  name: 'District Office #1'
 - classification: district
-  address: 101 Clinton St. Suite 1200; Defiance, OH 43512
-  voice: 419-782-1996
-  name: 'District Office #2'
+  address: 226 Middle Ave. 5th Floor, Elyria, OH 44035
+  voice: 440-406-5010
 - classification: district
-  address: 318 Dorney Plz. Room 302; Findlay, OH 45840
+  address: 318 Dorney Plaza Room 302, Findlay, OH 45840
   voice: 419-422-7791
-  name: 'District Office #3'
+  fax: 419-422-7793
 links:
 - url: https://latta.house.gov
   note: website
+- url: https://latta.house.gov/
+other_names:
+- name: B. Latta
+- name: Latta, B.
+- name: R.E. Latta
+- name: Robert E. Latta
 ids:
   twitter: BobLatta
   youtube: UCVSBVHoWu-eWnBBQaMKZ_sQ
@@ -110,3 +113,10 @@ other_identifiers:
   identifier: kg:/m/02z6_j1
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bob_Latta
+- url: https://en.wikipedia.org/wiki/Bob_Latta
+- url: https://justfacts.votesmart.org/candidate/9926/bob-latta
+- url: https://latta.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robert_latta/412256
+- url: https://www.linkedin.com/in/bob-latta-5461b935
diff --git a/data/us/legislature/Robert-Garcia-48a4fe68-6141-50ff-8d0b-0693119fd250.yml b/data/us/legislature/Robert-Garcia-48a4fe68-6141-50ff-8d0b-0693119fd250.yml
index 6c7736ca17..abdad1b951 100644
--- a/data/us/legislature/Robert-Garcia-48a4fe68-6141-50ff-8d0b-0693119fd250.yml
+++ b/data/us/legislature/Robert-Garcia-48a4fe68-6141-50ff-8d0b-0693119fd250.yml
@@ -2,31 +2,36 @@ id: ocd-person/48a4fe68-6141-50ff-8d0b-0693119fd250
 name: Robert Garcia
 given_name: Robert
 family_name: Garcia
-middle_name: Julio
-gender: M
 birth_date: 1977-12-02
+gender: Male
+email: https://robertgarcia.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000598.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-42
 offices:
 - classification: capitol
-  address: 1305 Longworth House Office Building Washington DC 20515-0542
+  address: 1305 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7924
+- classification: district
+  address: 415 W. Ocean Blvd., Suite 2803, Long Beach, CA 90802
+  voice: 562-512-8489
 links:
 - url: https://robertgarcia.house.gov
   note: website
-ids:
-  twitter: RepRobertGarcia
+- url: https://robertgarcia.house.gov/
 other_names:
+- name: Garcia, R.
 - name: Garcia, Robert
+- name: R. Garcia
+- name: R.J. Garcia
+ids:
+  twitter: RepRobertGarcia
 other_identifiers:
 - scheme: bioguide
   identifier: G000598
@@ -44,3 +49,9 @@ other_identifiers:
   identifier: '29749'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Robert_Garcia_(California)
+- url: https://en.wikipedia.org/wiki/Robert_Garcia_(California_politician)
+- url: https://robertgarcia.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robert_garcia/456885
+- url: https://www.linkedin.com/in/robert-garcia-ed-d-48735a66
diff --git a/data/us/legislature/Robert-J-Wittman-0adba0f5-0723-584b-8071-3e442a01f2d2.yml b/data/us/legislature/Robert-J-Wittman-0adba0f5-0723-584b-8071-3e442a01f2d2.yml
index c3ea73783a..caa8d8386b 100644
--- a/data/us/legislature/Robert-J-Wittman-0adba0f5-0723-584b-8071-3e442a01f2d2.yml
+++ b/data/us/legislature/Robert-J-Wittman-0adba0f5-0723-584b-8071-3e442a01f2d2.yml
@@ -1,83 +1,85 @@
 id: ocd-person/0adba0f5-0723-584b-8071-3e442a01f2d2
-name: Robert J. Wittman
-given_name: Robert
+name: Rob Wittman
+given_name: Rob
 family_name: Wittman
-middle_name: J.
-gender: M
 birth_date: 1959-02-03
+gender: Male
+email: https://wittman.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/W000804.jpg
 party:
-- start_date: '2007-12-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-12-13'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-12-13
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VA-1
 offices:
 - classification: capitol
-  address: 2055 Rayburn House Office Building Washington DC 20515-4601
+  address: 2055 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4261
+  fax: 202-225-4382
 - classification: district
-  address: 6501 Mechanicsville Tpke Suite 102; Mechanicsville, VA 23111
-  voice: 804-730-6595
-  fax: 804-730-6597
-  name: 'District Office #1'
+  address: 307 Main St. P.O. Box 162, Yorktown, VA 23690
+  voice: 757-527-6270
+  fax: 757-898-2859
 - classification: district
-  address: 95 Dunn Dr. Suite 201; Stafford, VA 22556
-  voice: 540-659-2734
-  fax: 540-659-2737
-  name: 'District Office #2'
+  address: 4201 Dominion Blvd. Suite 110, Glen Allen, VA 23060
+  voice: 804-401-4120
+  fax: 804-270-4643
 - classification: district
-  address: 508 Church Lane; Tappahannock, VA 22560
+  address: 508 Church Lane P.O. Box 3106, Tappahannock, VA 22560
   voice: 804-443-0668
   fax: 804-443-0671
-  name: 'District Office #3'
 links:
 - url: https://wittman.house.gov
   note: website
+- url: https://wittman.house.gov/
+other_names:
+- name: R. Wittman
+- name: R.J. Wittman
+- name: Robert J. Wittman
+- name: Wittman, R.
 ids:
   twitter: RobWittman
   youtube: UCIqIb-OaTbkIdU426eYIdPg
@@ -113,3 +115,11 @@ other_identifiers:
   identifier: kg:/m/03cx7ld
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rob_Wittman
+- url: https://en.wikipedia.org/wiki/Rob_Wittman
+- url: https://justfacts.votesmart.org/candidate/58133/rob-wittman
+- url: https://robwittman.com/about
+- url: https://theunitedstates.io
+- url: https://wittman.house.gov
+- url: https://wittman.house.gov/about/biography.htm
+- url: https://www.govtrack.us/congress/members/robert_wittman/412255
diff --git a/data/us/legislature/Robert-Menendez-a516a327-22fc-57af-931b-f28926b44b85.yml b/data/us/legislature/Robert-Menendez-a516a327-22fc-57af-931b-f28926b44b85.yml
index 6418e608e3..bc602537d0 100644
--- a/data/us/legislature/Robert-Menendez-a516a327-22fc-57af-931b-f28926b44b85.yml
+++ b/data/us/legislature/Robert-Menendez-a516a327-22fc-57af-931b-f28926b44b85.yml
@@ -1,32 +1,38 @@
 id: ocd-person/a516a327-22fc-57af-931b-f28926b44b85
-name: Robert Menendez
-given_name: Robert
+name: Rob Menendez
+given_name: Rob
 family_name: Menendez
-middle_name: Jacobsen
-gender: M
 birth_date: 1985-07-12
+gender: Male
+email: https://menendez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001226.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-8
 offices:
 - classification: capitol
-  address: 1007 Longworth House Office Building Washington DC 20515-3008
+  address: 1007 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7919
+- classification: district
+  address: 257 Cornelison Ave. Suite 4408, Jersey City, NJ 07302
+  voice: 201-309-0301
 links:
 - url: https://menendez.house.gov
   note: website
-ids:
-  twitter: RepMenendez
+- url: https://menendez.house.gov/
 other_names:
 - name: Menendez
+- name: Menendez, R.
+- name: R. Menendez
+- name: R.J. Menendez
+- name: Robert Menendez
+ids:
+  twitter: RepMenendez
 other_identifiers:
 - scheme: bioguide
   identifier: M001226
@@ -44,3 +50,8 @@ other_identifiers:
   identifier: '205678'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rob_Menendez_(New_Jersey)
+- url: https://en.wikipedia.org/wiki/Rob_Menendez
+- url: https://menendez.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/rob-menendez-89630345
diff --git a/data/us/legislature/Robert-P-Casey-Jr-18aff1ad-b362-53c8-bc7c-59cda8993c62.yml b/data/us/legislature/Robert-P-Casey-Jr-18aff1ad-b362-53c8-bc7c-59cda8993c62.yml
index 47fbc893f0..fdbe8d2eaa 100644
--- a/data/us/legislature/Robert-P-Casey-Jr-18aff1ad-b362-53c8-bc7c-59cda8993c62.yml
+++ b/data/us/legislature/Robert-P-Casey-Jr-18aff1ad-b362-53c8-bc7c-59cda8993c62.yml
@@ -1,82 +1,79 @@
 id: ocd-person/18aff1ad-b362-53c8-bc7c-59cda8993c62
-name: Robert P. Casey, Jr.
-given_name: Robert
+name: Bob Casey
+given_name: Bob
 family_name: Casey
-middle_name: P.
-gender: M
 birth_date: 1960-04-13
+gender: Male
+email: https://www.casey.senate.gov/contact/assistance
 image: https://theunitedstates.io/images/congress/450x550/C001070.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Pennsylvania
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Pennsylvania
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Pennsylvania
 offices:
 - classification: capitol
-  address: 393 Russell Senate Office Building Washington DC 20510
+  address: 393 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6324
+  fax: 202-228-0604
 - classification: district
-  address: 840 Hamilton St. Suite 301; Allentown, PA 18101
-  voice: 610-782-9470
-  fax: 610-782-9474
-  name: 'District Office #1'
-- classification: district
-  address: 817 E. Bishop St. Suite C; Bellefonte, PA 16823
-  voice: 814-357-0314
-  fax: 814-357-0318
-  name: 'District Office #2'
-- classification: district
-  address: 17 S. Park Row. Suite B-150; Erie, PA 16501
-  voice: 814-874-5080
+  address: 17 S. Park Row Suite B-150, Erie, PA 16501
+  voice: 814-240-5213
   fax: 814-874-5084
-  name: 'District Office #3'
 - classification: district
-  address: 200 N. Third St. Suite 14A; Harrisburg, PA 17101
+  address: 200 N. 3rd St. Suite 14A, Harrisburg, PA 17101
   voice: 717-231-7540
   fax: 717-231-7542
-  name: 'District Office #4'
 - classification: district
-  address: 2000 Market St. Suite 610; Philadelphia, PA 19103
+  address: 2000 Market St. Suite 610, Philadelphia, PA 19103
   voice: 215-405-9660
   fax: 215-405-9669
-  name: 'District Office #5'
 - classification: district
-  address: 310 Grant St. Suite 2415; Pittsburgh, PA 15219
+  address: 310 Grant St., Suite 2415, Pittsburgh, PA 15219
   voice: 412-803-7370
   fax: 412-803-7379
-  name: 'District Office #6'
 - classification: district
-  address: 417 Lackawanna Ave. Suite 303; Scranton, PA 18503
+  address: 417 Lackawanna Ave. Suite 303, Scranton, PA 18503
   voice: 570-941-0930
   fax: 570-941-0937
-  name: 'District Office #7'
+- classification: district
+  address: 817 E. Bishop St., Bellefonte, PA 16823
+  voice: 814-357-0314
+  fax: 814-357-0318
+- classification: district
+  address: 840 W. Hamilton St. Suite 301, Allentown, PA 18101
+  voice: 610-782-9470
+  fax: 610-782-9474
 links:
 - url: https://www.casey.senate.gov
   note: website
 - url: https://www.casey.senate.gov/contact
   note: contact form
+- url: https://www.casey.senate.gov/
+other_names:
+- name: B. Casey
+- name: Bob Casey
+- name: Casey (D-PA)
+- name: Casey, B.
+- name: R.P. Casey
+- name: Robert P. Casey, Jr.
 ids:
   twitter: SenBobCasey
   youtube: UCtVssXhx-KuZa-hSvnsnJ0A
   facebook: SenatorBobCasey
-other_names:
-- name: Bob Casey
-- name: Casey (D-PA)
 other_identifiers:
 - scheme: bioguide
   identifier: C001070
@@ -108,3 +105,9 @@ other_identifiers:
   identifier: kg:/m/047ymw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bob_Casey_Jr.
+- url: https://en.wikipedia.org/wiki/Bob_Casey_Jr.
+- url: https://theunitedstates.io
+- url: https://www.casey.senate.gov
+- url: https://www.casey.senate.gov/about/bob
+- url: https://www.govtrack.us/congress/members/robert_casey/412246
diff --git a/data/us/legislature/Robin-L-Kelly-ced9bf2d-1308-5316-94c0-c1410716021a.yml b/data/us/legislature/Robin-L-Kelly-ced9bf2d-1308-5316-94c0-c1410716021a.yml
index c590a3f2c5..fdcdf88f0d 100644
--- a/data/us/legislature/Robin-L-Kelly-ced9bf2d-1308-5316-94c0-c1410716021a.yml
+++ b/data/us/legislature/Robin-L-Kelly-ced9bf2d-1308-5316-94c0-c1410716021a.yml
@@ -1,72 +1,73 @@
 id: ocd-person/ced9bf2d-1308-5316-94c0-c1410716021a
-name: Robin L. Kelly
+name: Robin Kelly
 given_name: Robin
 family_name: Kelly
-middle_name: L.
-gender: F
 birth_date: 1956-04-30
+gender: Female
+email: https://robinkelly.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000385.jpg
 party:
-- start_date: '2013-04-09'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-04-09'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-04-09
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-2
 offices:
 - classification: capitol
-  address: 2329 Rayburn House Office Building Washington DC 20515-1302
+  address: 2329 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-0773
+  fax: 202-225-4583
 - classification: district
-  address: 1000 E. 111th St.; Chicago, IL 60628
+  address: 1642 E. 56th St. Suite 110, Chicago, IL 60637
   voice: 773-321-2001
-  name: 'District Office #1'
 - classification: district
-  address: 304 S. Indiana Ave. lower level; Kankakee, IL 60901
-  voice: 708-679-0078
-  name: 'District Office #2'
+  address: 425 N. Gilbert St. Suite 5, Danville, IL 61832
+  voice: 217-516-4556
 - classification: district
-  address: 600 Holiday Plaza Dr. Suite 505; Matteson, IL 60443
+  address: 600 Holiday Plaza Drive Suite 505, Matteson, IL 60443
   voice: 708-679-0078
   fax: 708-679-0216
-  name: 'District Office #3'
 links:
 - url: https://robinkelly.house.gov
   note: website
+- url: https://robinkelly.house.gov/
+other_names:
+- name: Kelly (IL)
+- name: Kelly, R.
+- name: R. Kelly
+- name: R.L. Kelly
+- name: Robin L. Kelly
 ids:
   twitter: RepRobinKelly
   youtube: UCLhcNPX2nNQLNzwKW0nEykg
   facebook: reprobinkelly
-other_names:
-- name: Kelly (IL)
 other_identifiers:
 - scheme: bioguide
   identifier: K000385
@@ -98,3 +99,12 @@ other_identifiers:
   identifier: kg:/m/0g8l32
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Robin_Kelly
+- url: https://en.wikipedia.org/wiki/Robin_Kelly
+- url: https://justfacts.votesmart.org/candidate/33384/robin-kelly
+- url: https://robinkelly.house.gov
+- url: https://robinkelly.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/robin_kelly/412595
+- url: https://www.linkedin.com/in/robin-kelly-b94904a
+- url: https://www.robinkellyforcongress.org/about-robin
diff --git a/data/us/legislature/Roger-F-Wicker-8fe2b037-b8ff-5161-9bb4-196e9f1d9dca.yml b/data/us/legislature/Roger-F-Wicker-8fe2b037-b8ff-5161-9bb4-196e9f1d9dca.yml
index b3387a7ef0..f7bd76fde3 100644
--- a/data/us/legislature/Roger-F-Wicker-8fe2b037-b8ff-5161-9bb4-196e9f1d9dca.yml
+++ b/data/us/legislature/Roger-F-Wicker-8fe2b037-b8ff-5161-9bb4-196e9f1d9dca.yml
@@ -1,101 +1,97 @@
 id: ocd-person/8fe2b037-b8ff-5161-9bb4-196e9f1d9dca
-name: Roger F. Wicker
+name: Roger Wicker
 given_name: Roger
 family_name: Wicker
-middle_name: F.
-gender: M
 birth_date: 1951-07-05
+gender: Male
+email: https://www.wicker.senate.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/W000437.jpg
 party:
-- start_date: '1995-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Mississippi
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Mississippi
+- start_date: 2007-12-31
+  end_date: 2013-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Mississippi
+- start_date: 2007-01-04
+  end_date: 2007-12-31
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2007-01-04'
-  end_date: '2007-12-31'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2007-12-31'
-  end_date: '2013-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Mississippi
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Mississippi
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Mississippi
 offices:
 - classification: capitol
-  address: 425 Russell Senate Office Building Washington DC 20510
+  address: 425 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6253
 - classification: district
-  address: 2909 13th St. 3rd Floor, Suite 303; Gulfport, MS 39501
+  address: 2909 13th St., Suite 303 3rd Floor, Gulfport, MS 39501
   voice: 228-871-7017
-  fax: 228-871-7196
-  name: 'District Office #1'
 - classification: district
-  address: 321 Losher St.; Hernando, MS 38632
+  address: P.O. Box 3777 330 W. Jefferson St., Suite B, Tupelo, MS 38804
+  voice: 662-844-5010
+  fax: 662-844-5030
+- classification: district
+  address: P.O. Box 385 321 Losher St., Hernando, MS 38632
   voice: 662-429-1002
-  fax: 662-429-6002
-  name: 'District Office #2'
 - classification: district
-  address: 501 E. Court St. Suite 3-500; Jackson, MS 39201
+  address: U.S. Federal Courthouse 501 E. Court St., Suite 3-500, Jackson, MS 39201
   voice: 601-965-4644
-  fax: 601-965-4007
-  name: 'District Office #3'
-- classification: district
-  address: 330 W. Jefferson St. Suite B; Tupelo, MS 38804
-  voice: 662-844-5010
-  fax: 662-844-5030
-  name: 'District Office #4'
 links:
 - url: https://www.wicker.senate.gov
   note: website
 - url: https://www.wicker.senate.gov/public/index.cfm/contact
   note: contact form
+- url: https://www.wicker.senate.gov/
+other_names:
+- name: R. Wicker
+- name: R.F. Wicker
+- name: Roger F. Wicker
+- name: Wicker (R-MS)
+- name: Wicker, R.
 ids:
   twitter: SenatorWicker
   youtube: UCIlKHiTjSkcQP_knBcXHWSg
   facebook: SenatorWicker
-other_names:
-- name: Wicker (R-MS)
 other_identifiers:
 - scheme: bioguide
   identifier: W000437
@@ -131,3 +127,11 @@ other_identifiers:
   identifier: kg:/m/025xxb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Roger_Wicker
+- url: https://en.wikipedia.org/wiki/Roger_Wicker
+- url: https://justfacts.votesmart.org/candidate/biography/21926/roger-wicker
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/roger_wicker/400432
+- url: https://www.linkedin.com/in/roger-wicker-aa9616108
+- url: https://www.wicker.senate.gov
+- url: https://www.wicker.senate.gov/biography
diff --git a/data/us/legislature/Roger-Marshall-09a67947-f66a-55ac-b4ba-5c656ad7f67d.yml b/data/us/legislature/Roger-Marshall-09a67947-f66a-55ac-b4ba-5c656ad7f67d.yml
index d58d94a889..7c1984d4ab 100644
--- a/data/us/legislature/Roger-Marshall-09a67947-f66a-55ac-b4ba-5c656ad7f67d.yml
+++ b/data/us/legislature/Roger-Marshall-09a67947-f66a-55ac-b4ba-5c656ad7f67d.yml
@@ -2,50 +2,63 @@ id: ocd-person/09a67947-f66a-55ac-b4ba-5c656ad7f67d
 name: Roger Marshall
 given_name: Roger
 family_name: Marshall
-gender: M
 birth_date: 1960-08-09
+gender: Male
+email: https://www.marshall.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/M001198.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Kansas
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Kansas
 offices:
 - classification: capitol
-  address: 479A Russell Senate Office Building Washington DC 20510
+  address: 479A Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4774
 - classification: district
-  address: 200 E. Iron Ave.; Salina, KS 67401
+  address: 100 S. Market St. Suite 102, Wichita, KS 67202
+  voice: 316-803-6120
+- classification: district
+  address: 204 S. Santa Fe Ave. Suite 1, Salina, KS 67401
   voice: 785-829-9000
-  name: 'District Office #1'
 - classification: district
-  address: 816 Campus Dr. Suite 500; Garden City, KS 67846
+  address: 402B N. Broadway, Pittsburg, KS 66762
+  voice: 620-404-7016
+- classification: district
+  address: 7011 W. 121st St. Suite 100, Overland Park, KS 66209
+  voice: 913-879-7070
+- classification: district
+  address: 800 SW Jackson St. Suite 600, Topeka, KS 66612
+  voice: 785-414-7501
+- classification: district
+  address: 921 Lareu St. Suite C, Garden City, KS 67846
   voice: 620-765-7800
-  name: 'District Office #2'
 links:
 - url: https://www.marshall.senate.gov
   note: website
 - url: https://www.marshall.senate.gov/contact/
   note: contact form
-ids:
-  twitter: SenatorMarshall
+- url: https://www.marshall.senate.gov/
 other_names:
 - name: Marshall (R-KS)
+- name: Marshall, R.
+- name: R. Marshall
+- name: R.W. Marshall
+ids:
+  twitter: SenatorMarshall
 other_identifiers:
 - scheme: bioguide
   identifier: M001198
@@ -77,3 +90,9 @@ other_identifiers:
   identifier: Roger Marshall
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Roger_Marshall
+- url: https://en.wikipedia.org/wiki/Roger_Marshall_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/172080/roger-marshall
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/roger_marshall/412704
+- url: https://www.marshall.senate.gov
diff --git a/data/us/legislature/Roger-Williams-e77e9595-b0fb-5923-a051-9f3221d8d6a9.yml b/data/us/legislature/Roger-Williams-e77e9595-b0fb-5923-a051-9f3221d8d6a9.yml
index 4a9f0e2c61..314b88ab4c 100644
--- a/data/us/legislature/Roger-Williams-e77e9595-b0fb-5923-a051-9f3221d8d6a9.yml
+++ b/data/us/legislature/Roger-Williams-e77e9595-b0fb-5923-a051-9f3221d8d6a9.yml
@@ -2,67 +2,69 @@ id: ocd-person/e77e9595-b0fb-5923-a051-9f3221d8d6a9
 name: Roger Williams
 given_name: Roger
 family_name: Williams
-gender: M
 birth_date: 1949-09-13
+gender: Male
+email: https://williams.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/W000816.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-25
 offices:
 - classification: capitol
-  address: 2336 Rayburn House Office Building Washington DC 20515-4325
+  address: 2336 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-9896
-- classification: district
-  address: 1005 Congress Ave. Suite 925; Austin, TX 78701
-  voice: 512-473-8910
   fax: 202-225-9692
-  name: 'District Office #1'
 - classification: district
-  address: 115 S. Main St. Suite 206; Cleburne, TX 76033
+  address: 1000 Ballpark Way Suite 310, Arlington, TX 76011
+  voice: 682-218-5965
+  fax: 817-549-6575
+- classification: district
+  address: 115 S. Main St. Suite 206, Cleburne, TX 76033
   voice: 817-774-2575
   fax: 202-225-9692
-  name: 'District Office #2'
 links:
 - url: https://williams.house.gov
   note: website
+- url: https://williams.house.gov/
+other_names:
+- name: J.R. Williams
+- name: R. Williams
+- name: Williams (TX)
+- name: Williams, R.
 ids:
   twitter: RepRWilliams
   youtube: UCBtfmMMQarjtLB9U_pWMOhw
   facebook: RepRogerWilliams
-other_names:
-- name: Williams (TX)
 other_identifiers:
 - scheme: govtrack
   identifier: '412578'
@@ -94,3 +96,8 @@ other_identifiers:
   identifier: kg:/m/08rszb
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Roger_Williams_(Texas)
+- url: https://en.wikipedia.org/wiki/Roger_Williams_(American_politician)
+- url: https://theunitedstates.io
+- url: https://williams.house.gov
+- url: https://www.govtrack.us/congress/members/roger_williams/412578
diff --git a/data/us/legislature/Ron-Estes-09eb0ce6-8616-5896-b1d2-d90f494eb4d9.yml b/data/us/legislature/Ron-Estes-09eb0ce6-8616-5896-b1d2-d90f494eb4d9.yml
index 7f33338757..b0107bee12 100644
--- a/data/us/legislature/Ron-Estes-09eb0ce6-8616-5896-b1d2-d90f494eb4d9.yml
+++ b/data/us/legislature/Ron-Estes-09eb0ce6-8616-5896-b1d2-d90f494eb4d9.yml
@@ -2,46 +2,48 @@ id: ocd-person/09eb0ce6-8616-5896-b1d2-d90f494eb4d9
 name: Ron Estes
 given_name: Ron
 family_name: Estes
-gender: M
 birth_date: 1956-07-19
+gender: Male
+email: https://estes.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/E000298.jpg
 party:
-- start_date: '2017-04-25'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-04-25'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-04-25
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-4
 offices:
 - classification: capitol
-  address: 2234 Rayburn House Office Building Washington DC 20515-1604
+  address: 2234 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6216
 - classification: district
-  address: 7701 E Kellogg Ave Suite 510; Wichita, KS 67207
+  address: 7701 E. Kellogg Suite 510, Wichita, KS 67207
   voice: 316-262-8992
-  fax: 316-262-5309
-  name: 'District Office #1'
 links:
 - url: https://estes.house.gov
   note: website
+- url: https://estes.house.gov/
+other_names:
+- name: Estes, R.
+- name: R. Estes
+- name: R.G. Estes
 ids:
   twitter: RepRonEstes
   youtube: UC2clc28qcehIqotHQcthnWA
@@ -75,3 +77,10 @@ other_identifiers:
   identifier: '21750'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ron_Estes_(U.S._House_representative)
+- url: https://en.wikipedia.org/wiki/Ron_Estes
+- url: https://estes.house.gov
+- url: https://justfacts.votesmart.org/candidate/125031/ron-estes
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ron_estes/412735
+- url: https://www.linkedin.com/in/ron-estes-4106bb29
diff --git a/data/us/legislature/Ron-Johnson-67d8f8b5-1fad-5132-9da8-3210783163a8.yml b/data/us/legislature/Ron-Johnson-67d8f8b5-1fad-5132-9da8-3210783163a8.yml
index bc83abef4f..329a4ac767 100644
--- a/data/us/legislature/Ron-Johnson-67d8f8b5-1fad-5132-9da8-3210783163a8.yml
+++ b/data/us/legislature/Ron-Johnson-67d8f8b5-1fad-5132-9da8-3210783163a8.yml
@@ -2,59 +2,60 @@ id: ocd-person/67d8f8b5-1fad-5132-9da8-3210783163a8
 name: Ron Johnson
 given_name: Ron
 family_name: Johnson
-gender: M
 birth_date: 1955-04-08
+gender: Male
+email: https://www.ronjohnson.senate.gov/email-the-senator
 image: https://theunitedstates.io/images/congress/450x550/J000293.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wisconsin
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wisconsin
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2011-01-05
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Wisconsin
 offices:
 - classification: capitol
-  address: 328 Hart Senate Office Building Washington DC 20510
+  address: 328 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5323
+  fax: 202-228-6965
 - classification: district
-  address: 517 E. Wisconsin Ave. Suite 408; Milwaukee, WI 53202
-  voice: 414-276-7282
-  fax: 414-276-7284
-  name: 'District Office #1'
-- classification: district
-  address: 219 Washington Ave. Suite 100; Oshkosh, WI 54901
+  address: 219 Washington Ave. Suite 100, Oshkosh, WI 54901
   voice: 920-230-7250
   fax: 920-230-7262
-  name: 'District Office #2'
 - classification: district
-  address: 5315 Wall St. Suite 110; Madison, WI 53718
+  address: 517 E. Wisconsin Ave. Suite 408, Milwaukee, WI 53202
+  voice: 414-276-7282
+  fax: 414-276-7284
+- classification: district
+  address: 5315 Wall St. Suite 110, Madison, WI 53718
   voice: 608-240-9629
   fax: 608-240-9646
-  name: 'District Office #3'
 links:
 - url: https://www.ronjohnson.senate.gov
   note: website
 - url: https://www.ronjohnson.senate.gov/public/index.cfm/email-the-senator
   note: contact form
+- url: https://www.ronjohnson.senate.gov/
+other_names:
+- name: Johnson (R-WI)
+- name: Johnson, R.
+- name: R. Johnson
+- name: R.H. Johnson
 ids:
   twitter: SenRonJohnson
   youtube: UCG9XyTVtOAs7VX_q_QVHoaw
   facebook: senronjohnson
-other_names:
-- name: Johnson (R-WI)
 other_identifiers:
 - scheme: bioguide
   identifier: J000293
@@ -86,3 +87,10 @@ other_identifiers:
   identifier: kg:/m/0cmdpzc
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ron_Johnson_(Wisconsin)
+- url: https://en.wikipedia.org/wiki/Ron_Johnson_(Wisconsin_politician)
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ron_johnson/412496
+- url: https://www.ronjohnson.senate.gov
+- url: https://www.ronjohnson.senate.gov/biography
+- url: https://www.ronjohnsonforsenate.com/about-ron
diff --git a/data/us/legislature/Ron-Wyden-7b0a82d1-eb2f-53a3-8352-de8b64d41060.yml b/data/us/legislature/Ron-Wyden-7b0a82d1-eb2f-53a3-8352-de8b64d41060.yml
index ad179eb151..57d5b9de8d 100644
--- a/data/us/legislature/Ron-Wyden-7b0a82d1-eb2f-53a3-8352-de8b64d41060.yml
+++ b/data/us/legislature/Ron-Wyden-7b0a82d1-eb2f-53a3-8352-de8b64d41060.yml
@@ -2,122 +2,120 @@ id: ocd-person/7b0a82d1-eb2f-53a3-8352-de8b64d41060
 name: Ron Wyden
 given_name: Ron
 family_name: Wyden
-gender: M
 birth_date: 1949-05-03
+gender: Male
+email: https://www.wyden.senate.gov/contact/email-ron
 image: https://theunitedstates.io/images/congress/450x550/W000779.jpg
 party:
-- start_date: '1981-01-05'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 2011-01-05
+  end_date: 2017-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 2005-01-04
+  end_date: 2011-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 1999-01-06
+  end_date: 2005-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 1996-02-05
+  end_date: 1999-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Oregon
+- start_date: 1995-01-04
+  end_date: 1996-02-05
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1995-01-04'
-  end_date: '1996-02-05'
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-3
-- start_date: '1996-02-05'
-  end_date: '1999-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
-- start_date: '1999-01-06'
-  end_date: '2005-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
-- start_date: '2005-01-04'
-  end_date: '2011-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
-- start_date: '2011-01-05'
-  end_date: '2017-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Oregon
 offices:
 - classification: capitol
-  address: 221 Dirksen Senate Office Building Washington DC 20510
+  address: 221 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-5244
+  fax: 202-228-2717
 - classification: district
-  address: 131 NW. Hawthorne Ave. Suite 107; Bend, OR 97701
-  voice: 541-330-9142
-  name: 'District Office #1'
-- classification: district
-  address: 405 E. 8th Ave. Suite 2020; Eugene, OR 97401
+  address: 405 E. 8th Ave. Suite 2020, Eugene, OR 97401
   voice: 541-431-0229
-  name: 'District Office #2'
 - classification: district
-  address: 105 Fir St. Suite 201; La Grande, OR 97850
-  voice: 541-962-7691
-  name: 'District Office #3'
+  address: 707 13th St. SE Suite 285, Salem, OR 97301
+  voice: 503-589-4555
+- classification: district
+  address: 911 NE 11th Ave. Suite 630, Portland, OR 97232
+  voice: 503-326-7525
 - classification: district
-  address: 310 W. 6th St. Room 118; Medford, OR 97501
+  address: Federal Courthouse 310 W. 6th St., Room 118, Medford, OR 97501
   voice: 541-858-5122
-  name: 'District Office #4'
 - classification: district
-  address: 911 NE 11th Ave. Suite 630; Portland, OR 97232
-  voice: 503-326-7525
-  name: 'District Office #5'
+  address: SAC Annex Building 105 Fir St., Suite 201, La Grande, OR 97850
+  voice: 541-962-7691
 - classification: district
-  address: 707 13th St. SE Suite 285; Salem, OR 97301
-  voice: 503-589-4555
-  name: 'District Office #6'
+  address: The Jamison Building 131 NW Hawthorne Ave., Suite 107, Bend, OR 97701
+  voice: 541-330-9142
 links:
 - url: https://www.wyden.senate.gov
   note: website
 - url: https://www.wyden.senate.gov/contact/
   note: contact form
+- url: https://www.wyden.senate.gov/
+other_names:
+- name: R. Wyden
+- name: R.L. Wyden
+- name: Wyden (D-OR)
+- name: Wyden, R.
 ids:
   twitter: RonWyden
   youtube: UCsd3UEaoLoqX60P88BdpGGw
-other_names:
-- name: Wyden (D-OR)
 other_identifiers:
 - scheme: bioguide
   identifier: W000779
@@ -153,3 +151,11 @@ other_identifiers:
   identifier: kg:/m/0178p9
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ron_Wyden
+- url: https://en.wikipedia.org/wiki/Ron_Wyden
+- url: https://justfacts.votesmart.org/candidate/27036/ron-wyden
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ron_wyden/300100
+- url: https://www.standtallforamerica.com/about
+- url: https://www.wyden.senate.gov
+- url: https://www.wyden.senate.gov/meet-ron
diff --git a/data/us/legislature/Ronny-Jackson-417128fd-ee37-5676-988d-263b908aa027.yml b/data/us/legislature/Ronny-Jackson-417128fd-ee37-5676-988d-263b908aa027.yml
index 327ede432b..4a1bd520f0 100644
--- a/data/us/legislature/Ronny-Jackson-417128fd-ee37-5676-988d-263b908aa027.yml
+++ b/data/us/legislature/Ronny-Jackson-417128fd-ee37-5676-988d-263b908aa027.yml
@@ -2,36 +2,49 @@ id: ocd-person/417128fd-ee37-5676-988d-263b908aa027
 name: Ronny Jackson
 given_name: Ronny
 family_name: Jackson
-middle_name: Lynn
-gender: M
 birth_date: 1967-05-04
+gender: Male
+email: https://jackson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/J000304.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-13
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-13
 offices:
 - classification: capitol
-  address: 446 Cannon House Office Building Washington DC 20515-4313
+  address: 446 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3706
+  fax: 202-225-3486
+- classification: district
+  address: 110 W. Hickory St. Suite 303, Denton, TX 76201
+  voice: 940-334-2030
+- classification: district
+  address: 2525 Kell Blvd. Suite 406, Wichita Falls, TX 76308
+  voice: 940-285-8000
+- classification: district
+  address: 620 S. Taylor St. Suite 200, Amarillo, TX 79101
+  voice: 806-641-5600
+  fax: 806-375-5152
 links:
 - url: https://jackson.house.gov
   note: website
-ids:
-  twitter: RepRonnyJackson
+- url: https://jackson.house.gov/
 other_names:
 - name: Jackson (TX)
+- name: Jackson, R.
+- name: R. Jackson
+- name: R.L. Jackson
+ids:
+  twitter: RepRonnyJackson
 other_identifiers:
 - scheme: bioguide
   identifier: J000304
@@ -51,3 +64,10 @@ other_identifiers:
   identifier: Ronny Jackson
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ronny_Jackson
+- url: https://en.wikipedia.org/wiki/Ronny_Jackson
+- url: https://jackson.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/188325/ronny-jackson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ronny_jackson/456847
+- url: https://www.linkedin.com/in/ronny-l-jackson
diff --git a/data/us/legislature/Rosa-L-DeLauro-30e732cb-6e0a-5920-bd7e-8d62ca9b2f7c.yml b/data/us/legislature/Rosa-L-DeLauro-30e732cb-6e0a-5920-bd7e-8d62ca9b2f7c.yml
index b63b37afd3..d79af633d7 100644
--- a/data/us/legislature/Rosa-L-DeLauro-30e732cb-6e0a-5920-bd7e-8d62ca9b2f7c.yml
+++ b/data/us/legislature/Rosa-L-DeLauro-30e732cb-6e0a-5920-bd7e-8d62ca9b2f7c.yml
@@ -1,113 +1,117 @@
 id: ocd-person/30e732cb-6e0a-5920-bd7e-8d62ca9b2f7c
-name: Rosa L. DeLauro
+name: Rosa DeLauro
 given_name: Rosa
 family_name: DeLauro
-middle_name: L.
-gender: F
 birth_date: 1943-03-02
+gender: Female
+email: https://delauro.house.gov/zip_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/D000216.jpg
 party:
-- start_date: '1991-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CT-3
 offices:
 - classification: capitol
-  address: 2413 Rayburn House Office Building Washington DC 20515-0703
+  address: 2413 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3661
+  fax: 202-225-4890
 - classification: district
-  address: 59 Elm St.; New Haven, CT 06510
+  address: 59 Elm St., New Haven, CT 06510
   voice: 203-562-3718
   fax: 203-772-2260
-  name: 'District Office #1'
 links:
 - url: https://delauro.house.gov
   note: website
+- url: https://delauro.house.gov/
+other_names:
+- name: DeLauro, R.
+- name: R. DeLauro
+- name: R.L. DeLauro
+- name: Rosa L. DeLauro
 ids:
   twitter: RosaDeLauro
   youtube: UC9ROfGBm7kSLCEDYwFF6McQ
@@ -143,3 +147,9 @@ other_identifiers:
   identifier: kg:/m/024zn0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rosa_DeLauro
+- url: https://delauro.house.gov
+- url: https://en.wikipedia.org/wiki/Rosa_DeLauro
+- url: https://justfacts.votesmart.org/candidate/26788/rosa-delauro
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rosa_delauro/400103
diff --git a/data/us/legislature/Ruben-Gallego-256da84c-1b8a-5d48-99ba-9c9f7dd2d310.yml b/data/us/legislature/Ruben-Gallego-256da84c-1b8a-5d48-99ba-9c9f7dd2d310.yml
index 03fe89f81f..f3131f1a3d 100644
--- a/data/us/legislature/Ruben-Gallego-256da84c-1b8a-5d48-99ba-9c9f7dd2d310.yml
+++ b/data/us/legislature/Ruben-Gallego-256da84c-1b8a-5d48-99ba-9c9f7dd2d310.yml
@@ -2,51 +2,54 @@ id: ocd-person/256da84c-1b8a-5d48-99ba-9c9f7dd2d310
 name: Ruben Gallego
 given_name: Ruben
 family_name: Gallego
-gender: M
 birth_date: 1979-11-20
+gender: Male
+email: https://rubengallego.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/G000574.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: AZ-3
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AZ-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: AZ-3
+  district: AZ-7
 offices:
 - classification: capitol
-  address: 1114 Longworth House Office Building Washington DC 20515-0303
+  address: 1114 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4065
 - classification: district
-  address: 411 N. Central Ave. Suite 150; Phoenix, AZ 85004
+  address: 1601 N. 7th St., Suite 310, Phoenix, AZ 85006
   voice: 602-256-0551
   fax: 602-257-9103
-  name: 'District Office #1'
 links:
 - url: https://rubengallego.house.gov
   note: website
+- url: https://rubengallego.house.gov/
+other_names:
+- name: Gallego, R.
+- name: R. Gallego
+- name: R.M. Gallego
 ids:
   twitter: RepRubenGallego
   facebook: RepRubenGallego
@@ -79,3 +82,12 @@ other_identifiers:
   identifier: Ruben Gallego
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ruben_Gallego
+- url: https://en.wikipedia.org/wiki/Ruben_Gallego
+- url: https://gallegoforarizona.com/about
+- url: https://justfacts.votesmart.org/candidate/biography/123732/ruben-gallego
+- url: https://rubengallego.house.gov
+- url: https://rubengallego.house.gov/about/about-ruben
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ruben_gallego/412612
+- url: https://www.linkedin.com/in/ruben-gallego-a513046
diff --git a/data/us/legislature/Rudy-Yakym-III-bf37099b-56fe-54fe-acc1-a6d79a0107d1.yml b/data/us/legislature/Rudy-Yakym-III-bf37099b-56fe-54fe-acc1-a6d79a0107d1.yml
index 33ffca5a16..f10f674d33 100644
--- a/data/us/legislature/Rudy-Yakym-III-bf37099b-56fe-54fe-acc1-a6d79a0107d1.yml
+++ b/data/us/legislature/Rudy-Yakym-III-bf37099b-56fe-54fe-acc1-a6d79a0107d1.yml
@@ -1,32 +1,43 @@
 id: ocd-person/bf37099b-56fe-54fe-acc1-a6d79a0107d1
-name: Rudy Yakym III
+name: Rudy Yakym
 given_name: Rudy
 family_name: Yakym
-gender: M
 birth_date: 1984-02-24
+gender: Male
+email: https://yakym.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/Y000067.jpg
 party:
-- start_date: '2022-11-14'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2022-11-14'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2022-11-14
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-2
 offices:
 - classification: capitol
-  address: 349 Cannon House Office Building Washington DC 20515-1402
+  address: 349 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3915
+- classification: district
+  address: 2410 Grape Road Suite 2A, Mishawaka, IN 46545
+  voice: 574-204-2645
+- classification: district
+  address: 709 Main St., Rochester, IN 46975
+  voice: 574-223-4373
 links:
 - url: https://yakym.house.gov
   note: website
+- url: https://yakym.house.gov/
+other_names:
+- name: R. Yakym
+- name: R.C. Yakym
+- name: Rudy Yakym III
+- name: Yakym, R.
 ids:
   twitter: RepRudyYakym
 other_identifiers:
@@ -48,3 +59,9 @@ other_identifiers:
   identifier: Rudy Yakym
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Rudy_Yakym
+- url: https://en.wikipedia.org/wiki/Rudy_Yakym
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/rudy_yakym/456873
+- url: https://www.linkedin.com/in/rudy3
+- url: https://yakym.house.gov
diff --git a/data/us/legislature/Russ-Fulcher-59f2dee7-1c9f-588e-a8ca-158e054f7fca.yml b/data/us/legislature/Russ-Fulcher-59f2dee7-1c9f-588e-a8ca-158e054f7fca.yml
index 9db7e4ff0c..e195e1f141 100644
--- a/data/us/legislature/Russ-Fulcher-59f2dee7-1c9f-588e-a8ca-158e054f7fca.yml
+++ b/data/us/legislature/Russ-Fulcher-59f2dee7-1c9f-588e-a8ca-158e054f7fca.yml
@@ -2,50 +2,51 @@ id: ocd-person/59f2dee7-1c9f-588e-a8ca-158e054f7fca
 name: Russ Fulcher
 given_name: Russ
 family_name: Fulcher
-gender: M
-birth_date: 1973-07-19
+birth_date: 1962-03-09
+gender: Male
+email: https://fulcher.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/F000469.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: ID-1
 offices:
 - classification: capitol
-  address: 1514 Longworth House Office Building Washington DC 20515-1201
+  address: 1514 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6611
 - classification: district
-  address: 1250 W Ironwood Dr Suite 241; Coeur D Alene, ID 83814-2679
+  address: 1250 W. Ironwood Drive Suite 200, Coeur d'Alene, ID 83814
   voice: 208-667-0127
   fax: 208-667-0310
-  name: 'District Office #1'
 - classification: district
-  address: 313 D St Suite 107; Lewiston, ID 83501-1894
+  address: 313 D St. Suite 107, Lewiston, ID 83501
   voice: 208-743-1388
-  name: 'District Office #2'
 - classification: district
-  address: 33 E Broadway Ave Suite 251; Meridian, ID 83642-2619
+  address: 33 E. Broadway Ave. Suite 251, Meridian, ID 83642
   voice: 208-888-3188
   fax: 208-888-0894
-  name: 'District Office #3'
 links:
 - url: https://fulcher.house.gov
   note: website
+- url: https://fulcher.house.gov/
+other_names:
+- name: Fulcher, R.
+- name: R. Fulcher
+- name: R.M. Fulcher
 ids:
   twitter: RepRussFulcher
 other_identifiers:
@@ -71,3 +72,11 @@ other_identifiers:
   identifier: Russ Fulcher
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Russ_Fulcher
+- url: https://en.wikipedia.org/wiki/Russ_Fulcher
+- url: https://fulcher.house.gov
+- url: https://fulcher.house.gov/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/russ_fulcher/412773
+- url: https://www.linkedin.com/in/russ-fulcher-b9648324
+- url: https://www.linkedin.com/in/russfulcher
diff --git a/data/us/legislature/Russell-Fry-3036516e-5f78-5d6a-9160-989a3f6cd149.yml b/data/us/legislature/Russell-Fry-3036516e-5f78-5d6a-9160-989a3f6cd149.yml
index 5136a8745f..979f07fce6 100644
--- a/data/us/legislature/Russell-Fry-3036516e-5f78-5d6a-9160-989a3f6cd149.yml
+++ b/data/us/legislature/Russell-Fry-3036516e-5f78-5d6a-9160-989a3f6cd149.yml
@@ -2,27 +2,37 @@ id: ocd-person/3036516e-5f78-5d6a-9160-989a3f6cd149
 name: Russell Fry
 given_name: Russell
 family_name: Fry
-middle_name: William
-gender: M
 birth_date: 1985-01-31
+gender: Male
+email: https://fry.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/F000478.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-7
 offices:
 - classification: capitol
-  address: 1626 Longworth House Office Building Washington DC 20515-4007
+  address: 1626 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-9895
+- classification: district
+  address: 1500 Highway 17 North Suite 304, Surfside Beach, SC 29575
+  voice: 843-353-5377
+- classification: district
+  address: 1831 W. Evans St. Suite 300, Florence, SC 29501
+  voice: 843-799-6880
 links:
 - url: https://fry.house.gov
   note: website
+- url: https://www.scstatehouse.gov/member.php?code=0623863562
+- url: https://fry.house.gov/
+other_names:
+- name: Fry, R.
+- name: R. Fry
+- name: R.W. Fry
 ids:
   twitter: RepRussellFry
 other_identifiers:
@@ -44,3 +54,10 @@ other_identifiers:
   identifier: '157265'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Russell_Fry
+- url: https://en.wikipedia.org/wiki/Russell_Fry_(politician)
+- url: https://fry.house.gov
+- url: https://justfacts.votesmart.org/candidate/157265/russell-fry
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/russell_fry/456938
+- url: https://www.scstatehouse.gov/member.php?code=0623863562
diff --git a/data/us/legislature/Ryan-K-Zinke-23aee4a1-f0aa-5803-9678-aebad9194f19.yml b/data/us/legislature/Ryan-K-Zinke-23aee4a1-f0aa-5803-9678-aebad9194f19.yml
index 1b49f7c9c2..f8633a097b 100644
--- a/data/us/legislature/Ryan-K-Zinke-23aee4a1-f0aa-5803-9678-aebad9194f19.yml
+++ b/data/us/legislature/Ryan-K-Zinke-23aee4a1-f0aa-5803-9678-aebad9194f19.yml
@@ -1,37 +1,51 @@
 id: ocd-person/23aee4a1-f0aa-5803-9678-aebad9194f19
-name: Ryan K. Zinke
+name: Ryan Zinke
 given_name: Ryan
 family_name: Zinke
-gender: M
 birth_date: 1961-11-01
+gender: Male
+email: https://zinke.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/Z000018.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MT-1
-- start_date: '2017-01-03'
-  end_date: '2017-03-01'
+- start_date: 2017-01-03
+  end_date: 2017-03-01
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MT-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MT-1
 offices:
 - classification: capitol
-  address: 512 Cannon House Office Building Washington DC 20515-2600
+  address: 512 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5628
+- classification: district
+  address: 2901 W. Broadway St. Suite 200, Missoula, MT 59808
+  voice: 406-317-0276
+- classification: district
+  address: '601 Nikles Drive #5, Bozeman, MT 59715'
+  voice: 406-602-6030
+- classification: district
+  address: 923 S. Main St., Kalispell, MT 59601
+  voice: 406-317-0277
 links:
 - url: https://zinke.house.gov
   note: website
+- url: https://zinke.house.gov/
+other_names:
+- name: R. Zinke
+- name: R.K. Zinke
+- name: Ryan K. Zinke
+- name: Zinke, R.
 other_identifiers:
 - scheme: bioguide
   identifier: Z000018
@@ -55,3 +69,12 @@ other_identifiers:
   identifier: '104073'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ryan_Zinke
+- url: https://en.wikipedia.org/wiki/Ryan_Zinke
+- url: https://justfacts.votesmart.org/candidate/biography/104073/ryan-zinke
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ryan_zinke/412640
+- url: https://www.linkedin.com/in/ryan-zinke-b3b34416
+- url: https://www.ryanzinke.com/about
+- url: https://zinke.house.gov
+- url: https://zinke.house.gov/about
diff --git a/data/us/legislature/Salud-O-Carbajal-a106e70c-7857-5d7c-8252-5f4768818ef2.yml b/data/us/legislature/Salud-O-Carbajal-a106e70c-7857-5d7c-8252-5f4768818ef2.yml
index eea0fcd159..b005d36ace 100644
--- a/data/us/legislature/Salud-O-Carbajal-a106e70c-7857-5d7c-8252-5f4768818ef2.yml
+++ b/data/us/legislature/Salud-O-Carbajal-a106e70c-7857-5d7c-8252-5f4768818ef2.yml
@@ -1,56 +1,57 @@
 id: ocd-person/a106e70c-7857-5d7c-8252-5f4768818ef2
-name: Salud O. Carbajal
+name: Salud Carbajal
 given_name: Salud
 family_name: Carbajal
-middle_name: O.
-gender: M
 birth_date: 1964-11-18
+gender: Male
+email: https://carbajal.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/C001112.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-24
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-24
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-24
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-24
 offices:
 - classification: capitol
-  address: 2331 Rayburn House Office Building Washington DC 20515-0524
+  address: 2331 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3601
 - classification: district
-  address: 1411 Marsh St. Suite 205; San Luis Obispo, CA 93401
+  address: 125 E. De La Guerra St. Suite 203B, Santa Barbara, CA 93101
+  voice: 805-730-1710
+- classification: district
+  address: 1411 Marsh St. Suite 205, San Luis Obispo, CA 93401
   voice: 805-546-8348
   fax: 805-439-3574
-  name: 'District Office #1'
 - classification: district
-  address: 125 E. De La Guerra St. Suite 203B; Santa Barbara, CA 93101
+  address: 505 Poli St. Suite 201, Ventura, CA 93001
   voice: 805-730-1710
-  name: 'District Office #2'
-- classification: district
-  address: 505 Poli St. Suite 201; Ventura, CA 93001
-  voice: 805-730-1710
-  name: 'District Office #3'
 links:
 - url: https://carbajal.house.gov
   note: website
+- url: https://carbajal.house.gov/
+other_names:
+- name: Carbajal, S.
+- name: S. Carbajal
+- name: S.O. Carbajal
+- name: Salud O. Carbajal
 ids:
   twitter: RepCarbajal
   facebook: repsaludcarbajal
@@ -81,3 +82,8 @@ other_identifiers:
   identifier: Salud Carbajal
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Salud_Carbajal
+- url: https://carbajal.house.gov
+- url: https://en.wikipedia.org/wiki/Salud_Carbajal
+- url: https://justfacts.votesmart.org/candidate/81569/salud-carbajal
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Sam-Graves-82ed7662-b9c2-53f7-bab6-c2d59732128b.yml b/data/us/legislature/Sam-Graves-82ed7662-b9c2-53f7-bab6-c2d59732128b.yml
index 36d4c2afe8..4281f965ab 100644
--- a/data/us/legislature/Sam-Graves-82ed7662-b9c2-53f7-bab6-c2d59732128b.yml
+++ b/data/us/legislature/Sam-Graves-82ed7662-b9c2-53f7-bab6-c2d59732128b.yml
@@ -2,102 +2,105 @@ id: ocd-person/82ed7662-b9c2-53f7-bab6-c2d59732128b
 name: Sam Graves
 given_name: Sam
 family_name: Graves
-middle_name: B.
-gender: M
 birth_date: 1963-11-07
+gender: Male
+email: https://graves.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/G000546.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MO-6
 offices:
 - classification: capitol
-  address: 1135 Longworth House Office Building Washington DC 20515-2506
+  address: 1135 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7041
+  fax: 202-225-8221
 - classification: district
-  address: 906 Broadway; Hannibal, MO 63401
-  voice: 573-221-3400
-  name: 'District Office #1'
-- classification: district
-  address: 11724 NW Plaza Circle Suite 900; Kansas City, MO 64153
+  address: 12200 N. Ambassador Drive Suite 234, Kansas City, MO 64163
   voice: 816-792-3976
   fax: 816-792-0694
-  name: 'District Office #2'
 - classification: district
-  address: 411 Jules St. Room 111; St. Joseph, MO 64501
+  address: 201 Main St. Suite 50, Troy, MO 63379
+  voice: 636-622-7106
+- classification: district
+  address: 411 Jules St. Room 111, St. Joseph, MO 64501
   voice: 816-749-0800
   fax: 816-749-0801
-  name: 'District Office #3'
+- classification: district
+  address: 6079 County Road 425 P.O. Box 364, Hannibal, MO 63401
+  voice: 573-221-3400
 links:
 - url: https://graves.house.gov
   note: website
+- url: https://graves.house.gov/
+other_names:
+- name: Graves (MO)
+- name: Graves, S.
+- name: S. Graves
+- name: S.B. Graves
 ids:
   twitter: RepSamGraves
   youtube: UCdg2ybvoHsSW6t7iJnKHlNg
   facebook: '118514606128'
-other_names:
-- name: Graves (MO)
 other_identifiers:
 - scheme: bioguide
   identifier: G000546
@@ -129,3 +132,9 @@ other_identifiers:
   identifier: Sam Graves
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sam_Graves
+- url: https://en.wikipedia.org/wiki/Sam_Graves
+- url: https://graves.house.gov
+- url: https://justfacts.votesmart.org/candidate/9425/sam-graves
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sam_graves/400158
diff --git a/data/us/legislature/Sanford-D-Bishop-Jr-bbc6615a-22ca-51f6-b674-8c7753e93333.yml b/data/us/legislature/Sanford-D-Bishop-Jr-bbc6615a-22ca-51f6-b674-8c7753e93333.yml
index 89f5689354..7aef899c3c 100644
--- a/data/us/legislature/Sanford-D-Bishop-Jr-bbc6615a-22ca-51f6-b674-8c7753e93333.yml
+++ b/data/us/legislature/Sanford-D-Bishop-Jr-bbc6615a-22ca-51f6-b674-8c7753e93333.yml
@@ -1,124 +1,125 @@
 id: ocd-person/bbc6615a-22ca-51f6-b674-8c7753e93333
-name: Sanford D. Bishop, Jr.
+name: Sanford Bishop
 given_name: Sanford
 family_name: Bishop
-middle_name: D.
-gender: M
 birth_date: 1947-02-04
+gender: Male
+email: https://bishop.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B000490.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: GA-2
 offices:
 - classification: capitol
-  address: 2407 Rayburn House Office Building Washington DC 20515-1002
+  address: 2407 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3631
-- classification: district
-  address: 323 Pine Ave 400; Albany, GA 31701-2596
+  fax: 202-225-2203
+- classification: capitol
+  address: Albany Towers 323 Pine Ave., Suite 400, Albany, GA 31701
   voice: 229-439-8067
   fax: 229-436-2099
-  name: 'District Office #1'
 - classification: district
-  address: 18 Ninth St. Suite 201; Columbus, GA 31901
+  address: 18 9th St. Suite 201, Columbus, GA 31901
   voice: 706-320-9477
   fax: 706-320-9479
-  name: 'District Office #2'
 - classification: district
-  address: 300 Mulberry Street Suite 502; Macon, GA 31201
+  address: 300 Mulberry St. Suite 502, Macon, GA 31201
   voice: 478-803-2631
   fax: 478-803-2637
-  name: 'District Office #3'
 links:
 - url: https://bishop.house.gov
   note: website
+- url: https://bishop.house.gov/
+other_names:
+- name: Bishop (GA)
+- name: Bishop, S.
+- name: S. Bishop
+- name: S.D. Bishop
+- name: Sanford D. Bishop, Jr.
 ids:
   twitter: SanfordBishop
   youtube: UCxF9veLBrkr_CqVq5eFYVGg
   facebook: sanfordbishop
-other_names:
-- name: Bishop (GA)
 other_identifiers:
 - scheme: bioguide
   identifier: B000490
@@ -150,3 +151,11 @@ other_identifiers:
   identifier: Sanford Bishop Jr.
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sanford_Bishop_Jr.
+- url: https://bishop.house.gov
+- url: https://bishop.house.gov/about
+- url: https://en.wikipedia.org/wiki/Sanford_Bishop
+- url: https://justfacts.votesmart.org/candidate/biography/26817/sanford-bishop-jr
+- url: https://sanfordbishop.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sanford_bishop/400030
diff --git a/data/us/legislature/Sara-Jacobs-7c181af1-a048-53f0-a16c-833ffd27aef4.yml b/data/us/legislature/Sara-Jacobs-7c181af1-a048-53f0-a16c-833ffd27aef4.yml
index 03422c1211..cd18327b4c 100644
--- a/data/us/legislature/Sara-Jacobs-7c181af1-a048-53f0-a16c-833ffd27aef4.yml
+++ b/data/us/legislature/Sara-Jacobs-7c181af1-a048-53f0-a16c-833ffd27aef4.yml
@@ -2,31 +2,40 @@ id: ocd-person/7c181af1-a048-53f0-a16c-833ffd27aef4
 name: Sara Jacobs
 given_name: Sara
 family_name: Jacobs
-gender: F
 birth_date: 1989-02-01
+gender: Female
+email: https://sarajacobs.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/J000305.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-53
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-51
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-51
+  district: CA-53
 offices:
 - classification: capitol
-  address: 1314 Longworth House Office Building Washington DC 20515-0551
+  address: 1314 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2040
+  fax: 202-225-2948
+- classification: district
+  address: 9665 Chesapeake Drive Suite 455, San Diego, CA 92123
+  voice: 619-280-5353
 links:
 - url: https://sarajacobs.house.gov
   note: website
+- url: https://sarajacobs.house.gov/
+- url: https://sarajacobs.house.gov/news/press-releases
+other_names:
+- name: Jacobs, S.
+- name: S. Jacobs
+- name: S.J. Jacobs
 ids:
   twitter: RepSaraJacobs
 other_identifiers:
@@ -46,3 +55,11 @@ other_identifiers:
   identifier: kg:/g/11ghs2x3tm
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sara_Jacobs
+- url: https://en.wikipedia.org/wiki/Sara_Jacobs
+- url: https://justfacts.votesmart.org/candidate/biography/179414/sara-jacobs
+- url: https://sarajacobs.house.gov
+- url: https://sarajacobs.house.gov/news/press-releases
+- url: https://sarajacobsforca.com/meet-sara
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sara_jacobs/456804
diff --git a/data/us/legislature/Scott-DesJarlais-e34e7060-b2be-56c9-a20f-42de3d875b88.yml b/data/us/legislature/Scott-DesJarlais-e34e7060-b2be-56c9-a20f-42de3d875b88.yml
index d35e643d71..5bb697f2d5 100644
--- a/data/us/legislature/Scott-DesJarlais-e34e7060-b2be-56c9-a20f-42de3d875b88.yml
+++ b/data/us/legislature/Scott-DesJarlais-e34e7060-b2be-56c9-a20f-42de3d875b88.yml
@@ -2,76 +2,69 @@ id: ocd-person/e34e7060-b2be-56c9-a20f-42de3d875b88
 name: Scott DesJarlais
 given_name: Scott
 family_name: DesJarlais
-gender: M
 birth_date: 1964-02-21
+gender: Male
+email: https://desjarlais.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/D000616.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-4
 offices:
 - classification: capitol
-  address: 2304 Rayburn House Office Building Washington DC 20515-4204
+  address: 2304 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6831
+  fax: 202-226-5172
 - classification: district
-  address: 301 Keith St. Suite 212; Cleveland, TN 37311
-  voice: 423-472-7500
-  fax: 423-472-7800
-  name: 'District Office #1'
-- classification: district
-  address: 711 N. Garden St.; Columbia, TN 38401
-  voice: 931-381-9920
-  fax: 931-381-9945
-  name: 'District Office #2'
-- classification: district
-  address: 305 W. Main St.; Murfreesboro, TN 37130
+  address: 1500 Medical Center Parkway, Suite 4A, Murfreesboro, TN 37129
   voice: 615-896-1986
   fax: 615-896-8218
-  name: 'District Office #3'
 - classification: district
-  address: 200 S. Jefferson St. Suite 311; Winchester, TN 37398
+  address: Federal Building 200 S. Jefferson St., Suite 311, Winchester, TN 37398
   voice: 931-962-3180
   fax: 931-962-3435
-  name: 'District Office #4'
 links:
 - url: https://desjarlais.house.gov
   note: website
+- url: https://desjarlais.house.gov/
+other_names:
+- name: DesJarlais, S.
+- name: S. DesJarlais
+- name: S.E. DesJarlais
 ids:
   twitter: DesJarlaisTN04
   youtube: UCvjuSLoi3hS0ECQvJLhwOkA
@@ -107,3 +100,12 @@ other_identifiers:
   identifier: Scott DesJarlais
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Scott_DesJarlais
+- url: https://desjarlais.house.gov
+- url: https://desjarlais.house.gov/biography
+- url: https://en.wikipedia.org/wiki/Scott_DesJarlais
+- url: https://justfacts.votesmart.org/candidate/123473/scott-desjarlais
+- url: https://scottdesjarlais.com/about_scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/scott_desjarlais/412477
+- url: https://www.linkedin.com/in/scott-desjarlais-2479522a
diff --git a/data/us/legislature/Scott-Fitzgerald-ad74f627-3223-5505-811c-599046becb2e.yml b/data/us/legislature/Scott-Fitzgerald-ad74f627-3223-5505-811c-599046becb2e.yml
index 9d05045d87..0fdb9b31f8 100644
--- a/data/us/legislature/Scott-Fitzgerald-ad74f627-3223-5505-811c-599046becb2e.yml
+++ b/data/us/legislature/Scott-Fitzgerald-ad74f627-3223-5505-811c-599046becb2e.yml
@@ -2,32 +2,38 @@ id: ocd-person/ad74f627-3223-5505-811c-599046becb2e
 name: Scott Fitzgerald
 given_name: Scott
 family_name: Fitzgerald
-middle_name: L.
-gender: M
 birth_date: 1963-11-16
+gender: Male
+email: https://fitzgerald.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/F000471.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-5
 offices:
 - classification: capitol
-  address: 1507 Longworth House Office Building Washington DC 20515-4905
+  address: 1507 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5101
+- classification: district
+  address: 175 E. Wisconsin Ave. Suite H, 2nd Floor, Oconomowoc, WI 53066
+  voice: 262-784-1111
 links:
 - url: https://fitzgerald.house.gov
   note: website
+- url: https://fitzgerald.house.gov/
+other_names:
+- name: Fitzgerald, S.
+- name: S. Fitzgerald
+- name: S.L. Fitzgerald
 ids:
   twitter: RepFitzgerald
 other_identifiers:
@@ -49,3 +55,10 @@ other_identifiers:
   identifier: '3446'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Scott_Fitzgerald
+- url: https://en.wikipedia.org/wiki/Scott_L._Fitzgerald
+- url: https://fitzgerald.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/3446/scott-fitzgerald
+- url: https://scottfitzgeraldforcongress.com/#meet-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/scott_fitzgerald/456855
diff --git a/data/us/legislature/Scott-Franklin-04fde057-6aef-56ae-9baa-b1450d74ab09.yml b/data/us/legislature/Scott-Franklin-04fde057-6aef-56ae-9baa-b1450d74ab09.yml
index 6c26230af8..ea4eb796e4 100644
--- a/data/us/legislature/Scott-Franklin-04fde057-6aef-56ae-9baa-b1450d74ab09.yml
+++ b/data/us/legislature/Scott-Franklin-04fde057-6aef-56ae-9baa-b1450d74ab09.yml
@@ -1,37 +1,50 @@
 id: ocd-person/04fde057-6aef-56ae-9baa-b1450d74ab09
 name: Scott Franklin
-given_name: C.
+given_name: Scott
 family_name: Franklin
-middle_name: Scott
-gender: M
 birth_date: 1964-08-23
+gender: Male
+email: https://franklin.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000472.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-18
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-18
+  district: FL-15
 offices:
 - classification: capitol
-  address: 249 Cannon House Office Building Washington DC 20515-0918
+  address: 249 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-1252
+  fax: 202-226-0585
+- classification: district
+  address: 1069 U.S. 27 North Room 116, Lake Placid, FL 33852
+  voice: 863-644-8215
+- classification: district
+  address: 124 S. Florida Ave. Suite 304, Lakeland, FL 33801
+  voice: 863-644-8215
+  fax: 863-337-4104
+- classification: district
+  address: 201 W. Central Ave., Lake Wales, FL 33853
+  voice: 863-644-8215
 links:
 - url: https://franklin.house.gov
   note: website
-ids:
-  twitter: RepFranklin
+- url: https://franklin.house.gov/
 other_names:
 - name: C. Scott Franklin
+- name: C.S. Franklin
+- name: Franklin, S.
+- name: S. Franklin
+ids:
+  twitter: RepFranklin
 other_identifiers:
 - scheme: bioguide
   identifier: F000472
@@ -49,3 +62,10 @@ other_identifiers:
   identifier: kg:/g/11ft5hszwx
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Scott_Franklin
+- url: https://en.wikipedia.org/wiki/Scott_Franklin_(politician)
+- url: https://franklin.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/191355/scott-franklin
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/scott_franklin/456807
+- url: https://www.linkedin.com/in/cscottfranklin
diff --git a/data/us/legislature/Scott-H-Peters-379b2f6a-82e3-572b-a471-75020486662e.yml b/data/us/legislature/Scott-H-Peters-379b2f6a-82e3-572b-a471-75020486662e.yml
index a587f7dbd9..c2094de5c5 100644
--- a/data/us/legislature/Scott-H-Peters-379b2f6a-82e3-572b-a471-75020486662e.yml
+++ b/data/us/legislature/Scott-H-Peters-379b2f6a-82e3-572b-a471-75020486662e.yml
@@ -1,63 +1,65 @@
 id: ocd-person/379b2f6a-82e3-572b-a471-75020486662e
-name: Scott H. Peters
+name: Scott Peters
 given_name: Scott
 family_name: Peters
-middle_name: H.
-gender: M
 birth_date: 1958-06-17
+gender: Male
+email: https://scottpeters.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/P000608.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-52
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-50
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-52
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-52
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-52
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-52
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-50
+  district: CA-52
 offices:
 - classification: capitol
-  address: 1201 Longworth House Office Building Washington DC 20515-0550
+  address: 1201 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-0508
 - classification: district
-  address: 4350 Executive Dr. Suite 105; San Diego, CA 92121
+  address: 4350 Executive Drive Suite 105, San Diego, CA 92121
   voice: 858-455-5550
-  name: 'District Office #1'
 links:
 - url: https://scottpeters.house.gov
   note: website
+- url: https://scottpeters.house.gov/
+other_names:
+- name: Peters
+- name: Peters, S.
+- name: S. Peters
+- name: S.H. Peters
+- name: Scott H. Peters
 ids:
   twitter: RepScottPeters
   youtube: UCQK77QJxW7Xr-S3zqeMd-0g
   facebook: RepScottPeters
-other_names:
-- name: Peters
 other_identifiers:
 - scheme: govtrack
   identifier: '412523'
@@ -87,3 +89,11 @@ other_identifiers:
   identifier: kg:/m/02rymxd
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Scott_Peters
+- url: https://en.wikipedia.org/wiki/Scott_Peters_(politician)
+- url: https://scottpeters.com/about
+- url: https://scottpeters.house.gov
+- url: https://scottpeters.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/scott_peters/412523
+- url: https://www.linkedin.com/in/scott-peters-50580aa
diff --git a/data/us/legislature/Scott-Perry-2ac15c4d-4052-5a49-9b5c-70b93a4e325e.yml b/data/us/legislature/Scott-Perry-2ac15c4d-4052-5a49-9b5c-70b93a4e325e.yml
index f7b7e9a34d..01221f6138 100644
--- a/data/us/legislature/Scott-Perry-2ac15c4d-4052-5a49-9b5c-70b93a4e325e.yml
+++ b/data/us/legislature/Scott-Perry-2ac15c4d-4052-5a49-9b5c-70b93a4e325e.yml
@@ -2,60 +2,66 @@ id: ocd-person/2ac15c4d-4052-5a49-9b5c-70b93a4e325e
 name: Scott Perry
 given_name: Scott
 family_name: Perry
-gender: M
 birth_date: 1962-05-27
+gender: Male
+email: https://perry.house.gov/forms/writeyourrep/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/P000605.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: PA-10
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: PA-10
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-10
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-10
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: PA-4
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-10
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: PA-4
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-10
+  district: PA-4
 offices:
 - classification: capitol
-  address: 2160 Rayburn House Office Building Washington DC 20515-3810
+  address: 2160 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5836
+  fax: 202-226-1000
 - classification: district
-  address: 800 Corporate Cir Suite 202; Harrisburg, PA 17110-9346
-  voice: 717-603-4980
-  name: 'District Office #1'
+  address: 2501 Catherine St., Suite 11, York, PA 17408
+  voice: 717-893-7868
+- classification: district
+  address: 4999 Louise Drive Suite 205, Mechanicsburg, PA 17055
+  voice: 717-550-6565
+  fax: 771-200-5802
 - classification: district
-  address: 730 N. Front St.; Wormleysburg, PA 17043
-  voice: 717-635-9504
-  fax: 717-635-9861
-  name: 'District Office #2'
+  address: 800 Corporate Circle, Suite 202, Harrisburg, PA 17110
+  voice: 717-603-4980
 links:
 - url: https://perry.house.gov
   note: website
+- url: https://perry.house.gov/
+other_names:
+- name: Perry, S.
+- name: S. Perry
+- name: S.G. Perry
 ids:
   twitter: RepScottPerry
   youtube: UCzgrU5PT_HHRgf5hXPen4dQ
@@ -89,3 +95,12 @@ other_identifiers:
   identifier: kg:/m/04mwt6y
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Scott_Perry
+- url: https://en.wikipedia.org/wiki/Scott_Perry_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/59980/scott-perry
+- url: https://patriotsforperry.com/about
+- url: https://perry.house.gov
+- url: https://perry.house.gov/about-scott/default.aspx
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/scott_perry/412569
+- url: https://www.linkedin.com/in/scott-perry-25957a10
diff --git a/data/us/legislature/Sean-Casten-89f8b007-1bf3-589a-bffe-92acf526f448.yml b/data/us/legislature/Sean-Casten-89f8b007-1bf3-589a-bffe-92acf526f448.yml
index 2779d58a46..0d3e4dfcad 100644
--- a/data/us/legislature/Sean-Casten-89f8b007-1bf3-589a-bffe-92acf526f448.yml
+++ b/data/us/legislature/Sean-Casten-89f8b007-1bf3-589a-bffe-92acf526f448.yml
@@ -2,39 +2,43 @@ id: ocd-person/89f8b007-1bf3-589a-bffe-92acf526f448
 name: Sean Casten
 given_name: Sean
 family_name: Casten
-gender: M
 birth_date: 1971-11-23
+gender: Male
+email: https://casten.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001117.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IL-6
 offices:
 - classification: capitol
-  address: 2440 Rayburn House Office Building Washington DC 20515-1306
+  address: 2440 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4561
 - classification: district
-  address: 2700 International Dr Suite 304; West Chicago, IL 60185-1670
-  name: 'District Office #1'
+  address: 800 Roosevelt Road Building C, Suite 204, Glen Ellyn, IL 60137
+  voice: 630-520-9450
 links:
 - url: https://casten.house.gov
   note: website
+- url: https://casten.house.gov/
+other_names:
+- name: Casten, S.
+- name: S. Casten
+- name: S.T. Casten
 ids:
   twitter: RepCasten
 other_identifiers:
@@ -60,3 +64,10 @@ other_identifiers:
   identifier: '176982'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sean_Casten
+- url: https://casten.house.gov
+- url: https://en.wikipedia.org/wiki/Sean_Casten
+- url: https://justfacts.votesmart.org/candidate/biography/176982/sean-casten
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sean_casten/412775
+- url: https://www.linkedin.com/in/seancasten
diff --git a/data/us/legislature/Seth-Magaziner-2b7e8cfa-f37a-5155-ac79-e769b3cf71da.yml b/data/us/legislature/Seth-Magaziner-2b7e8cfa-f37a-5155-ac79-e769b3cf71da.yml
index 5b9cf581cb..792804252c 100644
--- a/data/us/legislature/Seth-Magaziner-2b7e8cfa-f37a-5155-ac79-e769b3cf71da.yml
+++ b/data/us/legislature/Seth-Magaziner-2b7e8cfa-f37a-5155-ac79-e769b3cf71da.yml
@@ -2,27 +2,33 @@ id: ocd-person/2b7e8cfa-f37a-5155-ac79-e769b3cf71da
 name: Seth Magaziner
 given_name: Seth
 family_name: Magaziner
-middle_name: Michael
-gender: M
 birth_date: 1983-07-22
+gender: Male
+email: https://magaziner.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M001223.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: RI-2
 offices:
 - classification: capitol
-  address: 1218 Longworth House Office Building Washington DC 20515-3902
+  address: 1218 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2735
+- classification: district
+  address: 935 Jefferson Blvd. Suite 3003, Warwick, RI 02886
+  voice: 401-244-1201
 links:
 - url: https://magaziner.house.gov
   note: website
+- url: https://magaziner.house.gov/
+other_names:
+- name: Magaziner, S.
+- name: S. Magaziner
+- name: S.M. Magaziner
 other_identifiers:
 - scheme: bioguide
   identifier: M001223
@@ -40,3 +46,10 @@ other_identifiers:
   identifier: '154457'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Seth_Magaziner
+- url: https://en.wikipedia.org/wiki/Seth_Magaziner
+- url: https://justfacts.votesmart.org/candidate/154457/seth-magaziner
+- url: https://magaziner.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/seth_magaziner/456937
+- url: https://www.linkedin.com/in/sethmagaziner
diff --git a/data/us/legislature/Seth-Moulton-7cdb552c-a069-5bae-8c32-c42a2f6c04f6.yml b/data/us/legislature/Seth-Moulton-7cdb552c-a069-5bae-8c32-c42a2f6c04f6.yml
index 521a0b203e..da29883a65 100644
--- a/data/us/legislature/Seth-Moulton-7cdb552c-a069-5bae-8c32-c42a2f6c04f6.yml
+++ b/data/us/legislature/Seth-Moulton-7cdb552c-a069-5bae-8c32-c42a2f6c04f6.yml
@@ -2,51 +2,55 @@ id: ocd-person/7cdb552c-a069-5bae-8c32-c42a2f6c04f6
 name: Seth Moulton
 given_name: Seth
 family_name: Moulton
-gender: M
 birth_date: 1978-10-24
+gender: Male
+email: https://moulton.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/M001196.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-6
 offices:
 - classification: capitol
-  address: 1126 Longworth House Office Building Washington DC 20515-2106
+  address: 1126 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-8020
+  fax: 202-225-5915
 - classification: district
-  address: 21 Front St.; Salem, MA 01970
+  address: 21 Front St., Salem, MA 01970
   voice: 978-531-1669
   fax: 978-224-2270
-  name: 'District Office #1'
 links:
 - url: https://moulton.house.gov
   note: website
+- url: https://moulton.house.gov/
+other_names:
+- name: Moulton, S.
+- name: S. Moulton
+- name: S.W. Moulton
 ids:
   twitter: RepMoulton
   youtube: UC5w5qn7nj5Ljy69LTV7a_fQ
@@ -80,3 +84,11 @@ other_identifiers:
   identifier: '21525'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Seth_Moulton
+- url: https://en.wikipedia.org/wiki/Seth_Moulton
+- url: https://moulton.house.gov
+- url: https://moulton.house.gov/about
+- url: https://sethmoulton.com
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/seth_moulton/412632
+- url: https://www.linkedin.com/in/sethmoulton
diff --git a/data/us/legislature/Sharice-Davids-70056f40-1938-557d-be5d-ddb841c9f19a.yml b/data/us/legislature/Sharice-Davids-70056f40-1938-557d-be5d-ddb841c9f19a.yml
index 59bb8f8c89..04f9c2ab0b 100644
--- a/data/us/legislature/Sharice-Davids-70056f40-1938-557d-be5d-ddb841c9f19a.yml
+++ b/data/us/legislature/Sharice-Davids-70056f40-1938-557d-be5d-ddb841c9f19a.yml
@@ -2,45 +2,46 @@ id: ocd-person/70056f40-1938-557d-be5d-ddb841c9f19a
 name: Sharice Davids
 given_name: Sharice
 family_name: Davids
-gender: F
 birth_date: 1980-05-22
+gender: Female
+email: https://davids.house.gov/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/D000629.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-3
 offices:
 - classification: capitol
-  address: 2435 Rayburn House Office Building Washington DC 20515-1603
+  address: 2435 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2865
 - classification: district
-  address: 7325 W 79th St; Overland Park, KS 66204-2908
+  address: 9200 Indian Creek Parkway Suite 562, Overland Park, KS 66210
   voice: 913-621-0832
-  fax: 913-621-1533
-  name: 'District Office #1'
 links:
 - url: https://davids.house.gov
   note: website
-ids:
-  twitter: RepDavids
+- url: https://davids.house.gov/
 other_names:
 - name: Davids (KS)
+- name: Davids, S.
+- name: S. Davids
+- name: S.L. Davids
+ids:
+  twitter: RepDavids
 other_identifiers:
 - scheme: bioguide
   identifier: D000629
@@ -64,3 +65,10 @@ other_identifiers:
   identifier: kg:/g/11fgm1fq16
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sharice_Davids
+- url: https://davids.house.gov
+- url: https://en.wikipedia.org/wiki/Sharice_Davids
+- url: https://justfacts.votesmart.org/candidate/biography/181201/sharice-davids
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sharice_davids/412780
+- url: https://www.linkedin.com/in/sharicedavids
diff --git a/data/us/legislature/Sheila-Cherfilus-McCormick-89e894b3-e6a6-5c7c-bc77-dd60cc826b0d.yml b/data/us/legislature/Sheila-Cherfilus-McCormick-89e894b3-e6a6-5c7c-bc77-dd60cc826b0d.yml
index 04f9173ec2..27b7c08f01 100644
--- a/data/us/legislature/Sheila-Cherfilus-McCormick-89e894b3-e6a6-5c7c-bc77-dd60cc826b0d.yml
+++ b/data/us/legislature/Sheila-Cherfilus-McCormick-89e894b3-e6a6-5c7c-bc77-dd60cc826b0d.yml
@@ -2,31 +2,41 @@ id: ocd-person/89e894b3-e6a6-5c7c-bc77-dd60cc826b0d
 name: Sheila Cherfilus-McCormick
 given_name: Sheila
 family_name: Cherfilus-McCormick
-gender: F
 birth_date: 1979-01-25
+gender: Female
+email: https://cherfilus-mccormick.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001127.jpg
 party:
-- start_date: '2022-01-18'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2022-01-18'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-20
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2022-01-18
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-20
 offices:
 - classification: capitol
-  address: 242 Cannon House Office Building Washington DC 20515-0920
+  address: 242 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-1313
+  fax: 202-225-1171
+- classification: district
+  address: 5701 NW 88th Ave. Suite 200, Tamarac, FL 33321
+  voice: 954-733-2800
+- classification: district
+  address: 5725 Corporate Way Suite 208, West Palm Beach, FL 33407
+  voice: 561-461-6767
 links:
 - url: https://cherfilus-mccormick.house.gov
   note: website
+- url: https://cherfilus-mccormick.house.gov/
+other_names:
+- name: Cherfilus-McCormick, S.
+- name: S. Cherfilus-McCormick
 other_identifiers:
 - scheme: bioguide
   identifier: C001127
@@ -42,3 +52,9 @@ other_identifiers:
   identifier: Q109560948
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sheila_Cherfilus-McCormick
+- url: https://cherfilus-mccormick.house.gov
+- url: https://en.wikipedia.org/wiki/Sheila_Cherfilus-McCormick
+- url: https://justfacts.votesmart.org/candidate/biography/182285/sheila-cherfilus-mccormick
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/sheila-cherfilus-mccormick-jd-15782079
diff --git a/data/us/legislature/Sheldon-Whitehouse-fd0623ac-bbc8-5c5e-839f-37148d89c36e.yml b/data/us/legislature/Sheldon-Whitehouse-fd0623ac-bbc8-5c5e-839f-37148d89c36e.yml
index 3ded23600a..b151143b61 100644
--- a/data/us/legislature/Sheldon-Whitehouse-fd0623ac-bbc8-5c5e-839f-37148d89c36e.yml
+++ b/data/us/legislature/Sheldon-Whitehouse-fd0623ac-bbc8-5c5e-839f-37148d89c36e.yml
@@ -2,49 +2,51 @@ id: ocd-person/fd0623ac-bbc8-5c5e-839f-37148d89c36e
 name: Sheldon Whitehouse
 given_name: Sheldon
 family_name: Whitehouse
-gender: M
 birth_date: 1955-10-20
+gender: Male
+email: https://www.whitehouse.senate.gov/contact/email-sheldon/
 image: https://theunitedstates.io/images/congress/450x550/W000802.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2013-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Rhode Island
 offices:
 - classification: capitol
-  address: 530 Hart Senate Office Building Washington DC 20510
+  address: 530 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2921
+  fax: 202-228-6362
 - classification: district
-  address: 170 Westminster St. Suite 200; Providence, RI 02903
+  address: 170 Westminster St. Suite 200, Providence, RI 02903
   voice: 401-453-5294
   fax: 401-453-5085
-  name: 'District Office #1'
 links:
 - url: https://www.whitehouse.senate.gov
   note: website
 - url: https://www.whitehouse.senate.gov/contact/email-sheldon
   note: contact form
+- url: https://www.whitehouse.senate.gov/
+other_names:
+- name: S. Whitehouse
+- name: Whitehouse (D-RI)
+- name: Whitehouse, S.
 ids:
   twitter: SenWhitehouse
   youtube: UCnG0N70SNBkNqvIMLodPTIA
   facebook: SenatorWhitehouse
-other_names:
-- name: Whitehouse (D-RI)
 other_identifiers:
 - scheme: bioguide
   identifier: W000802
@@ -76,3 +78,11 @@ other_identifiers:
   identifier: kg:/m/07qw94
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sheldon_Whitehouse
+- url: https://en.wikipedia.org/wiki/Sheldon_Whitehouse
+- url: https://justfacts.votesmart.org/candidate/2572/sheldon-whitehouse
+- url: https://theunitedstates.io
+- url: https://whitehouseforsenate.com/meet-sheldon
+- url: https://www.govtrack.us/congress/members/sheldon_whitehouse/412247
+- url: https://www.whitehouse.senate.gov
+- url: https://www.whitehouse.senate.gov/about
diff --git a/data/us/legislature/Shelley-Moore-Capito-793e5b46-2682-51ff-bfca-adf217ca9a65.yml b/data/us/legislature/Shelley-Moore-Capito-793e5b46-2682-51ff-bfca-adf217ca9a65.yml
index 3aa9da7af8..2f476297b3 100644
--- a/data/us/legislature/Shelley-Moore-Capito-793e5b46-2682-51ff-bfca-adf217ca9a65.yml
+++ b/data/us/legislature/Shelley-Moore-Capito-793e5b46-2682-51ff-bfca-adf217ca9a65.yml
@@ -1,92 +1,87 @@
 id: ocd-person/793e5b46-2682-51ff-bfca-adf217ca9a65
 name: Shelley Moore Capito
-given_name: Shelley
+given_name: Shelley Moore
 family_name: Capito
-middle_name: Moore
-gender: F
 birth_date: 1953-11-26
+gender: Female
+email: https://www.capito.senate.gov/contact/contact-my-office
 image: https://theunitedstates.io/images/congress/450x550/C001047.jpg
 party:
-- start_date: '2001-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: West Virginia
+- start_date: 2015-01-06
+  end_date: 2021-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: West Virginia
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WV-2
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: West Virginia
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: West Virginia
 offices:
 - classification: capitol
-  address: 170 Russell Senate Office Building Washington DC 20510
+  address: 170 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-6472
 - classification: district
-  address: 220 N. Kanawha St. Suite 1; Beckley, WV 25801
-  voice: 304-347-5372
-  name: 'District Office #1'
-- classification: district
-  address: 500 Virgina Street East Suite 950; Charleston, WV 25301
-  voice: 304-347-5372
-  name: 'District Office #2'
-- classification: district
-  address: 300 Foxcroft Ave. Suite 202A; Martinsburg, WV 25401
+  address: 300 Foxcroft Ave. Suite 202A, Martinsburg, WV 25401
   voice: 304-262-9285
-  name: 'District Office #3'
 - classification: district
-  address: 48 Donley St. Suite 504; Morgantown, WV 26501
+  address: 48 Donley St. Suite 504, Morgantown, WV 26501
   voice: 304-292-2310
-  name: 'District Office #4'
+- classification: district
+  address: 500 Virginia St. East Suite 950, Charleston, WV 25301
+  voice: 304-347-5372
 links:
 - url: https://www.capito.senate.gov
   note: website
 - url: https://www.capito.senate.gov/contact/contact-shelley
   note: contact form
+- url: https://www.capito.senate.gov/
+other_names:
+- name: Capito (R-WV)
+- name: Capito, S.
+- name: S. Capito
+- name: S.W.M. Capito
 ids:
   twitter: SenCapito
   youtube: UCbiXdR4XQ3vD9Xp5lfR9QXw
   facebook: senshelley
-other_names:
-- name: Capito (R-WV)
 other_identifiers:
 - scheme: bioguide
   identifier: C001047
@@ -122,3 +117,8 @@ other_identifiers:
   identifier: kg:/m/024pwq
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Shelley_Moore_Capito
+- url: https://en.wikipedia.org/wiki/Shelley_Moore_Capito
+- url: https://theunitedstates.io
+- url: https://www.capito.senate.gov
+- url: https://www.govtrack.us/congress/members/shelley_capito/400061
diff --git a/data/us/legislature/Sherrod-Brown-b84b6427-85e2-5d0c-b9e8-a44270378405.yml b/data/us/legislature/Sherrod-Brown-b84b6427-85e2-5d0c-b9e8-a44270378405.yml
index 85ae93d90c..1021b749c5 100644
--- a/data/us/legislature/Sherrod-Brown-b84b6427-85e2-5d0c-b9e8-a44270378405.yml
+++ b/data/us/legislature/Sherrod-Brown-b84b6427-85e2-5d0c-b9e8-a44270378405.yml
@@ -2,99 +2,100 @@ id: ocd-person/b84b6427-85e2-5d0c-b9e8-a44270378405
 name: Sherrod Brown
 given_name: Sherrod
 family_name: Brown
-gender: M
 birth_date: 1952-11-09
+gender: Male
+email: https://www.brown.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/B000944.jpg
 party:
-- start_date: '1993-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2007-01-03
+  end_date: 2025-01-02
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Ohio
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Ohio
+- start_date: 2007-01-04
+  end_date: 2013-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Ohio
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-13
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Ohio
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Ohio
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Ohio
 offices:
 - classification: capitol
-  address: 503 Hart Senate Office Building Washington DC 20510
+  address: 503 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2315
+  fax: 202-228-6321
 - classification: district
-  address: 425 Walnut St. Suite 2310; Cincinnati, OH 45202
+  address: 200 W. Erie Ave. Suite 312, Lorain, OH 44052
+  voice: 440-242-4100
+  fax: 202-228-2318
+- classification: district
+  address: 550 Main St. Suite 10-273, Cincinnati, OH 45202
   voice: 513-684-1021
-  fax: 513-684-1029
-  name: 'District Office #1'
+  fax: 202-228-2028
 - classification: district
-  address: 801 W. Superior Ave. Suite 1400; Cleveland, OH 44113
+  address: 801 W. Superior Ave. Suite 1400, Cleveland, OH 44113
   voice: 216-522-7272
-  fax: 216-522-2239
-  name: 'District Office #2'
+  fax: 202-228-2307
 - classification: district
-  address: 200 N. High St. Room 614; Columbus, OH 43215
+  address: John W. Bricker Federal Building 200 N. High St., Room 614, Columbus, OH
+    43215
   voice: 614-469-2083
-  fax: 614-469-2171
-  name: 'District Office #3'
-- classification: district
-  address: 200 W. Erie Ave. Suite 312; Lorain, OH 44052
-  voice: 440-242-4100
-  fax: 440-242-4108
-  name: 'District Office #4'
+  fax: 202-228-2207
 links:
 - url: https://www.brown.senate.gov
   note: website
 - url: https://www.brown.senate.gov/contact/
   note: contact form
+- url: https://www.brown.senate.gov/
+other_names:
+- name: Brown (D-OH)
+- name: Brown, S.
+- name: S. Brown
+- name: S.C. Brown
 ids:
   twitter: SenSherrodBrown
   youtube: UCgy8jfERh-t_ixkKKoCmglQ
   facebook: SenatorSherrodBrown
-other_names:
-- name: Brown (D-OH)
 other_identifiers:
 - scheme: bioguide
   identifier: B000944
@@ -130,3 +131,10 @@ other_identifiers:
   identifier: kg:/m/034s80
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sherrod_Brown
+- url: https://en.wikipedia.org/wiki/Sherrod_Brown
+- url: https://justfacts.votesmart.org/candidate/biography/27018/sherrod-brown
+- url: https://theunitedstates.io
+- url: https://www.brown.senate.gov
+- url: https://www.brown.senate.gov/biography
+- url: https://www.govtrack.us/congress/members/sherrod_brown/400050
diff --git a/data/us/legislature/Shontel-M-Brown-f2916088-1774-50ba-8023-34f7fe686e49.yml b/data/us/legislature/Shontel-M-Brown-f2916088-1774-50ba-8023-34f7fe686e49.yml
index ac6c35e400..4472103af8 100644
--- a/data/us/legislature/Shontel-M-Brown-f2916088-1774-50ba-8023-34f7fe686e49.yml
+++ b/data/us/legislature/Shontel-M-Brown-f2916088-1774-50ba-8023-34f7fe686e49.yml
@@ -1,37 +1,47 @@
 id: ocd-person/f2916088-1774-50ba-8023-34f7fe686e49
-name: Shontel M. Brown
+name: Shontel Brown
 given_name: Shontel
 family_name: Brown
-middle_name: M.
-gender: F
 birth_date: 1975-06-24
+gender: Female
+email: https://shontelbrown.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B001313.jpg
 party:
-- start_date: '2021-11-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-11-04'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-11
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-11-04
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-11
 offices:
 - classification: capitol
-  address: 449 Cannon House Office Building Washington DC 20515-3511
+  address: 449 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-7032
+  fax: 202-225-1339
+- classification: district
+  address: 17021 Lorain Ave., Cleveland, OH 44111
+  voice: 216-535-1100
+- classification: district
+  address: 25200 Chagrin Blvd. Suite 200, Beachwood, OH 44122
+  voice: 216-522-4900
 links:
 - url: https://shontelbrown.house.gov
   note: website
-ids:
-  twitter: RepShontelBrown
+- url: https://shontelbrown.house.gov/
 other_names:
 - name: Brown
+- name: Brown, S.
+- name: S. Brown
+- name: S.M. Brown
+- name: Shontel M. Brown
+ids:
+  twitter: RepShontelBrown
 other_identifiers:
 - scheme: bioguide
   identifier: B001313
@@ -47,3 +57,12 @@ other_identifiers:
   identifier: Q107863952
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Shontel_Brown
+- url: https://en.wikipedia.org/wiki/Shontel_Brown
+- url: https://justfacts.votesmart.org/candidate/biography/161622/shontel-brown
+- url: https://shontelbrown.com/meet-shontel
+- url: https://shontelbrown.house.gov
+- url: https://shontelbrown.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/shontel_brown/456863
+- url: https://www.linkedin.com/in/shontelmbrown
diff --git a/data/us/legislature/Shri-Thanedar-cca4b382-1b0b-5872-86a8-abe74e9f6e3a.yml b/data/us/legislature/Shri-Thanedar-cca4b382-1b0b-5872-86a8-abe74e9f6e3a.yml
index f68cf57b64..7eeb302670 100644
--- a/data/us/legislature/Shri-Thanedar-cca4b382-1b0b-5872-86a8-abe74e9f6e3a.yml
+++ b/data/us/legislature/Shri-Thanedar-cca4b382-1b0b-5872-86a8-abe74e9f6e3a.yml
@@ -2,26 +2,34 @@ id: ocd-person/cca4b382-1b0b-5872-86a8-abe74e9f6e3a
 name: Shri Thanedar
 given_name: Shri
 family_name: Thanedar
-gender: M
 birth_date: 1955-02-22
+gender: Male
+email: https://thanedar.house.gov/contact/email
 image: https://theunitedstates.io/images/congress/450x550/T000488.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-13
 offices:
 - classification: capitol
-  address: 1039 Longworth House Office Building Washington DC 20515-2213
+  address: 1039 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5802
+  fax: 202-226-2356
+- classification: district
+  address: 400 Monroe St. Suite 420, Detroit, MI 48226
+  voice: 313-880-2400
+  fax: 313-731-1843
 links:
 - url: https://thanedar.house.gov
   note: website
+- url: https://thanedar.house.gov/
+other_names:
+- name: S. Thanedar
+- name: Thanedar, S.
 ids:
   twitter: RepShriThanedar
 other_identifiers:
@@ -43,3 +51,12 @@ other_identifiers:
   identifier: '182346'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Shri_Thanedar
+- url: https://en.wikipedia.org/wiki/Shri_Thanedar
+- url: https://justfacts.votesmart.org/candidate/biography/182346/shri-thanedar
+- url: https://shriforcongress.com/about
+- url: https://thanedar.house.gov
+- url: https://thanedar.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/shri_thanedar/456908
+- url: https://www.linkedin.com/in/shri-thanedar-ph-d-19039016
diff --git a/data/us/legislature/Stacey-E-Plaskett-8b830e4d-1e2b-5b7b-9f71-6152222a342f.yml b/data/us/legislature/Stacey-E-Plaskett-8b830e4d-1e2b-5b7b-9f71-6152222a342f.yml
index eaa7869c5c..d3917e7b27 100644
--- a/data/us/legislature/Stacey-E-Plaskett-8b830e4d-1e2b-5b7b-9f71-6152222a342f.yml
+++ b/data/us/legislature/Stacey-E-Plaskett-8b830e4d-1e2b-5b7b-9f71-6152222a342f.yml
@@ -1,58 +1,61 @@
 id: ocd-person/8b830e4d-1e2b-5b7b-9f71-6152222a342f
-name: Stacey E. Plaskett
+name: Stacey Plaskett
 given_name: Stacey
 family_name: Plaskett
-middle_name: E.
-gender: F
 birth_date: 1966-05-13
+gender: Female
+email: https://plaskett.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/P000610.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VI-AL
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VI-AL
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VI-AL
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VI-AL
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: VI-AL
 offices:
 - classification: capitol
-  address: 2059 Rayburn House Office Building Washington DC 20515-5500
+  address: 2059 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1790
+  fax: 202-225-5517
 - classification: district
-  address: 60 King St.; Frederiksted, VI 00840
+  address: 60 King St., Frederiksted, VI 00840
   voice: 340-778-5900
   fax: 340-778-5111
-  name: 'District Office #1'
 - classification: district
-  address: 9100 Havensight Suite 22; St. Thomas, VI 00802
+  address: 9100 Havensight Port of Sale Mall Suite 22, St. Thomas, VI 00802
   voice: 340-774-4408
   fax: 340-774-8033
-  name: 'District Office #2'
 links:
 - url: https://plaskett.house.gov
   note: website
+- url: https://plaskett.house.gov/
+other_names:
+- name: Plaskett, S.
+- name: S. Plaskett
+- name: S.E. Plaskett
+- name: Stacey E. Plaskett
 ids:
   twitter: StaceyPlaskett
   youtube: UC3V7biFZHDFHDFZy6cCSZUA
@@ -84,3 +87,12 @@ other_identifiers:
   identifier: '155929'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Stacey_Plaskett
+- url: https://en.wikipedia.org/wiki/Stacey_Plaskett
+- url: https://justfacts.votesmart.org/candidate/biography/155929/stacey-plaskett
+- url: https://plaskett.house.gov
+- url: https://plaskett.house.gov/biography
+- url: https://plaskettforcongress.org/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/stacey_plaskett/412659
+- url: https://www.linkedin.com/in/stacey-plaskett-10b5a448
diff --git a/data/us/legislature/Steny-H-Hoyer-5554fdf4-9035-5d23-aeb0-fee7d786fa81.yml b/data/us/legislature/Steny-H-Hoyer-5554fdf4-9035-5d23-aeb0-fee7d786fa81.yml
index 3742909f73..45d592fc63 100644
--- a/data/us/legislature/Steny-H-Hoyer-5554fdf4-9035-5d23-aeb0-fee7d786fa81.yml
+++ b/data/us/legislature/Steny-H-Hoyer-5554fdf4-9035-5d23-aeb0-fee7d786fa81.yml
@@ -1,143 +1,147 @@
 id: ocd-person/5554fdf4-9035-5d23-aeb0-fee7d786fa81
-name: Steny H. Hoyer
+name: Steny Hoyer
 given_name: Steny
 family_name: Hoyer
-middle_name: H.
-gender: M
 birth_date: 1939-06-14
+gender: Male
+email: https://hoyer.house.gov/address_authentication?form=/help/contact
 image: https://theunitedstates.io/images/congress/450x550/H000874.jpg
 party:
-- start_date: '1981-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1981-01-05'
-  end_date: '1983-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1993-01-05'
-  end_date: '1995-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1993-01-05
+  end_date: 1995-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 1981-01-05
+  end_date: 1983-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MD-5
 offices:
 - classification: capitol
-  address: 1705 Longworth House Office Building Washington DC 20515-2005
+  address: 1705 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4131
+  fax: 202-225-4300
 - classification: district
-  address: 6500 Cherrywood Ln. Suite 310; Greenbelt, MD 20770
-  voice: 301-474-0119
-  fax: 301-474-4697
-  name: 'District Office #1'
-- classification: district
-  address: 4475 Regency Pl. Suite 203; White Plains, MD 20695
+  address: 4475 Regency Place, Suite 203, White Plains, MD 20695
   voice: 301-843-1577
   fax: 301-843-1331
-  name: 'District Office #2'
+- classification: district
+  address: U.S District Courthouse 6500 Cherrywood Lane, Suite 310, Greenbelt, MD
+    20770
+  voice: 301-474-0119
+  fax: 301-474-4697
 links:
 - url: https://hoyer.house.gov
   note: website
+- url: https://hoyer.house.gov/
+other_names:
+- name: Hoyer, S.
+- name: S. Hoyer
+- name: S.H. Hoyer
+- name: Steny H. Hoyer
 ids:
   twitter: RepStenyHoyer
   youtube: UCvxgqX65cdhHNjJn64cgY9g
@@ -173,3 +177,11 @@ other_identifiers:
   identifier: kg:/m/025k5p
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steny_Hoyer
+- url: https://en.wikipedia.org/wiki/Steny_Hoyer
+- url: https://hoyer.house.gov
+- url: https://hoyer.house.gov/about-steny
+- url: https://justfacts.votesmart.org/candidate/26890/steny-hoyer
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/steny_hoyer/400189
+- url: https://www.hoyerforcongress.com/about
diff --git a/data/us/legislature/Stephanie-I-Bice-2add0122-3206-5502-985b-18808db8f685.yml b/data/us/legislature/Stephanie-I-Bice-2add0122-3206-5502-985b-18808db8f685.yml
index bcff5031ec..e76500a993 100644
--- a/data/us/legislature/Stephanie-I-Bice-2add0122-3206-5502-985b-18808db8f685.yml
+++ b/data/us/legislature/Stephanie-I-Bice-2add0122-3206-5502-985b-18808db8f685.yml
@@ -1,33 +1,41 @@
 id: ocd-person/2add0122-3206-5502-985b-18808db8f685
-name: Stephanie I. Bice
+name: Stephanie Bice
 given_name: Stephanie
 family_name: Bice
-middle_name: I.
-gender: F
 birth_date: 1973-11-11
+gender: Female
+email: https://bice.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/B000740.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-5
 offices:
 - classification: capitol
-  address: 2437 Rayburn House Office Building Washington DC 20515-3605
+  address: 2437 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2132
+- classification: district
+  address: 500 N. Broadway Suite 250, Oklahoma City, OK 73102
+  voice: 405-300-6890
+  fax: 855-235-5024
 links:
 - url: https://bice.house.gov
   note: website
+- url: https://bice.house.gov/
+other_names:
+- name: Bice, S.
+- name: S. Bice
+- name: S.I. Bice
+- name: Stephanie I. Bice
 ids:
   twitter: RepBice
 other_identifiers:
@@ -49,3 +57,10 @@ other_identifiers:
   identifier: Stephanie Bice
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Stephanie_Bice
+- url: https://bice.house.gov
+- url: https://en.wikipedia.org/wiki/Stephanie_Bice
+- url: https://justfacts.votesmart.org/candidate/biography/152294/stephanie-bice
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/stephanie_bice/456841
+- url: https://www.linkedin.com/in/sibice
diff --git a/data/us/legislature/Stephen-F-Lynch-cc7120d8-f57d-5841-9526-3429e9f0f2c2.yml b/data/us/legislature/Stephen-F-Lynch-cc7120d8-f57d-5841-9526-3429e9f0f2c2.yml
index e9b52ec611..169e123cb2 100644
--- a/data/us/legislature/Stephen-F-Lynch-cc7120d8-f57d-5841-9526-3429e9f0f2c2.yml
+++ b/data/us/legislature/Stephen-F-Lynch-cc7120d8-f57d-5841-9526-3429e9f0f2c2.yml
@@ -1,98 +1,100 @@
 id: ocd-person/cc7120d8-f57d-5841-9526-3429e9f0f2c2
-name: Stephen F. Lynch
+name: Stephen Lynch
 given_name: Stephen
 family_name: Lynch
-middle_name: F.
-gender: M
 birth_date: 1955-03-31
+gender: Male
+email: https://lynch.house.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/L000562.jpg
 party:
-- start_date: '2001-10-23'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2001-10-23'
-  end_date: '2003-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: MA-8
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: MA-8
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: MA-8
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: MA-8
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: MA-8
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: MA-8
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: MA-9
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: MA-9
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: MA-9
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: MA-9
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: MA-9
+- start_date: 2001-10-23
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-8
+  district: MA-9
 offices:
 - classification: capitol
-  address: 2109 Rayburn House Office Building Washington DC 20515-2108
+  address: 2109 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-8273
+  fax: 202-225-3984
 - classification: district
-  address: One Harbor Street Suite 304; Boston, MA 02210
+  address: 1 Harbor St. Suite 101 (South Entrance), Boston, MA 02210
   voice: 617-428-2000
   fax: 617-428-2011
-  name: 'District Office #1'
 - classification: district
-  address: 37 Belmont Street 2nd Floor, Suite 3; Brockton, MA 02301
+  address: 1245 Hancock St. Suite 41, Quincy, MA 02169
+  voice: 617-657-6305
+  fax: 617-773-0995
+- classification: district
+  address: 37 Belmont St. 2nd Floor, Suite 3, Brockton, MA 02301
   voice: 508-586-5555
   fax: 508-580-4692
-  name: 'District Office #2'
-- classification: district
-  address: 1245 Hancock St. Suite 41; Quincy, MA 02169
-  voice: 617-657-6305
-  fax: 617-773-0955
-  name: 'District Office #3'
 links:
 - url: https://lynch.house.gov
   note: website
+- url: https://lynch.house.gov/
+other_names:
+- name: Lynch, S.
+- name: S. Lynch
+- name: S.F. Lynch
+- name: Stephen F. Lynch
 ids:
   twitter: RepStephenLynch
   youtube: UCxL4zG0YWqC5XTO4af_FOgw
@@ -130,3 +132,9 @@ other_identifiers:
   identifier: kg:/m/028vsz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Stephen_Lynch
+- url: https://en.wikipedia.org/wiki/Stephen_F._Lynch
+- url: https://justfacts.votesmart.org/candidate/4844/stephen-lynch
+- url: https://lynch.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/stephen_lynch/400249
diff --git a/data/us/legislature/Steve-Cohen-e56dabed-c7b4-51c2-a29b-c9850bc9feff.yml b/data/us/legislature/Steve-Cohen-e56dabed-c7b4-51c2-a29b-c9850bc9feff.yml
index 85b28c5af5..b017a10ac3 100644
--- a/data/us/legislature/Steve-Cohen-e56dabed-c7b4-51c2-a29b-c9850bc9feff.yml
+++ b/data/us/legislature/Steve-Cohen-e56dabed-c7b4-51c2-a29b-c9850bc9feff.yml
@@ -2,71 +2,76 @@ id: ocd-person/e56dabed-c7b4-51c2-a29b-c9850bc9feff
 name: Steve Cohen
 given_name: Steve
 family_name: Cohen
-gender: M
 birth_date: 1949-05-24
+gender: Male
+email: https://cohen.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/C001068.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-9
 offices:
 - classification: capitol
-  address: 2268 Rayburn House Office Building Washington DC 20515-4209
+  address: 2268 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3265
+  fax: 202-225-5663
 - classification: district
-  address: 167 N. Main St. Suite 369; Memphis, TN 38103
+  address: Clifford Davis/Odell Horton Federal Building 167 N. Main St., Suite 369,
+    Memphis, TN 38103
   voice: 901-544-4131
   fax: 901-544-4329
-  name: 'District Office #1'
 links:
 - url: https://cohen.house.gov
   note: website
+- url: https://cohen.house.gov/
+other_names:
+- name: Cohen, S.
+- name: S. Cohen
+- name: S.I. Cohen
 ids:
   twitter: RepCohen
   youtube: UC_NJlnsOBjOameUwZk0rvsA
@@ -102,3 +107,9 @@ other_identifiers:
   identifier: Steve Cohen
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steve_Cohen
+- url: https://cohen.house.gov
+- url: https://en.wikipedia.org/wiki/Steve_Cohen
+- url: https://justfacts.votesmart.org/candidate/24340/steve-cohen
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/steve_cohen/412236
diff --git a/data/us/legislature/Steve-Daines-75cfdbf0-b681-5535-8a97-b53310335e72.yml b/data/us/legislature/Steve-Daines-75cfdbf0-b681-5535-8a97-b53310335e72.yml
index 17c178531c..33248d5c5c 100644
--- a/data/us/legislature/Steve-Daines-75cfdbf0-b681-5535-8a97-b53310335e72.yml
+++ b/data/us/legislature/Steve-Daines-75cfdbf0-b681-5535-8a97-b53310335e72.yml
@@ -2,76 +2,75 @@ id: ocd-person/75cfdbf0-b681-5535-8a97-b53310335e72
 name: Steve Daines
 given_name: Steve
 family_name: Daines
-gender: M
 birth_date: 1962-08-20
+gender: Male
+email: https://www.daines.senate.gov/services/email-steve/
 image: https://theunitedstates.io/images/congress/450x550/D000618.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: MT-1
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Montana
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Montana
+- start_date: 2013-01-03
+  end_date: 2015-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: MT-1
 offices:
 - classification: capitol
-  address: 320 Hart Senate Office Building Washington DC 20510
+  address: 320 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2651
+  fax: 202-228-1236
 - classification: district
-  address: 222 N. 32nd St. Suite 100; Billings, MT 59101
-  voice: 406-245-6822
-  name: 'District Office #1'
+  address: 104 4th St. North Suite 302, Great Falls, MT 59401
+  voice: 406-453-0148
+  fax: 406-453-5379
 - classification: district
-  address: 13 S. Willson Ave. Suite 8; Bozeman, MT 59718
+  address: 1450 Twin Lakes Ave. Suite 201A, Bozeman, MT 59715
   voice: 406-587-3446
-  name: 'District Office #2'
+  fax: 406-587-3951
 - classification: district
-  address: 104 4th Street North Suite 302; Great Falls, MT 59401
-  voice: 406-453-0148
-  name: 'District Office #3'
+  address: 218 E. Front St. Suite 103, Missoula, MT 59802
+  voice: 406-549-8198
+  fax: 406-549-0905
 - classification: district
-  address: 310 N Ctr.; Hardin, MT 59034
-  voice: 406-665-4126
-  name: 'District Office #4'
+  address: 222 N. 32nd St. Suite 100, Billings, MT 59101
+  voice: 406-245-6822
+  fax: 406-245-1607
 - classification: district
-  address: 30 W. 14th St. Suite 206; Helena, MT 59601
+  address: 30 W. 14th St. Suite 206, Helena, MT 59601
   voice: 406-443-3189
-  name: 'District Office #5'
+  fax: 406-443-3306
 - classification: district
-  address: 40 2nd St East Suite 211; Kalispell, MT 59901
-  voice: 406-257-3765
-  name: 'District Office #6'
-- classification: district
-  address: 218 E. Front St. Suite 103; Missoula, MT 59802
-  voice: 406-549-8198
-  name: 'District Office #7'
-- classification: district
-  address: '609 S. Central Ave. Suite #4; Sidney, MT 59270'
+  address: 609 S. Central Ave. Suite 4, Sidney, MT 59270
   voice: 406-482-9010
-  name: 'District Office #8'
+  fax: 406-482-9059
+- classification: district
+  address: P.O. Box 2310, Kalispell, MT 59903
+  voice: 406-257-3765
 links:
 - url: https://www.daines.senate.gov
   note: website
 - url: https://www.daines.senate.gov/connect/email-steve
   note: contact form
+- url: https://www.daines.senate.gov/
+other_names:
+- name: Daines (R-MT)
+- name: Daines, S.
+- name: S. Daines
+- name: S.D. Daines
 ids:
   twitter: SteveDaines
   youtube: UC-ny-W5mEUGytiyMdXbQ20Q
   facebook: SteveDainesMT
-other_names:
-- name: Daines (R-MT)
 other_identifiers:
 - scheme: govtrack
   identifier: '412549'
@@ -105,3 +104,10 @@ other_identifiers:
   identifier: kg:/m/03qlc5t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steve_Daines
+- url: https://en.wikipedia.org/wiki/Steve_Daines
+- url: https://justfacts.votesmart.org/candidate/135720/steve-daines
+- url: https://theunitedstates.io
+- url: https://www.daines.senate.gov
+- url: https://www.govtrack.us/congress/members/steve_daines/412549
+- url: https://www.linkedin.com/in/stevedaines
diff --git a/data/us/legislature/Steve-Scalise-b86826b1-800d-5976-98fa-617ccb74ce88.yml b/data/us/legislature/Steve-Scalise-b86826b1-800d-5976-98fa-617ccb74ce88.yml
index 51f0618ad2..05ec6dba1a 100644
--- a/data/us/legislature/Steve-Scalise-b86826b1-800d-5976-98fa-617ccb74ce88.yml
+++ b/data/us/legislature/Steve-Scalise-b86826b1-800d-5976-98fa-617ccb74ce88.yml
@@ -2,83 +2,82 @@ id: ocd-person/b86826b1-800d-5976-98fa-617ccb74ce88
 name: Steve Scalise
 given_name: Steve
 family_name: Scalise
-middle_name: Joseph
-gender: M
 birth_date: 1965-10-06
+gender: Male
+email: https://scaliseforms.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S001176.jpg
 party:
-- start_date: '2008-05-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2008-05-07'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2008-05-07
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-1
 offices:
 - classification: capitol
-  address: 2049 Rayburn House Office Building Washington DC 20515-1801
+  address: 2049 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3015
 - classification: district
-  address: 1514 Martens Dr. Suite 10; Hammond, LA 70401
+  address: 110 W. Hickory St., Ponchatoula, LA 70454
   voice: 985-340-2185
-  name: 'District Office #1'
 - classification: district
-  address: 8026 Main St. Suite 700; Houma, LA 70360
-  voice: 985-879-2300
-  name: 'District Office #2'
+  address: 111 Veterans Memorial Blvd. Suite 803, Metairie, LA 70005
+  voice: 504-837-1259
 - classification: district
-  address: 21454 Koop Drive Suite 2C; Mandeville, LA 70471
+  address: 21454 Koop Drive Suite 2C, Mandeville, LA 70471
   voice: 985-893-9064
-  name: 'District Office #3'
 - classification: district
-  address: 110 Veterans Blvd. Suite 500; Metairie, LA 70005
-  voice: 504-837-1259
-  name: 'District Office #4'
+  address: 8026 Main St. Suite 700, Houma, LA 70360
+  voice: 985-879-2300
 links:
 - url: https://scalise.house.gov
   note: website
+- url: https://scalise.house.gov/
+other_names:
+- name: S. Scalise
+- name: S.J. Scalise
+- name: Scalise, S.
 ids:
   twitter: SteveScalise
   youtube: UCmYveHBVXVBRxl7GiCL-gjw
@@ -114,3 +113,10 @@ other_identifiers:
   identifier: kg:/m/0br34c
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steve_Scalise
+- url: https://en.wikipedia.org/wiki/Steve_Scalise
+- url: https://justfacts.votesmart.org/candidate/9026/steve-scalise
+- url: https://scalise.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/steve_scalise/412261
+- url: https://www.linkedin.com/in/steve-scalise-4a74205
diff --git a/data/us/legislature/Steve-Womack-b3fc0e27-b0a3-5106-ae4f-65d6cc93c031.yml b/data/us/legislature/Steve-Womack-b3fc0e27-b0a3-5106-ae4f-65d6cc93c031.yml
index 656affa371..49b5ccdf0d 100644
--- a/data/us/legislature/Steve-Womack-b3fc0e27-b0a3-5106-ae4f-65d6cc93c031.yml
+++ b/data/us/legislature/Steve-Womack-b3fc0e27-b0a3-5106-ae4f-65d6cc93c031.yml
@@ -2,71 +2,69 @@ id: ocd-person/b3fc0e27-b0a3-5106-ae4f-65d6cc93c031
 name: Steve Womack
 given_name: Steve
 family_name: Womack
-gender: M
 birth_date: 1957-02-18
+gender: Male
+email: https://womack.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/W000809.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AR-3
 offices:
 - classification: capitol
-  address: 2412 Rayburn House Office Building Washington DC 20515-0403
+  address: 2412 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4301
+  fax: 202-225-5713
 - classification: district
-  address: 6101 Phoenix Ave Suite 4; Fort Smith, AR 72903-5083
-  voice: 479-424-1146
-  fax: 479-424-2737
-  name: 'District Office #1'
-- classification: district
-  address: 303 N. Main St. Suite 102; Harrison, AR 72601
-  voice: 870-741-6900
-  fax: 870-741-7741
-  name: 'District Office #2'
-- classification: district
-  address: 3333 Pinnacle Hls. Suite 120; Rogers, AR 72758
+  address: 3333 Pinnacle Hills Suite 120, Rogers, AR 72758
   voice: 479-464-0446
   fax: 479-464-0063
-  name: 'District Office #3'
+- classification: district
+  address: 6101 Phoenix Ave. Suite 4, Fort Smith, AR 72903
+  voice: 479-424-1146
+  fax: 479-464-0063
 links:
 - url: https://womack.house.gov
   note: website
+- url: https://womack.house.gov/
+other_names:
+- name: S. Womack
+- name: S.A. Womack
+- name: Womack, S.
 ids:
   twitter: Rep_SteveWomack
   youtube: UCXJbUDLYX-wGIhRuN66hqZw
@@ -102,3 +100,11 @@ other_identifiers:
   identifier: kg:/m/0cmcvkz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steve_Womack
+- url: https://en.wikipedia.org/wiki/Steve_Womack
+- url: https://justfacts.votesmart.org/candidate/biography/71815/steve-womack
+- url: https://theunitedstates.io
+- url: https://womack.house.gov
+- url: https://womack.house.gov/biography
+- url: https://www.govtrack.us/congress/members/steve_womack/412402
+- url: https://www.womackforcongress.com/about
diff --git a/data/us/legislature/Steven-Horsford-980a78cc-847f-50be-8967-6c8895ad337e.yml b/data/us/legislature/Steven-Horsford-980a78cc-847f-50be-8967-6c8895ad337e.yml
index 651d0b823e..5ecda1a560 100644
--- a/data/us/legislature/Steven-Horsford-980a78cc-847f-50be-8967-6c8895ad337e.yml
+++ b/data/us/legislature/Steven-Horsford-980a78cc-847f-50be-8967-6c8895ad337e.yml
@@ -2,46 +2,49 @@ id: ocd-person/980a78cc-847f-50be-8967-6c8895ad337e
 name: Steven Horsford
 given_name: Steven
 family_name: Horsford
-middle_name: A.
-gender: M
 birth_date: 1973-04-29
+gender: Male
+email: https://horsford.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001066.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-4
 offices:
 - classification: capitol
-  address: 406 Cannon House Office Building Washington DC 20515-2804
+  address: 406 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-9894
+  fax: 202-225-9783
 - classification: district
-  address: 2250 Las Vegas Blvd N Suite 500; North Las Vegas, NV 89030-5877
+  address: 2250 N. Las Vegas Blvd. Suite 500, North Las Vegas, NV 89030
   voice: 702-963-9360
-  name: 'District Office #1'
 links:
 - url: https://horsford.house.gov
   note: website
+- url: https://horsford.house.gov/
+other_names:
+- name: Horsford, S.
+- name: S. Horsford
+- name: S.A. Horsford
 ids:
   twitter: RepHorsford
 other_identifiers:
@@ -73,3 +76,9 @@ other_identifiers:
   identifier: kg:/m/03c01w9
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Steven_Horsford
+- url: https://en.wikipedia.org/wiki/Steven_Horsford
+- url: https://horsford.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/steven_horsford/412559
+- url: https://www.linkedin.com/in/steven-horsford-15a30812b
diff --git a/data/us/legislature/Summer-L-Lee-e2bd9b69-7425-5f80-b432-41b690306379.yml b/data/us/legislature/Summer-L-Lee-e2bd9b69-7425-5f80-b432-41b690306379.yml
index e84fbc17e4..41639ebb86 100644
--- a/data/us/legislature/Summer-L-Lee-e2bd9b69-7425-5f80-b432-41b690306379.yml
+++ b/data/us/legislature/Summer-L-Lee-e2bd9b69-7425-5f80-b432-41b690306379.yml
@@ -1,30 +1,37 @@
 id: ocd-person/e2bd9b69-7425-5f80-b432-41b690306379
-name: Summer L. Lee
+name: Summer Lee
 given_name: Summer
 family_name: Lee
-middle_name: Lynn
-gender: F
 birth_date: 1987-11-26
+gender: Female
+email: https://summerlee.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/L000602.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-12
 offices:
 - classification: capitol
-  address: 243 Cannon House Office Building Washington DC 20515-3812
+  address: 243 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2135
+- classification: district
+  address: 211 N. Whitfield St. Suite 802, Pittsburgh, PA 15206
+  voice: 412-214-5000
+  fax: 771-200-5826
 links:
 - url: https://summerlee.house.gov
   note: website
+- url: https://summerlee.house.gov/
 other_names:
 - name: Lee (PA)
+- name: Lee, S.
+- name: S. Lee
+- name: S.L. Lee
+- name: Summer L. Lee
 other_identifiers:
 - scheme: bioguide
   identifier: L000602
@@ -46,3 +53,10 @@ other_identifiers:
   identifier: '179240'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Summer_Lee
+- url: https://en.wikipedia.org/wiki/Summer_Lee
+- url: https://justfacts.votesmart.org/candidate/biography/179240/summer-lee
+- url: https://summerlee.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/summer_lee/456935
+- url: https://www.linkedin.com/in/summerlee23
diff --git a/data/us/legislature/Susan-M-Collins-a6f624bf-9a40-53ad-a0da-92f115d619aa.yml b/data/us/legislature/Susan-M-Collins-a6f624bf-9a40-53ad-a0da-92f115d619aa.yml
index 99ed093766..457ca9be40 100644
--- a/data/us/legislature/Susan-M-Collins-a6f624bf-9a40-53ad-a0da-92f115d619aa.yml
+++ b/data/us/legislature/Susan-M-Collins-a6f624bf-9a40-53ad-a0da-92f115d619aa.yml
@@ -1,80 +1,84 @@
 id: ocd-person/a6f624bf-9a40-53ad-a0da-92f115d619aa
-name: Susan M. Collins
+name: Susan Collins
 given_name: Susan
 family_name: Collins
-middle_name: M.
-gender: F
 birth_date: 1952-12-07
+gender: Female
+email: https://www.collins.senate.gov/contact/email-senator-collins
 image: https://theunitedstates.io/images/congress/450x550/C001035.jpg
 party:
-- start_date: '1997-01-07'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '1997-01-07'
-  end_date: '2003-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
-- start_date: '2003-01-07'
-  end_date: '2009-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
-- start_date: '2009-01-06'
-  end_date: '2015-01-03'
+- start_date: 2009-01-06
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2003-01-07
+  end_date: 2009-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 1997-01-07
+  end_date: 2003-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Maine
 offices:
 - classification: capitol
-  address: 413 Dirksen Senate Office Building Washington DC 20510
+  address: 413 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-2523
+  fax: 202-224-2693
 - classification: district
-  address: 68 Sewall St. Room 507; Augusta, ME 04330
-  voice: 207-622-8414
-  name: 'District Office #1'
-- classification: district
-  address: 202 Harlow St. Room 20100; Bangor, ME 04401
-  voice: 207-945-0417
-  name: 'District Office #2'
+  address: 1 Canal Plaza Suite 802, Portland, ME 04101
+  voice: 207-618-5560
+  fax: 207-828-0380
 - classification: district
-  address: 160 Main St.; Biddeford, ME 04005
+  address: 160 Main St., Biddeford, ME 04005
   voice: 207-283-1101
-  name: 'District Office #3'
+  fax: 207-283-4054
 - classification: district
-  address: 25 Sweden St. Suite A; Caribou, ME 04736
+  address: 202 Harlow St. Room 20100, Bangor, ME 04401
+  voice: 207-945-0417
+  fax: 207-990-4604
+- classification: district
+  address: 25 Sweden St. Suite A, Caribou, ME 04736
   voice: 207-493-7873
-  name: 'District Office #4'
+  fax: 207-493-7810
 - classification: district
-  address: 55 Lisbon St.; Lewiston, ME 04240
+  address: 55 Lisbon St., Lewiston, ME 04240
   voice: 207-784-6969
-  name: 'District Office #5'
+  fax: 207-782-6475
 - classification: district
-  address: One Canal Plaza Suite 802; Portland, ME 04101
-  voice: 207-618-5560
-  name: 'District Office #6'
+  address: 68 Sewall St. Room 507, Augusta, ME 04330
+  voice: 207-622-8414
+  fax: 207-622-5884
 links:
 - url: https://www.collins.senate.gov
   note: website
 - url: https://www.collins.senate.gov/contact
   note: contact form
+- url: https://www.collins.senate.gov/
+other_names:
+- name: Collins (R-ME)
+- name: Collins, S.
+- name: S. Collins
+- name: S.M. Collins
+- name: Susan M. Collins
 ids:
   twitter: SenatorCollins
   youtube: UC6GYaBx5kT2r4PN8KENxC-w
   facebook: susancollins
-other_names:
-- name: Collins (R-ME)
 other_identifiers:
 - scheme: bioguide
   identifier: C001035
@@ -108,3 +112,9 @@ other_identifiers:
   identifier: kg:/m/020y8m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Susan_Collins_(Maine)
+- url: https://en.wikipedia.org/wiki/Susan_Collins
+- url: https://justfacts.votesmart.org/candidate/biography/379/susan-collins
+- url: https://theunitedstates.io
+- url: https://www.collins.senate.gov
+- url: https://www.govtrack.us/congress/members/susan_collins/300025
diff --git a/data/us/legislature/Susan-Wild-b5356530-dd09-5b14-98f2-365d70bf4e5c.yml b/data/us/legislature/Susan-Wild-b5356530-dd09-5b14-98f2-365d70bf4e5c.yml
index 6b66059731..f9eec88679 100644
--- a/data/us/legislature/Susan-Wild-b5356530-dd09-5b14-98f2-365d70bf4e5c.yml
+++ b/data/us/legislature/Susan-Wild-b5356530-dd09-5b14-98f2-365d70bf4e5c.yml
@@ -2,50 +2,57 @@ id: ocd-person/b5356530-dd09-5b14-98f2-365d70bf4e5c
 name: Susan Wild
 given_name: Susan
 family_name: Wild
-middle_name: Ellis
-gender: F
 birth_date: 1957-06-07
+gender: Female
+email: https://wild.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/W000826.jpg
 party:
-- start_date: '2018-11-27'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2018-11-27'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-15
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: PA-7
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: PA-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-11-27
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: PA-7
+  district: PA-15
 offices:
 - classification: capitol
-  address: 1027 Longworth House Office Building Washington DC 20515-3807
+  address: 1027 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6411
 - classification: district
-  address: 840 Hamilton St Suite 303; Allentown, PA 18101-2455
-  voice: 484-781-6000
-  name: 'District Office #1'
-- classification: district
-  address: 400 Northampton St Suite 503; Easton, PA 18042-3543
+  address: 1 S. 3rd St. Suite 902, Easton, PA 18042
   voice: 610-333-1170
-  name: 'District Office #2'
+  fax: 877-347-4103
+- classification: district
+  address: 1001 Mahoning St., Lehighton, PA 18235
+  voice: 570-807-0333
+  fax: 877-347-4103
+- classification: district
+  address: Cahn Federal Courthouse 504 Hamilton St., Suite 3804, Allentown, PA 18101
+  voice: 484-781-6000
+  fax: 877-347-4103
 links:
 - url: https://wild.house.gov
   note: website
+- url: https://wild.house.gov/
+other_names:
+- name: S. Wild
+- name: S.E. Wild
+- name: Wild, S.
 ids:
   twitter: RepSusanWild
 other_identifiers:
@@ -71,3 +78,13 @@ other_identifiers:
   identifier: kg:/g/11gtg86jn6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Susan_Wild
+- url: https://en.wikipedia.org/wiki/Susan_Wild
+- url: https://justfacts.votesmart.org/candidate/178895/susan-wild
+- url: https://theunitedstates.io
+- url: https://wild.house.gov
+- url: https://wild.house.gov/about
+- url: https://wildforcongress.com/meet-susan
+- url: https://www.govtrack.us/congress/members/susan_wild/412751
+- url: https://www.grossmcginley.com/resources/attorney-news/susan-ellis-wild-wins-u-s-congressional-seat
+- url: https://www.linkedin.com/in/susanwild
diff --git a/data/us/legislature/Susie-Lee-4333db3d-a55e-5d8e-b2ec-1041414ba2e6.yml b/data/us/legislature/Susie-Lee-4333db3d-a55e-5d8e-b2ec-1041414ba2e6.yml
index 1e6db56b7f..44b6fd1429 100644
--- a/data/us/legislature/Susie-Lee-4333db3d-a55e-5d8e-b2ec-1041414ba2e6.yml
+++ b/data/us/legislature/Susie-Lee-4333db3d-a55e-5d8e-b2ec-1041414ba2e6.yml
@@ -2,44 +2,46 @@ id: ocd-person/4333db3d-a55e-5d8e-b2ec-1041414ba2e6
 name: Susie Lee
 given_name: Susie
 family_name: Lee
-gender: F
 birth_date: 1966-11-07
+gender: Female
+email: https://susielee.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000590.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NV-3
 offices:
 - classification: capitol
-  address: 365 Cannon House Office Building Washington DC 20515-2803
+  address: 365 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3252
 - classification: district
-  address: 8872 S Eastern Ave s 210 & 220; Las Vegas, NV 89123-4900
+  address: 7785 W. Sahara Ave., Suite 203, Las Vegas, NV 89117
   voice: 702-963-9336
-  name: 'District Office #1'
 links:
 - url: https://susielee.house.gov
   note: website
-ids:
-  twitter: RepSusieLee
+- url: https://susielee.house.gov/
 other_names:
 - name: Lee (NV)
+- name: Lee, S.
+- name: S. Lee
+- name: S.M.K. Lee
+ids:
+  twitter: RepSusieLee
 other_identifiers:
 - scheme: bioguide
   identifier: L000590
@@ -63,3 +65,10 @@ other_identifiers:
   identifier: kg:/g/11gtdntn1_
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Susie_Lee
+- url: https://en.wikipedia.org/wiki/Susie_Lee
+- url: https://justfacts.votesmart.org/candidate/biography/169344/susie-lee
+- url: https://susielee.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/susie_lee/412802
+- url: https://www.linkedin.com/in/susie-lee-043b131a
diff --git a/data/us/legislature/Suzan-K-DelBene-799d9723-1f90-5558-b8c6-6f293c7eaddd.yml b/data/us/legislature/Suzan-K-DelBene-799d9723-1f90-5558-b8c6-6f293c7eaddd.yml
index 1356c3162e..6d9f6ec91c 100644
--- a/data/us/legislature/Suzan-K-DelBene-799d9723-1f90-5558-b8c6-6f293c7eaddd.yml
+++ b/data/us/legislature/Suzan-K-DelBene-799d9723-1f90-5558-b8c6-6f293c7eaddd.yml
@@ -1,68 +1,67 @@
 id: ocd-person/799d9723-1f90-5558-b8c6-6f293c7eaddd
-name: Suzan K. DelBene
+name: Suzan DelBene
 given_name: Suzan
 family_name: DelBene
-middle_name: K.
-gender: F
 birth_date: 1962-02-17
+gender: Female
+email: https://delbene.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/D000617.jpg
 party:
-- start_date: '2012-11-13'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2012-11-13'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2012-11-13
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WA-1
 offices:
 - classification: capitol
-  address: 2330 Rayburn House Office Building Washington DC 20515-4701
+  address: 2330 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6311
+  fax: 202-226-1606
 - classification: district
-  address: 22121 17th Ave SE Suite 220; Bothell, WA 98021
+  address: 450 Central Way Suite 3100, Kirkland, WA 98033
   voice: 425-485-0085
   fax: 425-485-0083
-  name: 'District Office #1'
-- classification: district
-  address: 204 W. Montgomery St.; Mount Vernon, WA 98273
-  voice: 360-416-7879
-  fax: 425-485-0083
-  name: 'District Office #2'
 links:
 - url: https://delbene.house.gov
   note: website
+- url: https://delbene.house.gov/
+other_names:
+- name: DelBene, S.
+- name: S. DelBene
+- name: S.K. DelBene
+- name: Suzan K. DelBene
 ids:
   twitter: RepDelBene
   youtube: UCd00b7TpKDZIr-Ujhaktvjg
@@ -98,3 +97,10 @@ other_identifiers:
   identifier: kg:/m/05p0dnk
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Suzan_DelBene
+- url: https://delbene.house.gov
+- url: https://en.wikipedia.org/wiki/Suzan_DelBene
+- url: https://justfacts.votesmart.org/candidate/126272/suzan-delbene
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/suzan_delbene/412505
+- url: https://www.linkedin.com/in/suzan-delbene-752a174
diff --git a/data/us/legislature/Suzanne-Bonamici-90d40f72-ffae-544d-86bb-b41605730fee.yml b/data/us/legislature/Suzanne-Bonamici-90d40f72-ffae-544d-86bb-b41605730fee.yml
index 00d9bb2076..413ab43059 100644
--- a/data/us/legislature/Suzanne-Bonamici-90d40f72-ffae-544d-86bb-b41605730fee.yml
+++ b/data/us/legislature/Suzanne-Bonamici-90d40f72-ffae-544d-86bb-b41605730fee.yml
@@ -2,61 +2,65 @@ id: ocd-person/90d40f72-ffae-544d-86bb-b41605730fee
 name: Suzanne Bonamici
 given_name: Suzanne
 family_name: Bonamici
-gender: F
 birth_date: 1954-10-14
+gender: Female
+email: https://bonamici.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/B001278.jpg
 party:
-- start_date: '2012-02-07'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2012-02-07'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2012-02-07
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-1
 offices:
 - classification: capitol
-  address: 2231 Rayburn House Office Building Washington DC 20515-3701
+  address: 2231 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-0855
+  fax: 202-225-9497
 - classification: district
-  address: 12725 SW Millikan Way Suite 220; Beaverton, OR 97005
+  address: 12725 SW Millikan Way Suite 220, Beaverton, OR 97005
   voice: 503-469-6010
   fax: 503-469-6018
-  name: 'District Office #1'
 links:
 - url: https://bonamici.house.gov
   note: website
+- url: https://bonamici.house.gov/
+other_names:
+- name: Bonamici, S.
+- name: S. Bonamici
+- name: S.M. Bonamici
 ids:
   twitter: RepBonamici
   youtube: UC0IkAeEiwgzSRTD1TDSvuBw
@@ -92,3 +96,8 @@ other_identifiers:
   identifier: kg:/m/02q453x
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Suzanne_Bonamici
+- url: https://bonamici.house.gov
+- url: https://en.wikipedia.org/wiki/Suzanne_Bonamici
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/suzanne_bonamici/412501
diff --git a/data/us/legislature/Sydney-Kamlager-Dove-1608d897-8cf1-5902-9e45-fbd0bbd72cca.yml b/data/us/legislature/Sydney-Kamlager-Dove-1608d897-8cf1-5902-9e45-fbd0bbd72cca.yml
index e6cdd037f4..d2d3fa36bc 100644
--- a/data/us/legislature/Sydney-Kamlager-Dove-1608d897-8cf1-5902-9e45-fbd0bbd72cca.yml
+++ b/data/us/legislature/Sydney-Kamlager-Dove-1608d897-8cf1-5902-9e45-fbd0bbd72cca.yml
@@ -1,28 +1,35 @@
 id: ocd-person/1608d897-8cf1-5902-9e45-fbd0bbd72cca
-name: Sydney Kamlager-Dove
+name: Sydney Kamlager
 given_name: Sydney
-family_name: Kamlager-Dove
-middle_name: Kai
-gender: F
+family_name: Kamlager
 birth_date: 1972-07-20
+gender: Female
+email: https://kamlager-dove.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000400.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-37
 offices:
 - classification: capitol
-  address: 1419 Longworth House Office Building Washington DC 20515-0537
+  address: 1419 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-7084
+- classification: district
+  address: 4929 Wilshire Blvd. Suite 650, Los Angeles, CA 90010
+  voice: 323-965-1422
 links:
 - url: https://kamlager-dove.house.gov
   note: website
+- url: https://kamlager-dove.house.gov/
+other_names:
+- name: Kamlager, S.
+- name: S. Kamlager
+- name: S.K. Kamlager
+- name: Sydney Kamlager-Dove
 other_identifiers:
 - scheme: bioguide
   identifier: K000400
@@ -42,3 +49,11 @@ other_identifiers:
   identifier: '178079'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sydney_Kamlager
+- url: https://en.wikipedia.org/wiki/Sydney_Kamlager
+- url: https://justfacts.votesmart.org/candidate/key-votes/178079/sydney-kamlager-dove
+- url: https://kamlager-dove.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/sydney_kamlager_dove/456884
+- url: https://www.linkedin.com/in/sydney-kamlager-b5762312
+- url: https://www.linkedin.com/in/sydneykamlager-dove
diff --git a/data/us/legislature/Sylvia-R-Garcia-168e0e9e-0d4c-57d2-99a6-8fc99be594be.yml b/data/us/legislature/Sylvia-R-Garcia-168e0e9e-0d4c-57d2-99a6-8fc99be594be.yml
index 16d67d6cd9..65c16766b9 100644
--- a/data/us/legislature/Sylvia-R-Garcia-168e0e9e-0d4c-57d2-99a6-8fc99be594be.yml
+++ b/data/us/legislature/Sylvia-R-Garcia-168e0e9e-0d4c-57d2-99a6-8fc99be594be.yml
@@ -1,46 +1,48 @@
 id: ocd-person/168e0e9e-0d4c-57d2-99a6-8fc99be594be
-name: Sylvia R. Garcia
+name: Sylvia Garcia
 given_name: Sylvia
 family_name: Garcia
-middle_name: R.
-gender: F
 birth_date: 1950-09-06
+gender: Female
+email: https://sylviagarcia.house.gov/zip_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/G000587.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-29
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-29
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-29
 offices:
 - classification: capitol
-  address: 2419 Rayburn House Office Building Washington DC 20515-4329
+  address: 2419 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-1688
 - classification: district
-  address: 11811 East Fwy Suite 430; Houston, TX 77029-1974
+  address: 11811 E. Freeway, Suite 430, Houston, TX 77029
   voice: 832-325-3150
-  name: 'District Office #1'
 links:
 - url: https://sylviagarcia.house.gov
   note: website
-ids:
-  twitter: RepSylviaGarcia
+- url: https://sylviagarcia.house.gov/
 other_names:
 - name: Garcia (TX)
+- name: Garcia, S.
+- name: S. Garcia
+- name: S.R. Garcia
+- name: Sylvia R. Garcia
+ids:
+  twitter: RepSylviaGarcia
 other_identifiers:
 - scheme: bioguide
   identifier: G000587
@@ -64,3 +66,11 @@ other_identifiers:
   identifier: Sylvia Garcia
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Sylvia_Garcia
+- url: https://chci.org/staff-and-leadership/rep-sylvia-garcia
+- url: https://en.wikipedia.org/wiki/Sylvia_Garcia
+- url: https://justfacts.votesmart.org/candidate/biography/49734/sylvia-garcia
+- url: https://sylviagarcia.house.gov
+- url: https://sylviagarcia.house.gov/about
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/sylvia-r-garcia-a4476310
diff --git a/data/us/legislature/Tammy-Baldwin-d7c97bc3-b7cb-585b-b9e3-def97fcb9db6.yml b/data/us/legislature/Tammy-Baldwin-d7c97bc3-b7cb-585b-b9e3-def97fcb9db6.yml
index b98f494e2f..55b1cc19ef 100644
--- a/data/us/legislature/Tammy-Baldwin-d7c97bc3-b7cb-585b-b9e3-def97fcb9db6.yml
+++ b/data/us/legislature/Tammy-Baldwin-d7c97bc3-b7cb-585b-b9e3-def97fcb9db6.yml
@@ -2,102 +2,95 @@ id: ocd-person/d7c97bc3-b7cb-585b-b9e3-def97fcb9db6
 name: Tammy Baldwin
 given_name: Tammy
 family_name: Baldwin
-gender: F
 birth_date: 1962-02-11
+gender: Female
+email: https://www.baldwin.senate.gov/contact/contact-tammy
 image: https://theunitedstates.io/images/congress/450x550/B001230.jpg
 party:
-- start_date: '1999-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Wisconsin
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Wisconsin
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-2
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Wisconsin
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Wisconsin
 offices:
 - classification: capitol
-  address: 141 Hart Senate Office Building Washington DC 20510
+  address: 141 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5653
 - classification: district
-  address: PO Box 61; Ashland, WI 54806-0061
-  voice: 715-450-3754
-  name: 'District Office #1'
-- classification: district
-  address: 500 South Barstow St. Suite LL2; Eau Claire, WI 54701
-  voice: 715-832-8424
-  name: 'District Office #2'
+  address: 210 7th St. South Suite 203, La Crosse, WI 54601
+  voice: 608-796-0045
 - classification: district
-  address: 1039 W. Mason Suite 119; Green Bay, WI 54303
+  address: 2325 Verlin Road Suite 201, Green Bay, WI 54311
   voice: 920-498-2668
-  name: 'District Office #3'
 - classification: district
-  address: 205 5th Avenue South Room 216; La Crosse, WI 54601
-  voice: 608-796-0045
-  name: 'District Office #4'
-- classification: district
-  address: 30 W. Mifflin St. Suite 700; Madison, WI 53703
+  address: 30 W. Mifflin St. Suite 700, Madison, WI 53703
   voice: 608-264-5338
-  name: 'District Office #5'
 - classification: district
-  address: 633 W. Wisconsin Ave. Suite 1920; Milwaukee, WI 53203
+  address: 500 S. Barstow St. Suite LL2, Eau Claire, WI 54701
+  voice: 715-832-8424
+- classification: district
+  address: 633 W. Wisconsin Ave. Suite 1300, Milwaukee, WI 53203
   voice: 414-297-4451
-  name: 'District Office #6'
 - classification: district
-  address: 2100 Stewart Ave. Suite 250 B; Wausau, WI 54401
-  voice: 715-261-2611
-  name: 'District Office #7'
+  address: P.O. Box 61, Ashland, WI 54806
+  voice: 715-450-3754
 links:
 - url: https://www.baldwin.senate.gov
   note: website
 - url: https://www.baldwin.senate.gov/feedback
   note: contact form
+- url: https://www.baldwin.senate.gov/
+other_names:
+- name: Baldwin (D-WI)
+- name: Baldwin, T.
+- name: T. Baldwin
+- name: T.S.G. Baldwin
 ids:
   twitter: SenatorBaldwin
   youtube: UC_XjYCRbbI2_TDDjJidwk0Q
   facebook: senatortammybaldwin
-other_names:
-- name: Baldwin (D-WI)
 other_identifiers:
 - scheme: bioguide
   identifier: B001230
@@ -133,3 +126,9 @@ other_identifiers:
   identifier: kg:/m/024v02
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tammy_Baldwin
+- url: https://en.wikipedia.org/wiki/Tammy_Baldwin
+- url: https://justfacts.votesmart.org/candidate/3470/tammy-baldwin
+- url: https://theunitedstates.io
+- url: https://www.baldwin.senate.gov
+- url: https://www.govtrack.us/congress/members/tammy_baldwin/400013
diff --git a/data/us/legislature/Tammy-Duckworth-c02182c1-3275-5f3e-9c66-2f0873cc72c7.yml b/data/us/legislature/Tammy-Duckworth-c02182c1-3275-5f3e-9c66-2f0873cc72c7.yml
index a49fdc9ed3..b1f4117463 100644
--- a/data/us/legislature/Tammy-Duckworth-c02182c1-3275-5f3e-9c66-2f0873cc72c7.yml
+++ b/data/us/legislature/Tammy-Duckworth-c02182c1-3275-5f3e-9c66-2f0873cc72c7.yml
@@ -2,72 +2,67 @@ id: ocd-person/c02182c1-3275-5f3e-9c66-2f0873cc72c7
 name: Tammy Duckworth
 given_name: Tammy
 family_name: Duckworth
-gender: F
 birth_date: 1968-03-12
+gender: Female
+email: https://www.duckworth.senate.gov/connect/email-tammy
 image: https://theunitedstates.io/images/congress/450x550/D000622.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2029-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-8
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: IL-8
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Illinois
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Illinois
+- start_date: 2015-01-06
+  end_date: 2017-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IL-8
+- start_date: 2013-01-03
+  end_date: 2015-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: IL-8
 offices:
 - classification: capitol
-  address: 524 Hart Senate Office Building Washington DC 20510
+  address: 524 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2854
+- classification: capitol
+  address: State Capitol 8 S. Old  Plaza, Springfield, IL 62701
+  voice: 217-528-6124
 - classification: district
-  address: 23 Public Sq Suite 460; Belleville, IL 62220-1650
-  voice: 618-722-7070
-  fax: 618-235-4011
-  name: 'District Office #1'
+  address: 1823 2nd Ave. Suite 2, Rock Island, IL 61201
+  voice: 309-606-7060
 - classification: district
-  address: 441 E Willow St; Carbondale, IL 62901-1659
-  voice: 618-677-7000
-  fax: 618-351-1551
-  name: 'District Office #2'
+  address: 23 Public Square Suite 460, Belleville, IL 62220
+  voice: 618-722-7070
 - classification: district
-  address: 230 South Dearborn Street Suite 3900; Chicago, IL 60604
+  address: 230 S. Dearborn St. Suite 3900, Chicago, IL 60604
   voice: 312-886-3506
-  name: 'District Office #3'
-- classification: district
-  address: 1823 2nd Ave Suite 2; Rock Island, IL 61201-8002
-  voice: 309-606-7060
-  fax: 309-786-1799
-  name: 'District Office #4'
+  fax: 312-583-0374
 - classification: district
-  address: 8 South Old State Capitol Plaza; Springfield, IL 62701
-  voice: 217-528-6124
-  name: 'District Office #5'
+  address: 441 E. Willow St., Carbondale, IL 62901
+  voice: 618-677-7000
 links:
-- url: https://www.duckworth.senate.gov
-  note: website
 - url: https://www.duckworth.senate.gov/content/contact-senator
   note: contact form
+- url: https://www.duckworth.senate.gov
+  note: website
+other_names:
+- name: Duckworth (D-IL)
+- name: Duckworth, T.
+- name: L.T. Duckworth
+- name: T. Duckworth
 ids:
   twitter: SenDuckworth
   youtube: UCYRWRvUxtjaHnFMCbdd94tg
   facebook: SenDuckworth
-other_names:
-- name: Duckworth (D-IL)
 other_identifiers:
 - scheme: govtrack
   identifier: '412533'
@@ -103,3 +98,9 @@ other_identifiers:
   identifier: S386
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tammy_Duckworth
+- url: https://en.wikipedia.org/wiki/Tammy_Duckworth
+- url: https://justfacts.votesmart.org/candidate/biography/57442/tammy-duckworth
+- url: https://theunitedstates.io
+- url: https://www.duckworth.senate.gov
+- url: https://www.govtrack.us/congress/members/tammy_duckworth/412533
diff --git a/data/us/legislature/Ted-Budd-67c3f0bb-7182-51b8-98d0-253144992bfe.yml b/data/us/legislature/Ted-Budd-67c3f0bb-7182-51b8-98d0-253144992bfe.yml
index aa685155a8..d5650b1fb2 100644
--- a/data/us/legislature/Ted-Budd-67c3f0bb-7182-51b8-98d0-253144992bfe.yml
+++ b/data/us/legislature/Ted-Budd-67c3f0bb-7182-51b8-98d0-253144992bfe.yml
@@ -2,56 +2,63 @@ id: ocd-person/67c3f0bb-7182-51b8-98d0-253144992bfe
 name: Ted Budd
 given_name: Ted
 family_name: Budd
-gender: M
 birth_date: 1971-10-21
+gender: Male
+email: https://www.budd.senate.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001305.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: North Carolina
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-13
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-13
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-13
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: North Carolina
 offices:
 - classification: capitol
-  address: 304 Russell Senate Office Building Washington DC 20510
+  address: 304 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-3154
 - classification: district
-  address: 128 Peachtree Ln. Suite A; Advance, NC 27006
-  voice: 336-998-1313
-  name: 'District Office #1'
+  address: 151 Patton Ave. Suite 204, Asheville, NC 28801
+  voice: 828-333-4130
+- classification: district
+  address: 201 N. Front St. Suite 809, Wilmington, NC 28401
+  voice: 910-218-7600
 - classification: district
-  address: 4000 Piedmont Pkwy Suite 131; High Point, NC 27265
-  voice: 336-858-5013
-  name: 'District Office #2'
+  address: 333 Fayetteville St. Suite 1504, Raleigh, NC 27601
+  voice: 984-349-5061
+- classification: district
+  address: 5380 U.S. Highway 158 Suite 202, Advance, NC 27006
+  voice: 336-941-4470
 links:
 - url: https://www.budd.senate.gov
   note: website
 - url: https://www.budd.senate.gov/contact/
   note: contact form
+- url: https://www.budd.senate.gov/
+other_names:
+- name: Budd (R-NC)
+- name: Budd, T.
+- name: T. Budd
+- name: T.P. Budd
 ids:
   twitter: RepTedBudd
   facebook: RepTedBudd
-other_names:
-- name: Budd (R-NC)
 other_identifiers:
 - scheme: bioguide
   identifier: B001305
@@ -81,3 +88,11 @@ other_identifiers:
   identifier: Ted Budd
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ted_Budd
+- url: https://en.wikipedia.org/wiki/Ted_Budd
+- url: https://justfacts.votesmart.org/candidate/biography/171489/ted-budd
+- url: https://tedbudd.com/meet-ted
+- url: https://theunitedstates.io
+- url: https://www.budd.senate.gov
+- url: https://www.govtrack.us/congress/members/ted_budd/412712
+- url: https://www.linkedin.com/in/ted-budd-0a44643
diff --git a/data/us/legislature/Ted-Cruz-c4d35f64-f25b-5888-9fcb-f3cb97df500e.yml b/data/us/legislature/Ted-Cruz-c4d35f64-f25b-5888-9fcb-f3cb97df500e.yml
index c5eb01ec37..f9bf786097 100644
--- a/data/us/legislature/Ted-Cruz-c4d35f64-f25b-5888-9fcb-f3cb97df500e.yml
+++ b/data/us/legislature/Ted-Cruz-c4d35f64-f25b-5888-9fcb-f3cb97df500e.yml
@@ -2,67 +2,61 @@ id: ocd-person/c4d35f64-f25b-5888-9fcb-f3cb97df500e
 name: Ted Cruz
 given_name: Ted
 family_name: Cruz
-gender: M
 birth_date: 1970-12-22
+gender: Male
+email: https://www.cruz.senate.gov/contact/write-ted
 image: https://theunitedstates.io/images/congress/450x550/C001098.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Texas
 offices:
 - classification: capitol
-  address: 167 Russell Senate Office Building Washington DC 20510
+  address: 167 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-5922
+  fax: 202-228-0755
 - classification: district
-  address: 300 E 8th Suite 961; Austin, TX 78701
-  voice: 512-916-5834
-  fax: 512-916-5839
-  name: 'District Office #1'
-- classification: district
-  address: 3626 N. Hall St. Suite 410; Dallas, TX 75219
-  voice: 214-599-8749
-  fax: 214-361-3518
-  name: 'District Office #2'
+  address: 200 S. 10th St. Suite 1603, McAllen, TX 78501
+  voice: 956-686-7339
 - classification: district
-  address: 1919 Smith St. Suite 9047; Houston, TX 77002
-  voice: 713-718-3057
-  fax: 713-209-3459
-  name: 'District Office #3'
+  address: 300 E. 8th St. Suite 961, Austin, TX 78701
+  voice: 512-916-5834
 - classification: district
-  address: 200 S. 10th St. Suite 1603; McAllen, TX 78501
-  voice: 956-686-7339
-  name: 'District Office #4'
+  address: 305 S. Broadway Suite 501, Tyler, TX 75702
+  voice: 903-593-5130
 - classification: district
-  address: 9901 Ih-10w Suite 950; San Antonio, TX 78230
+  address: 9901 Interstate Highway 10 West Suite 950, San Antonio, TX 78230
   voice: 210-340-2885
-  fax: 210-349-6753
-  name: 'District Office #5'
 - classification: district
-  address: 305 S. Broadway Suite 501; Tyler, TX 75702
-  voice: 903-593-5130
-  name: 'District Office #6'
+  address: Lee Park Tower II 3626 N. Hall St., Suite 410, Dallas, TX 75219
+  voice: 214-599-8749
+- classification: district
+  address: The Mickey Leland Federal Building 1919 Smith St., Suite 9047, Houston,
+    TX 77002
+  voice: 713-718-3057
 links:
-- url: https://www.cruz.senate.gov
-  note: website
 - url: https://www.cruz.senate.gov/?p=form&id=16
   note: contact form
+- url: https://www.cruz.senate.gov
+  note: website
+other_names:
+- name: Cruz (R-TX)
+- name: Cruz, T.
+- name: R.E. Cruz
+- name: T. Cruz
 ids:
   twitter: SenTedCruz
   youtube: UCOTZ-6H1rri1lSsj6IzhUyw
   facebook: SenatorTedCruz
-other_names:
-- name: Cruz (R-TX)
 other_identifiers:
 - scheme: bioguide
   identifier: C001098
@@ -94,3 +88,11 @@ other_identifiers:
   identifier: kg:/m/07j6ty
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ted_Cruz
+- url: https://en.wikipedia.org/wiki/Ted_Cruz
+- url: https://justfacts.votesmart.org/candidate/biography/135705/ted-cruz
+- url: https://theunitedstates.io
+- url: https://www.cruz.senate.gov
+- url: https://www.cruz.senate.gov/about-ted
+- url: https://www.linkedin.com/in/cruzted/en
+- url: https://www.tedcruz.org/meet-ted
diff --git a/data/us/legislature/Ted-Lieu-b472f29c-b960-5cea-b5fb-0e9d4d6d10a4.yml b/data/us/legislature/Ted-Lieu-b472f29c-b960-5cea-b5fb-0e9d4d6d10a4.yml
index a9d6c0f206..788dec9160 100644
--- a/data/us/legislature/Ted-Lieu-b472f29c-b960-5cea-b5fb-0e9d4d6d10a4.yml
+++ b/data/us/legislature/Ted-Lieu-b472f29c-b960-5cea-b5fb-0e9d4d6d10a4.yml
@@ -2,54 +2,53 @@ id: ocd-person/b472f29c-b960-5cea-b5fb-0e9d4d6d10a4
 name: Ted Lieu
 given_name: Ted
 family_name: Lieu
-gender: M
 birth_date: 1969-03-29
+gender: Male
+email: https://lieu.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000582.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-33
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-36
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-33
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-33
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-33
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-36
+  district: CA-33
 offices:
 - classification: capitol
-  address: 2454 Rayburn House Office Building Washington DC 20515-0536
+  address: 2454 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3976
 - classification: district
-  address: 5055 Wilshire Blvd. Suite 310; Los Angeles, CA 90036
+  address: 1645 Corinth Ave., Suite 101, Los Angeles, CA 90025
   voice: 323-651-1040
-  name: 'District Office #1'
-- classification: district
-  address: 1600 Rosecrans Ave. 4th Floor; Manhattan Beach, CA 90266
-  voice: 310-321-7664
-  name: 'District Office #2'
 links:
 - url: https://lieu.house.gov
   note: website
+- url: https://lieu.house.gov/
+other_names:
+- name: Lieu, T.
+- name: T. Lieu
+- name: T.W. Lieu
 ids:
   twitter: RepTedLieu
   youtube: UC9qcJxTqfDNBnVul1IojlFg
@@ -83,3 +82,10 @@ other_identifiers:
   identifier: Ted Lieu
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Ted_Lieu
+- url: https://en.wikipedia.org/wiki/Ted_Lieu
+- url: https://justfacts.votesmart.org/candidate/biography/1516/ted-lieu
+- url: https://lieu.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ted_lieu/412616
+- url: https://www.linkedin.com/in/reptedlieu
diff --git a/data/us/legislature/Teresa-Leger-Fernandez-1548bb05-ef78-5582-9058-fd92d3c9c61c.yml b/data/us/legislature/Teresa-Leger-Fernandez-1548bb05-ef78-5582-9058-fd92d3c9c61c.yml
index 3c90685b6e..bc70356e10 100644
--- a/data/us/legislature/Teresa-Leger-Fernandez-1548bb05-ef78-5582-9058-fd92d3c9c61c.yml
+++ b/data/us/legislature/Teresa-Leger-Fernandez-1548bb05-ef78-5582-9058-fd92d3c9c61c.yml
@@ -2,31 +2,46 @@ id: ocd-person/1548bb05-ef78-5582-9058-fd92d3c9c61c
 name: Teresa Leger Fernandez
 given_name: Teresa
 family_name: Leger Fernandez
-gender: F
-birth_date: 1959-07-01
+birth_date: 1959-07-15
+gender: Female
+email: https://fernandez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000273.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NM-3
 offices:
 - classification: capitol
-  address: 1510 Longworth House Office Building Washington DC 20515-3103
+  address: 1510 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6190
+- classification: district
+  address: 1103 National Ave., Room 101, Las Vegas, NM 87701
+  voice: 505-570-7558
+- classification: district
+  address: 120 S. Federal Place Suite 323, Santa Fe, NM 87501
+  voice: 505-428-4680
+- classification: district
+  address: 207 W. Hill Ave., Office 301A, Gallup, NM 87301
+  voice: 505-551-4696
+- classification: district
+  address: 418 Main St., Clovis, NM 88101
 links:
 - url: https://fernandez.house.gov
   note: website
+- url: https://fernandez.house.gov/
+other_names:
+- name: Leger Fernandez, T.
+- name: T. Leger Fernandez
+- name: T.I. Leger Fernandez
 ids:
   twitter: RepTeresaLF
 other_identifiers:
@@ -46,3 +61,11 @@ other_identifiers:
   identifier: kg:/g/11h_x7n8f5
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Teresa_Leger_Fernandez
+- url: https://en.wikipedia.org/wiki/Teresa_Leger_Fernandez
+- url: https://fernandez.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/189882/teresa-leger-fernandez
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/teresa_leger_fernandez/456835
+- url: https://www.linkedin.com/in/teresa-leger-fernandez-151b2231
+- url: https://www.teresaforall.com/meet-teresa
diff --git a/data/us/legislature/Terri-A-Sewell-f747c3f1-7247-5c91-9870-901ec617e884.yml b/data/us/legislature/Terri-A-Sewell-f747c3f1-7247-5c91-9870-901ec617e884.yml
index 13c5c2e77d..b796c3c08a 100644
--- a/data/us/legislature/Terri-A-Sewell-f747c3f1-7247-5c91-9870-901ec617e884.yml
+++ b/data/us/legislature/Terri-A-Sewell-f747c3f1-7247-5c91-9870-901ec617e884.yml
@@ -1,78 +1,79 @@
 id: ocd-person/f747c3f1-7247-5c91-9870-901ec617e884
-name: Terri A. Sewell
+name: Terri Sewell
 given_name: Terri
 family_name: Sewell
-middle_name: A.
-gender: F
 birth_date: 1965-01-01
+gender: Female
+email: https://sewell.house.gov/contact-me
 image: https://theunitedstates.io/images/congress/450x550/S001185.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: AL-7
 offices:
 - classification: capitol
-  address: 1035 Longworth House Office Building Washington DC 20515-0107
+  address: 1035 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2665
+  fax: 202-226-9567
 - classification: district
-  address: 908 Alabama Ave. Suite 112; Selma, AL 36701
-  voice: 334-877-4414
-  fax: 334-877-4489
-  name: 'District Office #1'
+  address: 101 S. Lawrence St. Courthouse Annex 3, Montgomery, AL 36104
+  voice: 334-262-1919
+  fax: 334-262-1921
 - classification: district
-  address: Two 20th Street North Suite 1130; Birmingham, AL 35203
+  address: 2 20th St. North Suite 1130, Birmingham, AL 35203
   voice: 205-254-1960
   fax: 205-254-1974
-  name: 'District Office #2'
 - classification: district
-  address: 101 S. Lawrence St. Annex 3; Montgomery, AL 36104
-  voice: 334-262-1919
-  fax: 334-262-1921
-  name: 'District Office #3'
-- classification: district
-  address: 2501 7th St. Suite 300; Tuscaloosa, AL 35401
+  address: 2501 7th St. Suite 300, Tuscaloosa, AL 35401
   voice: 205-752-5380
   fax: 205-752-5899
-  name: 'District Office #4'
+- classification: district
+  address: Federal Building 908 Alabama Ave., Suite 112, Selma, AL 36701
+  voice: 334-877-4414
+  fax: 334-877-4489
 links:
 - url: https://sewell.house.gov
   note: website
+- url: https://sewell.house.gov/
+other_names:
+- name: Sewell, T.
+- name: T. Sewell
+- name: T.A. Sewell
+- name: Terri A. Sewell
 ids:
   twitter: RepTerriSewell
   youtube: UCHkEHtfrfUWOFtbUFQTQH7Q
@@ -108,3 +109,11 @@ other_identifiers:
   identifier: kg:/m/05pbszt
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Terri_Sewell
+- url: https://en.wikipedia.org/wiki/Terri_Sewell
+- url: https://justfacts.votesmart.org/candidate/biography/121621/terri-sewell
+- url: https://sewell.house.gov
+- url: https://sewellforcongress.com/about-terri
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/terri_sewell/412396
+- url: https://www.linkedin.com/in/terrisewell
diff --git a/data/us/legislature/Thom-Tillis-3ad2df38-e817-50b9-924d-9dbd4bba94a8.yml b/data/us/legislature/Thom-Tillis-3ad2df38-e817-50b9-924d-9dbd4bba94a8.yml
index 01896bab98..bcc4137c09 100644
--- a/data/us/legislature/Thom-Tillis-3ad2df38-e817-50b9-924d-9dbd4bba94a8.yml
+++ b/data/us/legislature/Thom-Tillis-3ad2df38-e817-50b9-924d-9dbd4bba94a8.yml
@@ -2,65 +2,60 @@ id: ocd-person/3ad2df38-e817-50b9-924d-9dbd4bba94a8
 name: Thom Tillis
 given_name: Thom
 family_name: Tillis
-gender: M
 birth_date: 1960-08-30
+gender: Male
+email: https://www.tillis.senate.gov/email-me
 image: https://theunitedstates.io/images/congress/450x550/T000476.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: North Carolina
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: North Carolina
 offices:
 - classification: capitol
-  address: 113 Dirksen Senate Office Building Washington DC 20510
+  address: 113 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-6342
+  fax: 202-228-2563
 - classification: district
-  address: 9300 Harris Corners Pkwy. Suite 170; Charlotte, NC 28269
+  address: 10150 Mallard Creek Road Suite 508, Charlotte, NC 28262
   voice: 704-509-9087
   fax: 704-509-9162
-  name: 'District Office #1'
 - classification: district
-  address: 1694 E. Arlington Blvd. Suite B; Greenville, NC 27858
+  address: 1694 E. Arlington Blvd. Suite B, Greenville, NC 27858
   voice: 252-329-0371
   fax: 252-329-0290
-  name: 'District Office #2'
 - classification: district
-  address: 1 Historic Courthouse Square Suite 112; Hendersonville, NC 28792
-  voice: 828-693-8750
-  fax: 828-693-9724
-  name: 'District Office #3'
+  address: 310 New Bern Ave. Suite 122, Raleigh, NC 27601
+  voice: 919-856-4630
+  fax: 919-856-4053
 - classification: district
-  address: 1840 Eastchester Dr. Suite 200; High Point, NC 27265
+  address: 3200 Northline Ave. Suite 150, Greensboro, NC 27265
   voice: 336-885-0685
   fax: 336-885-0692
-  name: 'District Office #4'
-- classification: district
-  address: 310 New Bern Ave. Suite 122; Raleigh, NC 27601
-  voice: 919-856-4630
-  fax: 919-856-4053
-  name: 'District Office #5'
 links:
 - url: https://www.tillis.senate.gov
   note: website
 - url: https://www.tillis.senate.gov/public/index.cfm/email-me
   note: contact form
+- url: https://www.tillis.senate.gov/
+other_names:
+- name: T. Tillis
+- name: T.R. Tillis
+- name: Thomas Roland Tillis
+- name: Tillis (R-NC)
+- name: Tillis, T.
 ids:
   twitter: SenThomTillis
   youtube: UCUD9VGV4SSGWjGdbn37Ea2w
   facebook: SenatorThomTillis
-other_names:
-- name: Thomas Roland Tillis
-- name: Tillis (R-NC)
 other_identifiers:
 - scheme: bioguide
   identifier: T000476
@@ -92,3 +87,11 @@ other_identifiers:
   identifier: Thom Tillis (North Carolina)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Thom_Tillis
+- url: https://en.wikipedia.org/wiki/Thom_Tillis
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/thom_tillis/412668
+- url: https://www.linkedin.com/in/thomtillis
+- url: https://www.thomtillis.com/thoms-record
+- url: https://www.tillis.senate.gov
+- url: https://www.tillis.senate.gov/about-thom
diff --git a/data/us/legislature/Thomas-H-Kean-Jr-1cbf8801-61cd-5f46-93c1-0d02f110035a.yml b/data/us/legislature/Thomas-H-Kean-Jr-1cbf8801-61cd-5f46-93c1-0d02f110035a.yml
index 2a54ec7542..445b1121c5 100644
--- a/data/us/legislature/Thomas-H-Kean-Jr-1cbf8801-61cd-5f46-93c1-0d02f110035a.yml
+++ b/data/us/legislature/Thomas-H-Kean-Jr-1cbf8801-61cd-5f46-93c1-0d02f110035a.yml
@@ -1,32 +1,38 @@
 id: ocd-person/1cbf8801-61cd-5f46-93c1-0d02f110035a
-name: Thomas H. Kean, Jr.
-given_name: Thomas
+name: Tom Kean
+given_name: Tom
 family_name: Kean
-middle_name: Howard
-gender: M
 birth_date: 1968-09-05
+gender: Male
+email: https://kean.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000398.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-7
 offices:
 - classification: capitol
-  address: 251 Cannon House Office Building Washington DC 20515-3007
+  address: 251 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-5361
+- classification: district
+  address: 75 Claremont Road Suite 206, Bernardsville, NJ 07924
+  voice: 908-547-3307
 links:
 - url: https://kean.house.gov
   note: website
-ids:
-  twitter: CongressmanKean
+- url: https://kean.house.gov/
 other_names:
 - name: Kean (NJ)
+- name: Kean, T.
+- name: T. Kean
+- name: T.H. Kean
+- name: Thomas H. Kean, Jr.
+ids:
+  twitter: CongressmanKean
 other_identifiers:
 - scheme: bioguide
   identifier: K000398
@@ -46,3 +52,8 @@ other_identifiers:
   identifier: '43250'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Thomas_Kean
+- url: https://en.wikipedia.org/wiki/Thomas_Kean,_Jr.
+- url: https://justfacts.votesmart.org/candidate/biography/43250/tom-kean-jr
+- url: https://kean.house.gov
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Thomas-Massie-7d1234be-d22a-5374-8022-59a795f0f3f4.yml b/data/us/legislature/Thomas-Massie-7d1234be-d22a-5374-8022-59a795f0f3f4.yml
index bab1edf385..23252004b3 100644
--- a/data/us/legislature/Thomas-Massie-7d1234be-d22a-5374-8022-59a795f0f3f4.yml
+++ b/data/us/legislature/Thomas-Massie-7d1234be-d22a-5374-8022-59a795f0f3f4.yml
@@ -2,69 +2,67 @@ id: ocd-person/7d1234be-d22a-5374-8022-59a795f0f3f4
 name: Thomas Massie
 given_name: Thomas
 family_name: Massie
-gender: M
 birth_date: 1971-01-13
+gender: Male
+email: https://massie.house.gov/contact/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/M001184.jpg
 party:
-- start_date: '2012-11-13'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2012-11-13'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2012-11-13
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KY-4
 offices:
 - classification: capitol
-  address: 2453 Rayburn House Office Building Washington DC 20515-1704
+  address: 2453 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3465
 - classification: district
-  address: 1700 Greenup Ave. Suite 505; Ashland, KY 41101
-  voice: 606-324-9898
-  name: 'District Office #1'
+  address: 110 W. Jefferson St., Suite 100, LaGrange, KY 40031
+  voice: 502-265-9119
 - classification: district
-  address: 541 Buttermilk Pike Suite 208; Crescent Springs, KY 41017
+  address: 541 Buttermilk Pike Suite 208, Crescent Springs, KY 41017
   voice: 859-426-0080
   fax: 859-426-0061
-  name: 'District Office #2'
-- classification: district
-  address: 108 W. Jefferson St. Suite 100; La Grange, KY 40031
-  voice: 502-265-9119
-  name: 'District Office #3'
 links:
 - url: https://massie.house.gov
   note: website
+- url: https://massie.house.gov/
+other_names:
+- name: Massie, T.
+- name: T. Massie
+- name: T.H. Massie
 ids:
   twitter: RepThomasMassie
   youtube: UCpmXOtvvXC3GE8o9VxYNK7g
@@ -98,3 +96,9 @@ other_identifiers:
   identifier: kg:/m/0h_cb6v
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Thomas_Massie
+- url: https://en.wikipedia.org/wiki/Thomas_Massie
+- url: https://justfacts.votesmart.org/candidate/biography/132068/thomas-massie
+- url: https://massie.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/thomas_massie/412503
diff --git a/data/us/legislature/Thomas-P-Tiffany-5048bd11-acf0-5775-a75f-5f085fc8bc11.yml b/data/us/legislature/Thomas-P-Tiffany-5048bd11-acf0-5775-a75f-5f085fc8bc11.yml
index 98ce63a946..e75f4fb7da 100644
--- a/data/us/legislature/Thomas-P-Tiffany-5048bd11-acf0-5775-a75f-5f085fc8bc11.yml
+++ b/data/us/legislature/Thomas-P-Tiffany-5048bd11-acf0-5775-a75f-5f085fc8bc11.yml
@@ -1,38 +1,45 @@
 id: ocd-person/5048bd11-acf0-5775-a75f-5f085fc8bc11
-name: Thomas P. Tiffany
-given_name: Thomas
+name: Tom Tiffany
+given_name: Tom
 family_name: Tiffany
-middle_name: P.
-gender: M
 birth_date: 1957-12-30
+gender: Male
+email: https://tiffany.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/T000165.jpg
 party:
-- start_date: '2020-05-19'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2020-05-19'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2020-05-19
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-7
 offices:
 - classification: capitol
-  address: 451 Cannon House Office Building Washington DC 20515-4907
+  address: 451 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-3365
+- classification: district
+  address: 2620 Stewart Ave. Suite 312, Wausau, WI 54401
+  voice: 715-298-9344
 links:
 - url: https://tiffany.house.gov
   note: website
+- url: https://tiffany.house.gov/
+other_names:
+- name: T. Tiffany
+- name: T.P. Tiffany
+- name: Thomas P. Tiffany
+- name: Tiffany, T.
 ids:
   twitter: RepTiffany
 other_identifiers:
@@ -52,3 +59,10 @@ other_identifiers:
   identifier: Tom Tiffany
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Tiffany
+- url: https://en.wikipedia.org/wiki/Tom_Tiffany
+- url: https://justfacts.votesmart.org/candidate/biography/51831/tom-tiffany
+- url: https://theunitedstates.io
+- url: https://tiffany.house.gov
+- url: https://tiffany.house.gov/about
+- url: https://tomtiffany.com
diff --git a/data/us/legislature/Thomas-R-Carper-762f36c5-6766-5708-9066-d1d6340500d3.yml b/data/us/legislature/Thomas-R-Carper-762f36c5-6766-5708-9066-d1d6340500d3.yml
index d8b729174f..94322b4ef2 100644
--- a/data/us/legislature/Thomas-R-Carper-762f36c5-6766-5708-9066-d1d6340500d3.yml
+++ b/data/us/legislature/Thomas-R-Carper-762f36c5-6766-5708-9066-d1d6340500d3.yml
@@ -1,91 +1,92 @@
 id: ocd-person/762f36c5-6766-5708-9066-d1d6340500d3
-name: Thomas R. Carper
-given_name: Thomas
+name: Tom Carper
+given_name: Tom
 family_name: Carper
-middle_name: Richard
-gender: M
 birth_date: 1947-01-23
+gender: Male
+email: https://www.carper.senate.gov/contact/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/C000174.jpg
 party:
-- start_date: '1983-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1983-01-03'
-  end_date: '1985-01-03'
+- start_date: 2001-01-03
+  end_date: 2025-01-02
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Delaware
+- start_date: 2013-01-03
+  end_date: 2019-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Delaware
+- start_date: 2007-01-04
+  end_date: 2013-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Delaware
+- start_date: 2001-01-03
+  end_date: 2007-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Delaware
+- start_date: 1991-01-03
+  end_date: 1993-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '1985-01-03'
-  end_date: '1987-01-03'
+- start_date: 1989-01-03
+  end_date: 1991-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '1987-01-06'
-  end_date: '1989-01-03'
+- start_date: 1987-01-06
+  end_date: 1989-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '1989-01-03'
-  end_date: '1991-01-03'
+- start_date: 1985-01-03
+  end_date: 1987-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '1991-01-03'
-  end_date: '1993-01-03'
+- start_date: 1983-01-03
+  end_date: 1985-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: DE-AL
-- start_date: '2001-01-03'
-  end_date: '2007-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Delaware
-- start_date: '2007-01-04'
-  end_date: '2013-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Delaware
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Delaware
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Delaware
 offices:
 - classification: capitol
-  address: 513 Hart Senate Office Building Washington DC 20510
+  address: 513 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-2441
+  fax: 202-228-2190
 - classification: district
-  address: 500 W. Loockerman St. Suite 470; Dover, DE 19904
-  voice: 302-674-3308
-  fax: 302-674-5464
-  name: 'District Office #1'
-- classification: district
-  address: 12 The Circle; Georgetown, DE 19947
+  address: 12 The Circle, Georgetown, DE 19947
   voice: 302-856-7690
   fax: 302-856-3001
-  name: 'District Office #2'
 - classification: district
-  address: 301 N. Walnut St. Suite 102L-1; Wilmington, DE 19801-3974
+  address: 301 N. Walnut St. Suite 102L-1, Wilmington, DE 19801
   voice: 302-573-6291
   fax: 302-573-6434
-  name: 'District Office #3'
+- classification: district
+  address: 555 E. Loockerman St. Suite 300, Dover, DE 19901
+  voice: 302-674-3308
+  fax: 302-674-5464
 links:
 - url: https://www.carper.senate.gov
   note: website
 - url: https://www.carper.senate.gov/contact/
   note: contact form
+- url: https://www.carper.senate.gov/
+other_names:
+- name: Carper (D-DE)
+- name: Carper, T.
+- name: T. Carper
+- name: T.R. Carper
+- name: Thomas R. Carper
 ids:
   twitter: SenatorCarper
   youtube: UCgLnvbKwu4B3navofj6Qvvw
   facebook: tomcarper
-other_names:
-- name: Carper (D-DE)
 other_identifiers:
 - scheme: bioguide
   identifier: C000174
@@ -119,3 +120,11 @@ other_identifiers:
   identifier: kg:/m/01xw7t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Carper
+- url: https://carperfordelaware.com/about
+- url: https://en.wikipedia.org/wiki/Tom_Carper
+- url: https://justfacts.votesmart.org/candidate/biography/22421/tom-carper
+- url: https://theunitedstates.io
+- url: https://www.carper.senate.gov
+- url: https://www.carper.senate.gov/about
+- url: https://www.govtrack.us/congress/members/thomas_carper/300019
diff --git a/data/us/legislature/Thomas-R-Suozzi-4182b897-5c2e-5dff-a87c-aa7911e81a3d.yml b/data/us/legislature/Thomas-R-Suozzi-4182b897-5c2e-5dff-a87c-aa7911e81a3d.yml
index f0f1b963d6..c22598c315 100644
--- a/data/us/legislature/Thomas-R-Suozzi-4182b897-5c2e-5dff-a87c-aa7911e81a3d.yml
+++ b/data/us/legislature/Thomas-R-Suozzi-4182b897-5c2e-5dff-a87c-aa7911e81a3d.yml
@@ -1,43 +1,53 @@
 id: ocd-person/4182b897-5c2e-5dff-a87c-aa7911e81a3d
-name: Thomas R. Suozzi
-given_name: Thomas
+name: Tom Suozzi
+given_name: Tom
 family_name: Suozzi
-middle_name: R.
-gender: M
 birth_date: 1962-08-31
+gender: Male
+email: https://suozzi.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S001201.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2024-02-13
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-3
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-3
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-3
-- start_date: '2024-02-13'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-3
 offices:
 - classification: capitol
-  address: 1117 Longworth House Office Building Washington DC 20515-3203
+  address: 1117 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3335
+- classification: district
+  address: 242-09 Northern Blvd., Douglaston, NY 11363
+  voice: 718-631-0400
+- classification: district
+  address: 51 Glen St. Second Floor, Glen Cove, NY 11542
+  voice: 516-861-1070
 links:
 - url: https://suozzi.house.gov
   note: website
+- url: https://suozzi.house.gov/
+other_names:
+- name: Suozzi, T.
+- name: T. Suozzi
+- name: T.R. Suozzi
+- name: Thomas R. Suozzi
 other_identifiers:
 - scheme: bioguide
   identifier: S001201
@@ -65,3 +75,11 @@ other_identifiers:
   identifier: Tom Suozzi
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Suozzi
+- url: https://en.wikipedia.org/wiki/Thomas_Suozzi
+- url: https://justfacts.votesmart.org/candidate/biography/92111/thomas-suozzi
+- url: https://suozzi.house.gov
+- url: https://suozziforcongress2024.com/about-tom
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/thomas_suozzi/412717
+- url: https://www.linkedin.com/in/tomsuozzi
diff --git a/data/us/legislature/Tim-Burchett-06b83e26-fe35-526d-86fb-7a6d80b20d1a.yml b/data/us/legislature/Tim-Burchett-06b83e26-fe35-526d-86fb-7a6d80b20d1a.yml
index 7281d5a718..49b4c06a87 100644
--- a/data/us/legislature/Tim-Burchett-06b83e26-fe35-526d-86fb-7a6d80b20d1a.yml
+++ b/data/us/legislature/Tim-Burchett-06b83e26-fe35-526d-86fb-7a6d80b20d1a.yml
@@ -2,44 +2,46 @@ id: ocd-person/06b83e26-fe35-526d-86fb-7a6d80b20d1a
 name: Tim Burchett
 given_name: Tim
 family_name: Burchett
-gender: M
 birth_date: 1964-08-25
+gender: Male
+email: https://burchett.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/B001309.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-2
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TN-2
 offices:
 - classification: capitol
-  address: 1122 Longworth House Office Building Washington DC 20515-4202
+  address: 1122 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5435
 - classification: district
-  address: 800 Market St Suite 110; Knoxville, TN 37902-2327
-  voice: 865-523-3772
-  name: 'District Office #1'
-- classification: district
-  address: 341 Court St; Maryville, TN 37804-5906
+  address: 331 Court St., Maryville, TN 37804
   voice: 865-984-5464
-  name: 'District Office #2'
+- classification: district
+  address: 800 Market St. Suite 110, Knoxville, TN 37902
+  voice: 865-523-3772
 links:
 - url: https://burchett.house.gov
   note: website
+- url: https://burchett.house.gov/
+other_names:
+- name: Burchett, T.
+- name: T. Burchett
+- name: T.F. Burchett
 ids:
   twitter: RepTimBurchett
 other_identifiers:
@@ -65,3 +67,9 @@ other_identifiers:
   identifier: Tim Burchett
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tim_Burchett
+- url: https://burchett.house.gov
+- url: https://en.wikipedia.org/wiki/Tim_Burchett
+- url: https://justfacts.votesmart.org/candidate/biography/24379/tim-burchett
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tim_burchett/412817
diff --git a/data/us/legislature/Tim-Kaine-4d537f5f-04fd-578a-a8d2-61dd4972e758.yml b/data/us/legislature/Tim-Kaine-4d537f5f-04fd-578a-a8d2-61dd4972e758.yml
index b6e90a2710..81944e4590 100644
--- a/data/us/legislature/Tim-Kaine-4d537f5f-04fd-578a-a8d2-61dd4972e758.yml
+++ b/data/us/legislature/Tim-Kaine-4d537f5f-04fd-578a-a8d2-61dd4972e758.yml
@@ -1,70 +1,62 @@
 id: ocd-person/4d537f5f-04fd-578a-a8d2-61dd4972e758
 name: Tim Kaine
-given_name: Timothy
+given_name: Tim
 family_name: Kaine
-gender: M
 birth_date: 1958-02-26
+gender: Male
+email: https://www.kaine.senate.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/K000384.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2025-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Virginia
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2019-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Virginia
 offices:
 - classification: capitol
-  address: 231 Russell Senate Office Building Washington DC 20510
+  address: 231 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4024
+- classification: capitol
+  address: 919 E. Main St. Suite 970, Richmond, VA 23219
+  voice: 804-771-2221
 - classification: district
-  address: 121 Russell Rd. Suite 2; Abingdon, VA 24210
+  address: 121 Russell Road Suite 2, Abingdon, VA 24210
   voice: 276-525-4790
-  fax: 276-525-4792
-  name: 'District Office #1'
-- classification: district
-  address: 308 Craghead Street Suite 102A; Danville, VA 24541
-  voice: 434-792-0976
-  fax: 434-792-0978
-  name: 'District Office #2'
-- classification: district
-  address: 9408 Grant Avenue Suite 202; Manassas, VA 20110
-  voice: 703-361-3192
-  fax: 703-361-3198
-  name: 'District Office #3'
 - classification: district
-  address: 919 E. Main St. Suite 970; Richmond, VA 23219
-  voice: 804-771-2221
-  fax: 804-771-8313
-  name: 'District Office #4'
+  address: 222 Central Park Ave. Suite 120, Virginia Beach, VA 23462
+  voice: 757-518-1674
 - classification: district
-  address: 611 S. Jefferson St. Suite 5B; Roanoke, VA 24011
+  address: 611 S. Jefferson St. Suite 5B, Roanoke, VA 24011
   voice: 540-682-5693
-  fax: 540-682-5697
-  name: 'District Office #5'
 - classification: district
-  address: 222 Central Park Ave. Suite 120; Virginia Beach, VA 23462
-  voice: 757-518-1674
-  fax: 757-518-1679
-  name: 'District Office #6'
+  address: 816 William St. Suite B, Fredericksburg, VA 22401
+  voice: 540-369-7667
+  fax: 540-310-0049
+- classification: district
+  address: 9408 Grant Ave. Suite 202, Manassas, VA 20110
+  voice: 703-361-3192
 links:
 - url: https://www.kaine.senate.gov
   note: website
 - url: https://www.kaine.senate.gov/contact
   note: contact form
+- url: https://www.kaine.senate.gov/
+other_names:
+- name: Kaine (D-VA)
+- name: Kaine, T.
+- name: T. Kaine
+- name: T.M. Kaine
+- name: Timothy M. Kaine
 ids:
   youtube: UC27LgTZlUnBQoNEQFZdn9LA
   facebook: SenatorKaine
-other_names:
-- name: Timothy M. Kaine
-- name: Kaine (D-VA)
 other_identifiers:
 - scheme: bioguide
   identifier: K000384
@@ -96,3 +88,11 @@ other_identifiers:
   identifier: kg:/m/053f8h
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tim_Kaine
+- url: https://en.wikipedia.org/wiki/Tim_Kaine
+- url: https://justfacts.votesmart.org/candidate/50772/tim-kaine
+- url: https://theunitedstates.io
+- url: https://timkaine.com/about
+- url: https://www.govtrack.us/congress/members/timothy_kaine/412582
+- url: https://www.kaine.senate.gov
+- url: https://www.kaine.senate.gov/about
diff --git a/data/us/legislature/Tim-Scott-3bb4a99e-9448-5b35-86cd-114bd035535e.yml b/data/us/legislature/Tim-Scott-3bb4a99e-9448-5b35-86cd-114bd035535e.yml
index e085e96ac6..08015cf7a0 100644
--- a/data/us/legislature/Tim-Scott-3bb4a99e-9448-5b35-86cd-114bd035535e.yml
+++ b/data/us/legislature/Tim-Scott-3bb4a99e-9448-5b35-86cd-114bd035535e.yml
@@ -2,69 +2,70 @@ id: ocd-person/3bb4a99e-9448-5b35-86cd-114bd035535e
 name: Tim Scott
 given_name: Tim
 family_name: Scott
-gender: M
 birth_date: 1965-09-19
+gender: Male
+email: https://www.scott.senate.gov/contact/email-me/
 image: https://theunitedstates.io/images/congress/450x550/S001184.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-02'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: SC-1
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2023-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: South Carolina
+- start_date: 2011-01-05
+  end_date: 2013-01-02
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: SC-1
 offices:
 - classification: capitol
-  address: 104 Hart Senate Office Building Washington DC 20510
+  address: 104 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-6121
+  fax: 202-228-5143
 - classification: district
-  address: 1901 Main St. Suite 1425; Columbia, SC 29201
+  address: 1901 Main St. Suite 1425, Columbia, SC 29201
   voice: 803-771-6112
   fax: 855-802-9355
-  name: 'District Office #1'
 - classification: district
-  address: 104 S. Main St. Suite 803; Greenville, SC 29601
-  voice: 864-233-5366
+  address: 2500 City Hall Lane 3rd Floor Suite, North Charleston, SC 29406
+  voice: 843-727-4525
   fax: 855-802-9355
-  name: 'District Office #2'
 - classification: district
-  address: 2500 City Hall Ln. 3rd Floor Suite; North Charleston, SC 29406
-  voice: 843-727-4525
+  address: 301 N. Main St. Suite 1006, Greenville, SC 29601
+  voice: 864-233-5366
   fax: 855-802-9355
-  name: 'District Office #3'
 links:
 - url: https://www.scott.senate.gov
   note: website
 - url: https://www.scott.senate.gov/contact/email-me
   note: contact form
+- url: https://www.scott.senate.gov/
+other_names:
+- name: Scott (R-SC)
+- name: Scott, T.
+- name: T. Scott
+- name: T.E. Scott
 ids:
   twitter: SenatorTimScott
   youtube: UCSfAsbG80CNInSKrtpKoL-w
   facebook: SenatorTimScott
-other_names:
-- name: Scott (R-SC)
 other_identifiers:
 - scheme: bioguide
   identifier: S001184
@@ -100,3 +101,10 @@ other_identifiers:
   identifier: kg:/m/0c407g6
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tim_Scott
+- url: https://en.wikipedia.org/wiki/Tim_Scott_%28politician%29
+- url: https://justfacts.votesmart.org/candidate/11940/tim-scott
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tim_scott/412471
+- url: https://www.linkedin.com/in/senatortimscott
+- url: https://www.scott.senate.gov
diff --git a/data/us/legislature/Tim-Walberg-9e622be4-95d2-5bf7-a99f-543d45400e82.yml b/data/us/legislature/Tim-Walberg-9e622be4-95d2-5bf7-a99f-543d45400e82.yml
index fcdeac895b..f2e00d54f5 100644
--- a/data/us/legislature/Tim-Walberg-9e622be4-95d2-5bf7-a99f-543d45400e82.yml
+++ b/data/us/legislature/Tim-Walberg-9e622be4-95d2-5bf7-a99f-543d45400e82.yml
@@ -2,66 +2,73 @@ id: ocd-person/9e622be4-95d2-5bf7-a99f-543d45400e82
 name: Tim Walberg
 given_name: Tim
 family_name: Walberg
-gender: M
 birth_date: 1951-04-12
+gender: Male
+email: https://walberg.house.gov/address_authentication?form=/contact/email
 image: https://theunitedstates.io/images/congress/450x550/W000798.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-7
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: MI-5
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MI-7
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MI-5
+  district: MI-7
 offices:
 - classification: capitol
-  address: 2266 Rayburn House Office Building Washington DC 20515-2205
+  address: 2266 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6276
+  fax: 202-225-6281
 - classification: district
-  address: 401 W. Michigan Ave.; Jackson, MI 49201
+  address: 401 W. Michigan Ave., Jackson, MI 49201
   voice: 517-780-9075
   fax: 517-780-9081
-  name: 'District Office #1'
+- classification: district
+  address: 92 E. Main St., Niles, MI 49120
+  voice: 269-479-3115
 links:
 - url: https://walberg.house.gov
   note: website
+- url: https://walberg.house.gov/
+other_names:
+- name: T. Walberg
+- name: T.L. Walberg
+- name: Walberg, T.
 ids:
   twitter: RepWalberg
   youtube: UChpf3_3Wn8f3qSJbsYXrhvg
@@ -97,3 +104,9 @@ other_identifiers:
   identifier: kg:/m/0d7n3m
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tim_Walberg
+- url: https://en.wikipedia.org/wiki/Tim_Walberg
+- url: https://justfacts.votesmart.org/candidate/8618/tim-walberg
+- url: https://theunitedstates.io
+- url: https://walberg.house.gov
+- url: https://www.govtrack.us/congress/members/tim_walberg/412213
diff --git a/data/us/legislature/Timothy-M-Kennedy-7d860788-e85f-5f23-a7dc-133364f9d4e9.yml b/data/us/legislature/Timothy-M-Kennedy-7d860788-e85f-5f23-a7dc-133364f9d4e9.yml
index 114e184f9d..c67472285b 100644
--- a/data/us/legislature/Timothy-M-Kennedy-7d860788-e85f-5f23-a7dc-133364f9d4e9.yml
+++ b/data/us/legislature/Timothy-M-Kennedy-7d860788-e85f-5f23-a7dc-133364f9d4e9.yml
@@ -1,29 +1,38 @@
 id: ocd-person/7d860788-e85f-5f23-a7dc-133364f9d4e9
-name: Timothy M. Kennedy
-given_name: Timothy
+name: Tim Kennedy
+given_name: Tim
 family_name: Kennedy
-gender: M
 birth_date: 1976-10-20
+gender: Male
+email: https://kennedy.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/K000402.jpg
 party:
-- start_date: '2024-05-06'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2024-05-06'
-  end_date: '2025-01-03'
+- start_date: 2024-05-06
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-26
 offices:
 - classification: capitol
-  address: 2269 Rayburn House Office Building Washington DC 20515-3226
+  address: 2269 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3306
+- classification: district
+  address: 726 Exchange St. Suite 601, Buffalo, NY 14210
+  voice: 716-852-3501
+- classification: district
+  address: 800 Main St. Suite 3C, Niagara Falls, NY 14301
+  voice: 716-282-1274
 links:
 - url: https://kennedy.house.gov
   note: website
 other_names:
+- name: Kennedy, T.
+- name: T. Kennedy
+- name: T.M. Kennedy
 - name: Timothy Kennedy
+- name: Timothy M. Kennedy
 other_identifiers:
 - scheme: bioguide
   identifier: K000402
@@ -45,3 +54,9 @@ other_identifiers:
   identifier: Tim Kennedy (New York)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Timothy_M._Kennedy
+- url: https://en.wikipedia.org/wiki/Timothy_M._Kennedy_(politician)
+- url: https://justfacts.votesmart.org/candidate/biography/91670/timothy-kennedy
+- url: https://kennedy.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/tim-kennedy-3b834448
diff --git a/data/us/legislature/Tina-Smith-f82067c3-a257-54ae-b6bd-ebe5178372e7.yml b/data/us/legislature/Tina-Smith-f82067c3-a257-54ae-b6bd-ebe5178372e7.yml
index 89815cdf08..7e0c531834 100644
--- a/data/us/legislature/Tina-Smith-f82067c3-a257-54ae-b6bd-ebe5178372e7.yml
+++ b/data/us/legislature/Tina-Smith-f82067c3-a257-54ae-b6bd-ebe5178372e7.yml
@@ -2,60 +2,59 @@ id: ocd-person/f82067c3-a257-54ae-b6bd-ebe5178372e7
 name: Tina Smith
 given_name: Tina
 family_name: Smith
-middle_name: Flint
-gender: F
 birth_date: 1958-03-04
+gender: Female
+email: https://www.smith.senate.gov/share-your-opinion/
 image: https://theunitedstates.io/images/congress/450x550/S001203.jpg
 party:
-- start_date: '2018-01-03'
-  end_date: '2027-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2018-01-03'
-  end_date: '2018-11-06'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
-- start_date: '2018-11-07'
-  end_date: '2021-01-03'
+- start_date: 2018-11-07
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2018-01-03
+  end_date: 2018-11-06
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Minnesota
 offices:
 - classification: capitol
-  address: 720 Hart Senate Office Building Washington DC 20510
+  address: 720 Hart Senate Office Building, Washington, DC 20510
   voice: 202-224-5641
+  fax: 202-224-0044
 - classification: district
-  address: 819 Center Avenue 2A; Moorhead, MN 56560
-  voice: 218-284-8721
-  name: 'District Office #1'
+  address: 1202-1/2 7th St. NW Suite 218, Rochester, MN 55901
+  voice: 507-218-2003
 - classification: district
-  address: 515 W 1st Street 104; Duluth, MN 55802
+  address: 515 W. 1st St. Suite 104, Duluth, MN 55802
   voice: 218-722-2390
-  name: 'District Office #2'
 - classification: district
-  address: 60 Plato Blvd. East 220; Saint Paul, MN 55107
+  address: 60 Plato Blvd. East Suite 220, St. Paul, MN 55107
   voice: 651-221-1016
-  name: 'District Office #3'
 - classification: district
-  address: 1202-1/2 7th Street NW 213; Rochester, MN 55901
-  voice: 507-288-2003
-  name: 'District Office #4'
+  address: 819 Center Ave. Suite 2A, Moorhead, MN 56560
+  voice: 218-284-8721
 links:
 - url: https://www.smith.senate.gov
   note: website
 - url: https://www.smith.senate.gov/share-your-opinion/
   note: contact form
+- url: https://www.smith.senate.gov/
+other_names:
+- name: C.E.F. Smith
+- name: Smith (D-MN)
+- name: Smith, T.
+- name: T. Smith
 ids:
   twitter: SenTinaSmith
   facebook: USSenTinaSmith
-other_names:
-- name: Smith (D-MN)
 other_identifiers:
 - scheme: bioguide
   identifier: S001203
@@ -85,3 +84,10 @@ other_identifiers:
   identifier: N00042353
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tina_Smith
+- url: https://en.wikipedia.org/wiki/Tina_Smith
+- url: https://justfacts.votesmart.org/candidate/152968/tina-smith
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tina_smith/412742
+- url: https://www.linkedin.com/in/tina-smith-b498504
+- url: https://www.smith.senate.gov
diff --git a/data/us/legislature/Todd-Young-7ec39cbb-df0e-5970-aba1-5722964f55bb.yml b/data/us/legislature/Todd-Young-7ec39cbb-df0e-5970-aba1-5722964f55bb.yml
index e6a8d6b64e..de092ff369 100644
--- a/data/us/legislature/Todd-Young-7ec39cbb-df0e-5970-aba1-5722964f55bb.yml
+++ b/data/us/legislature/Todd-Young-7ec39cbb-df0e-5970-aba1-5722964f55bb.yml
@@ -2,69 +2,68 @@ id: ocd-person/7ec39cbb-df0e-5970-aba1-5722964f55bb
 name: Todd Young
 given_name: Todd
 family_name: Young
-middle_name: C.
-gender: M
 birth_date: 1972-08-24
+gender: Male
+email: https://www.young.senate.gov/contact/email-todd/
 image: https://theunitedstates.io/images/congress/450x550/Y000064.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2029-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2029-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Indiana
+- start_date: 2017-01-03
+  end_date: 2023-01-03
+  type: upper
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: Indiana
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-9
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-9
-- start_date: '2017-01-03'
-  end_date: '2023-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Indiana
-- start_date: '2023-01-03'
-  end_date: '2029-01-03'
-  type: upper
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: Indiana
 offices:
 - classification: capitol
-  address: 185 Dirksen Senate Office Building Washington DC 20510
+  address: 185 Dirksen Senate Office Building, Washington, DC 20510
   voice: 202-224-5623
+- classification: capitol
+  address: 3602 Northgate Court Suite 15, New Albany, IN 47150
+  voice: 812-542-4820
 - classification: district
-  address: 251 N. Illinois St. Suite 120; Indianapolis, IN 46204
+  address: 1300 S. Harrison St. Suite 3161, Fort Wayne, IN 46802
   voice: 317-226-6700
-  name: 'District Office #1'
-- classification: district
-  address: 3602 Northgate Ct Suite 15; New Albany, IN 47150
-  voice: 812-542-4820
-  name: 'District Office #2'
 - classification: district
-  address: 101 Martin Luther King Jr. Blvd Suite 110; Evansville, IN 47708
-  name: 'District Office #3'
+  address: 212 E. Lincoln Way Suite 205A, Valparaiso, IN 46383
+  voice: 219-747-7780
 - classification: district
-  address: 1300 South Harrison Street Suite 3161; Fort Wayne, IN 46802
-  name: 'District Office #4'
+  address: 310 E. 96th St. Suite 350, Indianapolis, IN 46204
+  voice: 317-226-6700
 links:
-- url: https://www.young.senate.gov
-  note: website
 - url: https://www.young.senate.gov/contact
   note: contact form
+- url: https://www.young.senate.gov
+  note: website
+other_names:
+- name: T. Young
+- name: T.C. Young
+- name: Young (R-IN)
+- name: Young, T.
 ids:
   twitter: SenToddYoung
   youtube: UCuknj4PGn91gHDNAfboZEgQ
   facebook: SenatorToddYoung
-other_names:
-- name: Young (R-IN)
 other_identifiers:
 - scheme: bioguide
   identifier: Y000064
@@ -100,3 +99,9 @@ other_identifiers:
   identifier: S391
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Todd_Young
+- url: https://en.wikipedia.org/wiki/Todd_Young
+- url: https://justfacts.votesmart.org/candidate/biography/120345/todd-young
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/todd_young/412428
+- url: https://www.young.senate.gov
diff --git a/data/us/legislature/Tom-Cole-34706e89-9ed8-5078-b825-f310caf5a8f6.yml b/data/us/legislature/Tom-Cole-34706e89-9ed8-5078-b825-f310caf5a8f6.yml
index 4df42be944..41bfe28fed 100644
--- a/data/us/legislature/Tom-Cole-34706e89-9ed8-5078-b825-f310caf5a8f6.yml
+++ b/data/us/legislature/Tom-Cole-34706e89-9ed8-5078-b825-f310caf5a8f6.yml
@@ -2,91 +2,93 @@ id: ocd-person/34706e89-9ed8-5078-b825-f310caf5a8f6
 name: Tom Cole
 given_name: Tom
 family_name: Cole
-gender: M
 birth_date: 1949-04-28
+gender: Male
+email: https://cole.house.gov/zip-authentication
 image: https://theunitedstates.io/images/congress/450x550/C001053.jpg
 party:
-- start_date: '2003-01-07'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OK-4
 offices:
 - classification: capitol
-  address: 2207 Rayburn House Office Building Washington DC 20515-3604
+  address: 2207 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6165
+  fax: 202-225-3512
 - classification: district
-  address: 711 SW. D Ave. Suite 201; Lawton, OK 73501
-  voice: 580-357-2131
-  fax: 580-357-7477
-  name: 'District Office #1'
+  address: 100 E. 13th St., Suite 213, Ada, OK 74820
+  voice: 580-436-5375
+  fax: 580-436-5451
 - classification: district
-  address: 2424 Springer Dr. Suite 201; Norman, OK 73069
+  address: 3219 Rock Creek Road Suite 125, Norman, OK 73072
   voice: 405-329-6500
   fax: 405-321-7369
-  name: 'District Office #2'
 - classification: district
-  address: 100 E. 13th St. Suite 213; Ada, OK 74820
-  voice: 580-436-5375
-  fax: 580-436-5451
-  name: 'District Office #3'
+  address: 711 SW D Ave. Suite 201, Lawton, OK 73501
+  voice: 580-357-2131
+  fax: 580-357-7477
 links:
 - url: https://cole.house.gov
   note: website
+- url: https://cole.house.gov/
+other_names:
+- name: Cole, T.
+- name: T. Cole
+- name: T.J. Cole
 ids:
   twitter: TomColeOK04
   youtube: UCvqzPm_YnNkfEHpm3SEMJMQ
@@ -122,3 +124,13 @@ other_identifiers:
   identifier: kg:/m/03tqb0
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Cole_(Oklahoma)
+- url: https://cole.house.gov
+- url: https://cole.house.gov/about/full-biography
+- url: https://en.wikipedia.org/wiki/Tom_Cole
+- url: https://justfacts.votesmart.org/candidate/46034/tom-cole
+- url: https://theunitedstates.io
+- url: https://tomcoleforcongress.com/about-tom
+- url: https://www.govtrack.us/congress/members/tom_cole/400077
+- url: https://www.linkedin.com/in/tom-cole-7577931a
+- url: https://www.okhistory.org/publications/enc/entry.php?entry=CO084
diff --git a/data/us/legislature/Tom-Cotton-a0c9885f-b9f8-5045-9e74-044a886b9a6e.yml b/data/us/legislature/Tom-Cotton-a0c9885f-b9f8-5045-9e74-044a886b9a6e.yml
index bb8a6b32af..fdd0ff38ed 100644
--- a/data/us/legislature/Tom-Cotton-a0c9885f-b9f8-5045-9e74-044a886b9a6e.yml
+++ b/data/us/legislature/Tom-Cotton-a0c9885f-b9f8-5045-9e74-044a886b9a6e.yml
@@ -2,64 +2,62 @@ id: ocd-person/a0c9885f-b9f8-5045-9e74-044a886b9a6e
 name: Tom Cotton
 given_name: Tom
 family_name: Cotton
-gender: M
 birth_date: 1977-05-13
+gender: Male
+email: https://www.cotton.senate.gov/contact/contact-tom
 image: https://theunitedstates.io/images/congress/450x550/C001095.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
-  type: lower
-  jurisdiction: ocd-jurisdiction/country:us/government
-  district: AR-4
-- start_date: '2015-01-06'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Arkansas
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2015-01-06
+  end_date: 2021-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Arkansas
+- start_date: 2013-01-03
+  end_date: 2015-01-03
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/government
+  district: AR-4
 offices:
 - classification: capitol
-  address: 326 Russell Senate Office Building Washington DC 20510
+  address: 1401 W. Capitol Ave. Suite 235, Little Rock, AR 72201
+  voice: 501-223-9081
+  fax: 501-244-9633
+- classification: capitol
+  address: 326 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-2353
 - classification: district
-  address: 106 W. Main St. Suite 410; El Dorado, AR 71730
+  address: 106 W. Main St. Suite 410, El Dorado, AR 71730
   voice: 870-864-8582
   fax: 870-864-8571
-  name: 'District Office #1'
 - classification: district
-  address: 300 S. Church Suite 338; Jonesboro, AR 72401
+  address: 300 S. Church St. Suite 338, Jonesboro, AR 72401
   voice: 870-933-6223
   fax: 870-933-6596
-  name: 'District Office #2'
-- classification: district
-  address: 1401 W. Capitol Ave. Suite 235; Little Rock, AR 72201
-  voice: 501-223-9081
-  fax: 501-223-9105
-  name: 'District Office #3'
 - classification: district
-  address: 1108 S. Old Missouri Rd. Suite B; Springdale, AR 72764
+  address: 3333 S. Pinnacle Hills Parkway Suite 425, Rogers, AR 72758
   voice: 479-751-0879
-  fax: 479-927-1092
-  name: 'District Office #4'
+  fax: 479-464-0648
 links:
-- url: https://www.cotton.senate.gov
-  note: website
 - url: https://www.cotton.senate.gov/contact/contact-tom
   note: contact form
+- url: https://www.cotton.senate.gov
+  note: website
+other_names:
+- name: Cotton (R-AR)
+- name: Cotton, T.
+- name: T. Cotton
+- name: T.B. Cotton
 ids:
   twitter: SenTomCotton
   youtube: UCXEk6mokWBajIpNatbjnwSg
   facebook: SenatorTomCotton
-other_names:
-- name: Cotton (R-AR)
 other_identifiers:
 - scheme: govtrack
   identifier: '412508'
@@ -93,3 +91,10 @@ other_identifiers:
   identifier: kg:/m/02g3ds
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Cotton
+- url: https://en.wikipedia.org/wiki/Tom_Cotton
+- url: https://justfacts.votesmart.org/candidate/biography/135651/tom-cotton
+- url: https://theunitedstates.io
+- url: https://www.cotton.senate.gov
+- url: https://www.govtrack.us/congress/members/tom_cotton/412508
+- url: https://www.linkedin.com/in/tom-cotton-8756857
diff --git a/data/us/legislature/Tom-Emmer-08e42c4f-2c5e-5fe0-87cf-0e8de2bdb52d.yml b/data/us/legislature/Tom-Emmer-08e42c4f-2c5e-5fe0-87cf-0e8de2bdb52d.yml
index b087db589c..737c34a1ec 100644
--- a/data/us/legislature/Tom-Emmer-08e42c4f-2c5e-5fe0-87cf-0e8de2bdb52d.yml
+++ b/data/us/legislature/Tom-Emmer-08e42c4f-2c5e-5fe0-87cf-0e8de2bdb52d.yml
@@ -2,51 +2,58 @@ id: ocd-person/08e42c4f-2c5e-5fe0-87cf-0e8de2bdb52d
 name: Tom Emmer
 given_name: Tom
 family_name: Emmer
-gender: M
 birth_date: 1961-03-03
+gender: Male
+email: https://emmer.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/E000294.jpg
 party:
-- start_date: '2015-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-6
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-6
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-6
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-6
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MN-6
 offices:
 - classification: capitol
-  address: 464 Cannon House Office Building Washington DC 20515-2306
+  address: 464 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2331
+  fax: 202-225-6475
 - classification: district
-  address: 9201 Quaday Ave. NE Suite 206; Otsego, MN 55330
+  address: 1107 Hazeltine Blvd. Suite 476, Chaska, MN 55318
+  voice: 952-262-2999
+- classification: district
+  address: 9201 Quaday Ave. NE Suite 206, Otsego, MN 55330
   voice: 763-241-6848
   fax: 763-241-7955
-  name: 'District Office #1'
 links:
 - url: https://emmer.house.gov
   note: website
+- url: https://emmer.house.gov/
+other_names:
+- name: Emmer, T.
+- name: T. Emmer
+- name: T.E. Emmer
 ids:
   twitter: RepTomEmmer
   facebook: reptomemmer
@@ -79,3 +86,10 @@ other_identifiers:
   identifier: Tom Emmer
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_Emmer
+- url: https://emmer.house.gov
+- url: https://en.wikipedia.org/wiki/Tom_Emmer
+- url: https://justfacts.votesmart.org/candidate/biography/38894/tom-emmer
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tom_emmer/412639
+- url: https://www.linkedin.com/in/tomemmer
diff --git a/data/us/legislature/Tom-McClintock-173a4f3f-e38f-569e-97b2-e0424195f16c.yml b/data/us/legislature/Tom-McClintock-173a4f3f-e38f-569e-97b2-e0424195f16c.yml
index e74435882e..00d86cef18 100644
--- a/data/us/legislature/Tom-McClintock-173a4f3f-e38f-569e-97b2-e0424195f16c.yml
+++ b/data/us/legislature/Tom-McClintock-173a4f3f-e38f-569e-97b2-e0424195f16c.yml
@@ -2,66 +2,73 @@ id: ocd-person/173a4f3f-e38f-569e-97b2-e0424195f16c
 name: Tom McClintock
 given_name: Tom
 family_name: McClintock
-gender: M
 birth_date: 1956-07-10
+gender: Male
+email: https://mcclintock.house.gov/address_authentication?form=/contact/email-me
 image: https://theunitedstates.io/images/congress/450x550/M001177.jpg
 party:
-- start_date: '2009-01-06'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-4
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: CA-5
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-5
+  district: CA-4
 offices:
 - classification: capitol
-  address: 2256 Rayburn House Office Building Washington DC 20515-0505
+  address: 2256 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2511
+  fax: 202-225-5444
 - classification: district
-  address: 2200A Douglas Blvd Suite 240; Roseville, CA 95661
+  address: 1020 15th St. Suite 11, Modesto, CA 95354
+  voice: 916-786-5560
+- classification: district
+  address: 4359 Town Center Blvd. Suite 210, El Dorado Hills, CA 95762
   voice: 916-786-5560
   fax: 916-786-6364
-  name: 'District Office #1'
 links:
 - url: https://mcclintock.house.gov
   note: website
+- url: https://mcclintock.house.gov/
+other_names:
+- name: McClintock, T.
+- name: T. McClintock
+- name: T.M. McClintock
 ids:
   twitter: RepMcClintock
   youtube: UCMh04KC4LfIzKoXh2Xws_pw
@@ -99,3 +106,11 @@ other_identifiers:
   identifier: Tom McClintock
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tom_McClintock
+- url: https://en.wikipedia.org/wiki/Tom_McClintock
+- url: https://justfacts.votesmart.org/candidate/9715/tom-mcclintock
+- url: https://mcclintock.house.gov
+- url: https://mcclintock.house.gov/about/biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tom_mcclintock/412295
+- url: https://www.tommcclintock.com/about-tom-mcclintock
diff --git a/data/us/legislature/Tommy-Tuberville-0ee1b661-2035-5dc1-ab1c-b87d25682775.yml b/data/us/legislature/Tommy-Tuberville-0ee1b661-2035-5dc1-ab1c-b87d25682775.yml
index cc5a19bc05..a519ce5e1d 100644
--- a/data/us/legislature/Tommy-Tuberville-0ee1b661-2035-5dc1-ab1c-b87d25682775.yml
+++ b/data/us/legislature/Tommy-Tuberville-0ee1b661-2035-5dc1-ab1c-b87d25682775.yml
@@ -2,33 +2,49 @@ id: ocd-person/0ee1b661-2035-5dc1-ab1c-b87d25682775
 name: Tommy Tuberville
 given_name: Tommy
 family_name: Tuberville
-middle_name: Hawley
-gender: M
 birth_date: 1954-09-18
+gender: Male
+email: https://www.tuberville.senate.gov/contact-old/contact-form/
 image: https://theunitedstates.io/images/congress/450x550/T000278.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2027-01-03'
+- start_date: 2021-01-03
+  end_date: 2027-01-03
   type: upper
   jurisdiction: ocd-jurisdiction/country:us/government
   district: Alabama
 offices:
 - classification: capitol
-  address: 455 Russell Senate Office Building Washington DC 20510
+  address: 455 Russell Senate Office Building, Washington, DC 20510
   voice: 202-224-4124
+- classification: district
+  address: 100 W. Troy St. Suite 302, Dothan, AL 36303
+  voice: 334-547-7441
+- classification: district
+  address: 2101 Clinton Ave. West Suite 300, Huntsville, AL 35805
+  voice: 256-692-7500
+- classification: district
+  address: BB&T Centre 41 W. I-65 Service Road North, Suite 2300-A, Mobile, AL 36608
+  voice: 251-308-7233
+- classification: district
+  address: Frank M Johnson Jr. Annex 1 Church St., Suite 500-B, Montgomery, AL 36104
+  voice: 334-523-7424
+- classification: district
+  address: Galleria Tower 3000 Riverchase, Suite 915, Hoover, AL 35244
+  voice: 205-760-7307
 links:
-- url: https://www.tuberville.senate.gov
-  note: website
 - url: https://www.tuberville.senate.gov/contact/contact-form/
   note: contact form
-ids:
-  twitter: SenTuberville
+- url: https://www.tuberville.senate.gov
+  note: website
 other_names:
+- name: T. Tuberville
+- name: T.H. Tuberville
 - name: Tuberville (R-AL)
+- name: Tuberville, T.
+ids:
+  twitter: SenTuberville
 other_identifiers:
 - scheme: bioguide
   identifier: T000278
@@ -52,3 +68,10 @@ other_identifiers:
   identifier: Tommy Tuberville
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tommy_Tuberville
+- url: https://en.wikipedia.org/wiki/Tommy_Tuberville
+- url: https://justfacts.votesmart.org/candidate/biography/188306/tommy-tuberville
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tommy_tuberville/456796
+- url: https://www.linkedin.com/in/tommy-tuberville-4395a71a
+- url: https://www.tuberville.senate.gov
diff --git a/data/us/legislature/Tony-Crdenas-147fa8d0-050e-585a-b299-b82e84db0845.yml b/data/us/legislature/Tony-Crdenas-147fa8d0-050e-585a-b299-b82e84db0845.yml
index bd4d76f4aa..411685a186 100644
--- a/data/us/legislature/Tony-Crdenas-147fa8d0-050e-585a-b299-b82e84db0845.yml
+++ b/data/us/legislature/Tony-Crdenas-147fa8d0-050e-585a-b299-b82e84db0845.yml
@@ -2,62 +2,65 @@ id: ocd-person/147fa8d0-050e-585a-b299-b82e84db0845
 name: "Tony C\xE1rdenas"
 given_name: Tony
 family_name: "C\xE1rdenas"
-gender: M
 birth_date: 1963-03-31
+gender: Male
+email: https://cardenas.house.gov/contact-me/email-me
 image: https://theunitedstates.io/images/congress/450x550/C001097.jpg
 party:
-- start_date: '2013-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2013-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-29
 offices:
 - classification: capitol
-  address: 2181 Rayburn House Office Building Washington DC 20515-0529
+  address: 2181 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6131
+  fax: 202-225-0819
 - classification: district
-  address: 9612 Van Nuys Blvd. Suite 201; Panorama City, CA 91402
+  address: 9612 Van Nuys Blvd. Suite 201, Panorama City, CA 91402
   voice: 818-221-3718
   fax: 818-221-3809
-  name: 'District Office #1'
 links:
 - url: https://cardenas.house.gov
   note: website
+- url: https://cardenas.house.gov/
+other_names:
+- name: "A. C\xE1rdenas"
+- name: Cardenas
+- name: "C\xE1rdenas, T."
+- name: "T. C\xE1rdenas"
 ids:
   twitter: RepCardenas
   youtube: UCm6ug1-yvYGL0F6DvYxfFBA
   facebook: repcardenas
-other_names:
-- name: Cardenas
 other_identifiers:
 - scheme: govtrack
   identifier: '412517'
@@ -87,3 +90,12 @@ other_identifiers:
   identifier: kg:/m/0cgzsw
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tony_C%C3%A1rdenas
+- url: https://cardenas.house.gov
+- url: https://cardenas.house.gov/about-tony
+- url: https://chci.org/staff-and-leadership/rep-tony-cardenas
+- url: https://en.wikipedia.org/wiki/Tony_C%C3%A1rdenas
+- url: https://justfacts.votesmart.org/candidate/biography/9754/tony-cardenas
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tony_cardenas/412517
+- url: https://www.linkedin.com/in/u-s-rep-tony-cardenas-1b2365a1
diff --git a/data/us/legislature/Tony-Gonzales-7e086fc4-85ff-58af-a436-5f6fa7bfa527.yml b/data/us/legislature/Tony-Gonzales-7e086fc4-85ff-58af-a436-5f6fa7bfa527.yml
index 84fd616af6..b55eab2ff3 100644
--- a/data/us/legislature/Tony-Gonzales-7e086fc4-85ff-58af-a436-5f6fa7bfa527.yml
+++ b/data/us/legislature/Tony-Gonzales-7e086fc4-85ff-58af-a436-5f6fa7bfa527.yml
@@ -1,37 +1,56 @@
 id: ocd-person/7e086fc4-85ff-58af-a436-5f6fa7bfa527
 name: Tony Gonzales
-given_name: Ernest
+given_name: Tony
 family_name: Gonzales
-middle_name: Anthony
-gender: M
 birth_date: 1980-10-10
+gender: Male
+email: https://gonzales.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/G000594.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-23
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-23
 offices:
 - classification: capitol
-  address: 2244 Rayburn House Office Building Washington DC 20515-4323
+  address: 2244 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4511
+  fax: 202-225-2237
+- classification: district
+  address: 10167 Socorro Road, Socorro, TX 79927
+  voice: 915-990-1500
+- classification: district
+  address: 103 W. Callaghan, Fort Stockton, TX 79735
+  voice: 432-299-6200
+- classification: district
+  address: 2401 Garner Field Road Building Q, Uvalde, TX 78801
+  voice: 830-333-7410
+- classification: district
+  address: 4372 N. Loop 1604 West Suite 205, San Antonio, TX 78249
+  voice: 210-806-9920
+  fax: 210-927-4903
+- classification: district
+  address: 712 E. Gibbs St. Suite 101, Del Rio, TX 78840
+  voice: 830-308-6200
 links:
 - url: https://gonzales.house.gov
   note: website
-ids:
-  twitter: RepTonyGonzales
+- url: https://gonzales.house.gov/
 other_names:
+- name: E.A. Gonzales
+- name: Gonzales, T.
 - name: Gonzales, Tony
+- name: T. Gonzales
+ids:
+  twitter: RepTonyGonzales
 other_identifiers:
 - scheme: bioguide
   identifier: G000594
@@ -49,3 +68,11 @@ other_identifiers:
   identifier: Tony Gonzales
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tony_Gonzales
+- url: https://en.wikipedia.org/wiki/Tony_Gonzales
+- url: https://gonzales.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/188225/tony-gonzales
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/ernest_gonzales/456849
+- url: https://www.linkedin.com/in/tony-gonzales-58891696
+- url: https://www.linkedin.com/in/tony-gonzales-a60816143
diff --git a/data/us/legislature/Tracey-Mann-675e8a3b-ea68-55f8-aeb8-be287fe621bd.yml b/data/us/legislature/Tracey-Mann-675e8a3b-ea68-55f8-aeb8-be287fe621bd.yml
index 71d5ebff07..3381ee2a37 100644
--- a/data/us/legislature/Tracey-Mann-675e8a3b-ea68-55f8-aeb8-be287fe621bd.yml
+++ b/data/us/legislature/Tracey-Mann-675e8a3b-ea68-55f8-aeb8-be287fe621bd.yml
@@ -2,32 +2,41 @@ id: ocd-person/675e8a3b-ea68-55f8-aeb8-be287fe621bd
 name: Tracey Mann
 given_name: Tracey
 family_name: Mann
-middle_name: Robert
-gender: M
 birth_date: 1976-12-17
+gender: Male
+email: https://mann.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/M000871.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: KS-1
 offices:
 - classification: capitol
-  address: 344 Cannon House Office Building Washington DC 20515-1601
+  address: 344 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2715
+- classification: district
+  address: 100 Military Ave. Suite 203, Dodge City, KS 67801
+  voice: 620-682-7340
+- classification: district
+  address: 317 Houston St. Suite A, Manhattan, KS 66502
+  voice: 785-370-7277
 links:
 - url: https://mann.house.gov
   note: website
+- url: https://mann.house.gov/
+other_names:
+- name: Mann, T.
+- name: T. Mann
+- name: T.R. Mann
 ids:
   twitter: RepMann
 other_identifiers:
@@ -47,3 +56,9 @@ other_identifiers:
   identifier: kg:/g/11hcbb5b38
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Tracey_Mann
+- url: https://en.wikipedia.org/wiki/Tracey_Mann
+- url: https://justfacts.votesmart.org/candidate/biography/125007/tracey-mann
+- url: https://mann.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/tracey_mann/456823
diff --git a/data/us/legislature/Trent-Kelly-c495bde9-29b3-5e71-ab0e-dedff0de9a84.yml b/data/us/legislature/Trent-Kelly-c495bde9-29b3-5e71-ab0e-dedff0de9a84.yml
index 5824a4c5e0..58d28456ca 100644
--- a/data/us/legislature/Trent-Kelly-c495bde9-29b3-5e71-ab0e-dedff0de9a84.yml
+++ b/data/us/legislature/Trent-Kelly-c495bde9-29b3-5e71-ab0e-dedff0de9a84.yml
@@ -2,77 +2,76 @@ id: ocd-person/c495bde9-29b3-5e71-ab0e-dedff0de9a84
 name: Trent Kelly
 given_name: Trent
 family_name: Kelly
-gender: M
 birth_date: 1966-03-01
+gender: Male
+email: https://trentkelly.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/K000388.jpg
 party:
-- start_date: '2015-06-09'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2015-06-09'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2015-06-09
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MS-1
 offices:
 - classification: capitol
-  address: 2243 Rayburn House Office Building Washington DC 20515-2401
+  address: 2243 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4306
+  fax: 202-225-3549
 - classification: district
-  address: 318 N. 7th St. Suite D; Columbus, MS 39701
-  voice: 662-327-0748
-  fax: 662-328-5982
-  name: 'District Office #1'
+  address: 107 Courthouse Square, Oxford, MS 38655
+  voice: 662-687-1540
 - classification: district
-  address: 4135 County Road 200; Corinth, MS 38844
-  voice: 662-687-1525
-  fax: 662-841-8845
-  name: 'District Office #2'
+  address: 2565 Caffey St., Suite 200 P.O. Box 218, Hernando, MS 38632
+  voice: 662-687-0576
 - classification: district
-  address: 855 S. Dunn St.; Eupora, MS 39744
-  voice: 662-258-7240
-  fax: 662-258-7240
-  name: 'District Office #3'
+  address: 318 N. 7th St., Suite D P.O. Box 1012, Columbus, MS 39703
+  voice: 662-327-0748
 - classification: district
-  address: '2565 Caffey St. #200; Hernando, MS 38632'
-  voice: 662-449-3090
-  fax: 662-449-4836
-  name: 'District Office #4'
+  address: 4135 County Road 200, Corinth, MS 38834
+  voice: 662-687-1525
 - classification: district
-  address: 431 W. Main St.; Tupelo, MS 38804
+  address: 431 W. Main St., Tupelo, MS 38804
   voice: 662-841-8808
   fax: 662-841-8845
-  name: 'District Office #5'
+- classification: district
+  address: 855 S. Dunn St., Eupora, MS 39744
+  voice: 662-687-1545
+  fax: 662-258-7240
 links:
 - url: https://trentkelly.house.gov
   note: website
+- url: https://trentkelly.house.gov/
+other_names:
+- name: J.T. Kelly
+- name: Kelly (MS)
+- name: Kelly, T.
+- name: T. Kelly
 ids:
   twitter: RepTrentKelly
   youtube: UCtDrz-8tdg4ZgOAQHToSWaQ
   facebook: reptrentkelly
-other_names:
-- name: Kelly (MS)
 other_identifiers:
 - scheme: bioguide
   identifier: K000388
@@ -102,3 +101,10 @@ other_identifiers:
   identifier: '21561'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Trent_Kelly
+- url: https://en.wikipedia.org/wiki/Trent_Kelly
+- url: https://justfacts.votesmart.org/candidate/biography/156389/trent-kelly
+- url: https://theunitedstates.io
+- url: https://trentkelly.house.gov
+- url: https://www.govtrack.us/congress/members/trent_kelly/412673
+- url: https://www.linkedin.com/in/trent-kelly-8ba94b4a
diff --git a/data/us/legislature/Troy-A-Carter-5e3dc0b5-2afe-5b83-ab42-9352225b2235.yml b/data/us/legislature/Troy-A-Carter-5e3dc0b5-2afe-5b83-ab42-9352225b2235.yml
index 363379d34e..2381066630 100644
--- a/data/us/legislature/Troy-A-Carter-5e3dc0b5-2afe-5b83-ab42-9352225b2235.yml
+++ b/data/us/legislature/Troy-A-Carter-5e3dc0b5-2afe-5b83-ab42-9352225b2235.yml
@@ -1,37 +1,56 @@
 id: ocd-person/5e3dc0b5-2afe-5b83-ab42-9352225b2235
-name: Troy A. Carter
+name: Troy Carter
 given_name: Troy
 family_name: Carter
-middle_name: Anthony
-gender: M
 birth_date: 1963-10-26
+gender: Male
+email: https://troycarter.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/C001125.jpg
 party:
-- start_date: '2021-05-11'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2021-05-11'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-2
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-05-11
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: LA-2
 offices:
 - classification: capitol
-  address: 442 Cannon House Office Building Washington DC 20515-1802
+  address: 442 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6636
+  fax: 202-225-1988
+- classification: district
+  address: 3401 General DeGaulle Drive Suite 100, New Orleans, LA 70114
+  voice: 504-381-3970
+- classification: district
+  address: 650 Poydras St., Suite 2525, New Orleans, LA 70130
+  voice: 504-288-3777
+- classification: district
+  address: 6803 Press Drive, Suite 166, New Orleans, LA 70126
+- classification: district
+  address: Gretna Courthouse 200 Derbigny St., Suite 3200, Gretna, LA 70053
+  voice: 504-381-3999
+- classification: district
+  address: River Parishes Community College 181 Regala Park Road, Reserve, LA 70084
+- classification: district
+  address: T.H. Harris Hall 801 Harding Blvd., Baton Rouge, LA 70807
 links:
 - url: https://troycarter.house.gov
   note: website
-ids:
-  twitter: RepTroyCarter
+- url: https://troycarter.house.gov/
 other_names:
 - name: Carter (LA)
+- name: Carter, T.
+- name: T. Carter
+- name: T.A. Carter
+- name: Troy A. Carter
+ids:
+  twitter: RepTroyCarter
 other_identifiers:
 - scheme: bioguide
   identifier: C001125
@@ -49,3 +68,11 @@ other_identifiers:
   identifier: Troy Carter
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Troy_Carter
+- url: https://en.wikipedia.org/wiki/Troy_Carter_%28New_Orleans%29
+- url: https://justfacts.votesmart.org/candidate/biography/35462/troy-carter
+- url: https://theunitedstates.io
+- url: https://troycarter.house.gov
+- url: https://troycarter.house.gov/about
+- url: https://www.govtrack.us/congress/members/troy_carter/456860
+- url: https://www.linkedin.com/in/troy-a-carter-579015121
diff --git a/data/us/legislature/Troy-Balderson-7ba189b5-1c2a-5acd-8118-446326a8e02b.yml b/data/us/legislature/Troy-Balderson-7ba189b5-1c2a-5acd-8118-446326a8e02b.yml
index 00451df009..a91f36b4f0 100644
--- a/data/us/legislature/Troy-Balderson-7ba189b5-1c2a-5acd-8118-446326a8e02b.yml
+++ b/data/us/legislature/Troy-Balderson-7ba189b5-1c2a-5acd-8118-446326a8e02b.yml
@@ -2,45 +2,48 @@ id: ocd-person/7ba189b5-1c2a-5acd-8118-446326a8e02b
 name: Troy Balderson
 given_name: Troy
 family_name: Balderson
-gender: M
 birth_date: 1962-01-16
+gender: Male
+email: https://balderson.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/B001306.jpg
 party:
-- start_date: '2018-09-05'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2018-09-05'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-12
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-12
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-12
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2018-09-05
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-12
 offices:
 - classification: capitol
-  address: 2429 Rayburn House Office Building Washington DC 20515-3512
+  address: 2429 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5355
 - classification: district
-  address: 250 E. Wilson Bridge Rd. Suite 100; Worthington, OH 43085
+  address: 12931 Stonecreek Drive, Pickerington, OH 43147
   voice: 614-523-2555
-  name: 'District Office #1'
 links:
 - url: https://balderson.house.gov
   note: website
+- url: https://balderson.house.gov/
+other_names:
+- name: Balderson, T.
+- name: T. Balderson
+- name: W.T. Balderson
 ids:
   twitter: RepBalderson
 other_identifiers:
@@ -66,3 +69,8 @@ other_identifiers:
   identifier: '21759'
 sources:
 - url: https://theunitedstates.io/
+- url: https://balderson.house.gov
+- url: https://ballotpedia.org/Troy_Balderson
+- url: https://en.wikipedia.org/wiki/Troy_Balderson
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/troy_balderson/412747
diff --git a/data/us/legislature/Troy-E-Nehls-ec5c60e6-2666-535c-a95a-ec6ab9e02e3f.yml b/data/us/legislature/Troy-E-Nehls-ec5c60e6-2666-535c-a95a-ec6ab9e02e3f.yml
index 0ae849a0d8..1d42725ea5 100644
--- a/data/us/legislature/Troy-E-Nehls-ec5c60e6-2666-535c-a95a-ec6ab9e02e3f.yml
+++ b/data/us/legislature/Troy-E-Nehls-ec5c60e6-2666-535c-a95a-ec6ab9e02e3f.yml
@@ -1,33 +1,41 @@
 id: ocd-person/ec5c60e6-2666-535c-a95a-ec6ab9e02e3f
-name: Troy E. Nehls
+name: Troy Nehls
 given_name: Troy
 family_name: Nehls
-middle_name: E.
-gender: M
 birth_date: 1968-04-07
+gender: Male
+email: https://nehls.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/N000026.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-22
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-22
 offices:
 - classification: capitol
-  address: 1104 Longworth House Office Building Washington DC 20515-4322
+  address: 1104 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5951
+  fax: 202-225-5241
+- classification: district
+  address: 6510 FM 359 South Suite 200, Fulshear, TX 77441
+  voice: 346-762-6600
 links:
 - url: https://nehls.house.gov
   note: website
+- url: https://nehls.house.gov/
+other_names:
+- name: Nehls, T.
+- name: T. Nehls
+- name: T.E. Nehls
+- name: Troy E. Nehls
 ids:
   twitter: RepTroyNehls
 other_identifiers:
@@ -51,3 +59,11 @@ other_identifiers:
   identifier: Troy Nehls
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Troy_Nehls
+- url: https://en.wikipedia.org/wiki/Troy_Nehls
+- url: https://justfacts.votesmart.org/candidate/biography/188334/troy-nehls
+- url: https://nehls.house.gov
+- url: https://nehlsforcongress.com/about
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/troy_nehls/456848
+- url: https://www.linkedin.com/in/troy-e-nehls-909474116
diff --git a/data/us/legislature/Val-T-Hoyle-8d143b3d-646a-5199-95f5-497e17f386dd.yml b/data/us/legislature/Val-T-Hoyle-8d143b3d-646a-5199-95f5-497e17f386dd.yml
index eff7711204..190fed95b2 100644
--- a/data/us/legislature/Val-T-Hoyle-8d143b3d-646a-5199-95f5-497e17f386dd.yml
+++ b/data/us/legislature/Val-T-Hoyle-8d143b3d-646a-5199-95f5-497e17f386dd.yml
@@ -1,32 +1,38 @@
 id: ocd-person/8d143b3d-646a-5199-95f5-497e17f386dd
-name: Val T. Hoyle
-given_name: Valerie
+name: Val Hoyle
+given_name: Val
 family_name: Hoyle
-middle_name: Anne
-gender: F
 birth_date: 1964-02-14
+gender: Female
+email: https://hoyle.house.gov/contact/email-val
 image: https://theunitedstates.io/images/congress/450x550/H001094.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OR-4
 offices:
 - classification: capitol
-  address: 1620 Longworth House Office Building Washington DC 20515-3704
+  address: 1620 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-6416
+- classification: district
+  address: 940 Willamette St. Suite 520, Eugene, OR 97401
+  voice: 541-465-6732
 links:
 - url: https://hoyle.house.gov
   note: website
-ids:
-  twitter: repvalhoyle
+- url: https://hoyle.house.gov/
 other_names:
 - name: Hoyle (OR)
+- name: Hoyle, V.
+- name: V. Hoyle
+- name: V.A. Hoyle
+- name: Val T. Hoyle
+ids:
+  twitter: repvalhoyle
 other_identifiers:
 - scheme: bioguide
   identifier: H001094
@@ -46,3 +52,11 @@ other_identifiers:
   identifier: Val Hoyle
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Val_Hoyle
+- url: https://en.wikipedia.org/wiki/Val_Hoyle
+- url: https://hoyle.house.gov
+- url: https://justfacts.votesmart.org/candidate/116336/val-hoyle
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/valerie_hoyle/456932
+- url: https://www.linkedin.com/in/val-hoyle-67b427159
+- url: https://www.linkedin.com/in/val-toomey-hoyle-8466466
diff --git a/data/us/legislature/Valerie-P-Foushee-2b138e95-2a83-5c51-a3f4-397017c9210e.yml b/data/us/legislature/Valerie-P-Foushee-2b138e95-2a83-5c51-a3f4-397017c9210e.yml
index 51ab557ccc..1e879053a9 100644
--- a/data/us/legislature/Valerie-P-Foushee-2b138e95-2a83-5c51-a3f4-397017c9210e.yml
+++ b/data/us/legislature/Valerie-P-Foushee-2b138e95-2a83-5c51-a3f4-397017c9210e.yml
@@ -1,28 +1,36 @@
 id: ocd-person/2b138e95-2a83-5c51-a3f4-397017c9210e
-name: Valerie P. Foushee
+name: Valerie Foushee
 given_name: Valerie
 family_name: Foushee
-middle_name: Jean
-gender: F
 birth_date: 1956-05-07
+gender: Female
+email: https://foushee.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000477.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-4
 offices:
 - classification: capitol
-  address: 1716 Longworth House Office Building Washington DC 20515-3304
+  address: 1716 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-1784
+- classification: district
+  address: 2605 Meridian Parkway, Suite 110, Durham, NC 27713
+  voice: 919-967-7924
+  fax: 984-234-7724
 links:
 - url: https://foushee.house.gov
   note: website
+- url: https://foushee.house.gov/
+other_names:
+- name: Foushee, V.
+- name: V. Foushee
+- name: V.P. Foushee
+- name: Valerie P. Foushee
 ids:
   twitter: ValerieFoushee
 other_identifiers:
@@ -42,3 +50,8 @@ other_identifiers:
   identifier: '93091'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Valerie_Foushee
+- url: https://en.wikipedia.org/wiki/Valerie_Foushee
+- url: https://foushee.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/93091/valerie-foushee
+- url: https://theunitedstates.io
diff --git a/data/us/legislature/Vern-Buchanan-1e646f7b-600b-503f-9524-3ae95d00cd2d.yml b/data/us/legislature/Vern-Buchanan-1e646f7b-600b-503f-9524-3ae95d00cd2d.yml
index 81c28b0d24..fd4afd1f81 100644
--- a/data/us/legislature/Vern-Buchanan-1e646f7b-600b-503f-9524-3ae95d00cd2d.yml
+++ b/data/us/legislature/Vern-Buchanan-1e646f7b-600b-503f-9524-3ae95d00cd2d.yml
@@ -2,76 +2,79 @@ id: ocd-person/1e646f7b-600b-503f-9524-3ae95d00cd2d
 name: Vern Buchanan
 given_name: Vern
 family_name: Buchanan
-gender: M
 birth_date: 1951-05-08
+gender: Male
+email: https://buchanan.house.gov/constituent-validation
 image: https://theunitedstates.io/images/congress/450x550/B001260.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-13
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: FL-16
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-13
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: FL-16
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-13
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: FL-16
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-16
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-16
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-16
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-16
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: FL-13
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-16
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: FL-13
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: FL-16
+  district: FL-13
 offices:
 - classification: capitol
-  address: 2110 Rayburn House Office Building Washington DC 20515-0916
+  address: 2110 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5015
+  fax: 202-226-0828
 - classification: district
-  address: 1051 Manatee Ave West Suite 305; Bradenton, FL 34205
-  voice: 941-747-9081
-  fax: 941-748-1564
-  name: 'District Office #1'
+  address: 510 Vonderburg Drive Suite 303, Brandon, FL 33511
+  voice: 813-657-1013
+  fax: 771-200-5798
 - classification: district
-  address: 111 S. Orange Ave. Floor 2R, Suite 202W; Sarasota, FL 34236
+  address: 8433 Enterprise Circle Suite 210, Bradenton, FL 34202
   voice: 941-951-6643
-  fax: 941-951-2972
-  name: 'District Office #2'
+  fax: 771-200-5798
 links:
 - url: https://buchanan.house.gov
   note: website
+- url: https://buchanan.house.gov/
+other_names:
+- name: Buchanan, V.
+- name: V. Buchanan
+- name: V.G. Buchanan
 ids:
   twitter: VernBuchanan
   youtube: UCY4DEy41NxOTdcF8_XAVZvw
@@ -107,3 +110,10 @@ other_identifiers:
   identifier: kg:/m/0gtjsp
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Vern_Buchanan
+- url: https://buchanan.house.gov
+- url: https://en.wikipedia.org/wiki/Vern_Buchanan
+- url: https://justfacts.votesmart.org/candidate/biography/66247/vern-buchanan
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/vern_buchanan/412196
+- url: https://www.linkedin.com/in/vern-buchanan-b3550249
diff --git a/data/us/legislature/Veronica-Escobar-a656d2f5-2e90-535c-91d9-d27ad1150c03.yml b/data/us/legislature/Veronica-Escobar-a656d2f5-2e90-535c-91d9-d27ad1150c03.yml
index 52bb42e31e..3bfe3ee85b 100644
--- a/data/us/legislature/Veronica-Escobar-a656d2f5-2e90-535c-91d9-d27ad1150c03.yml
+++ b/data/us/legislature/Veronica-Escobar-a656d2f5-2e90-535c-91d9-d27ad1150c03.yml
@@ -2,40 +2,43 @@ id: ocd-person/a656d2f5-2e90-535c-91d9-d27ad1150c03
 name: Veronica Escobar
 given_name: Veronica
 family_name: Escobar
-gender: F
 birth_date: 1969-09-15
+gender: Female
+email: https://escobar.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/E000299.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-16
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-16
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-16
 offices:
 - classification: capitol
-  address: 2448 Rayburn House Office Building Washington DC 20515-4316
+  address: 2448 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-4831
 - classification: district
-  address: 221 N Kansas St Suite 1500; El Paso, TX 79901-1443
+  address: Wells Fargo Plaza 221 N. Kansas St., Suite 1500, El Paso, TX 79901
   voice: 915-541-1400
-  name: 'District Office #1'
+  fax: 915-541-1407
 links:
 - url: https://escobar.house.gov
   note: website
+- url: https://escobar.house.gov/
+other_names:
+- name: Escobar, V.
+- name: V. Escobar
 ids:
   twitter: RepEscobar
 other_identifiers:
@@ -61,3 +64,10 @@ other_identifiers:
   identifier: kg:/g/11ghdw9g9p
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Veronica_Escobar
+- url: https://en.wikipedia.org/wiki/Veronica_Escobar
+- url: https://escobar.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/99345/veronica-escobar
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/veronica_escobar/412825
+- url: https://www.linkedin.com/in/veronica-escobar-652b0723
diff --git a/data/us/legislature/Vicente-Gonzalez-8b1ad439-078b-5e79-a845-64236b87f11f.yml b/data/us/legislature/Vicente-Gonzalez-8b1ad439-078b-5e79-a845-64236b87f11f.yml
index 9bf17ac45b..e44daf81ab 100644
--- a/data/us/legislature/Vicente-Gonzalez-8b1ad439-078b-5e79-a845-64236b87f11f.yml
+++ b/data/us/legislature/Vicente-Gonzalez-8b1ad439-078b-5e79-a845-64236b87f11f.yml
@@ -2,67 +2,62 @@ id: ocd-person/8b1ad439-078b-5e79-a845-64236b87f11f
 name: Vicente Gonzalez
 given_name: Vicente
 family_name: Gonzalez
-gender: M
 birth_date: 1967-09-04
+gender: Male
+email: https://gonzalez.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/G000581.jpg
 party:
-- start_date: '2017-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-15
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: TX-34
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-15
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-15
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: TX-34
+  district: TX-15
 offices:
 - classification: capitol
-  address: 154 Cannon House Office Building Washington DC 20515-4334
+  address: 154 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-2531
+  fax: 202-225-5688
 - classification: district
-  address: 131 W. Main St.; Benavides, TX 78341
-  voice: 888-217-0261
-  name: 'District Office #1'
-- classification: district
-  address: 404 S. Mier St.; San Diego, TX 78384
-  voice: 888-217-0261
-  name: 'District Office #2'
-- classification: district
-  address: 217 E. Miller St. Suite 200; Falfurrias, TX 78355
-  voice: 361-209-3027
-  name: 'District Office #3'
+  address: 100 W. King Ave. Suite 106, Kingsville, TX 78363
+  voice: 956-682-5545
+  fax: 956-544-1884
 - classification: district
-  address: 1305 W Hackberry Ave; McAllen, TX 78501-4306
+  address: 255 S. Kansas Ave., Weslaco, TX 78596
   voice: 956-682-5545
-  name: 'District Office #4'
+  fax: 956-544-1884
 - classification: district
-  address: 1243 Cardinal Ln; Seguin, TX 78155-3915
-  voice: 830-358-0497
-  name: 'District Office #5'
+  address: 835 E. Levee St. Sixth Floor, Brownsville, TX 78520
+  voice: 956-682-5545
+  fax: 956-544-1884
 links:
 - url: https://gonzalez.house.gov
   note: website
+- url: https://gonzalez.house.gov/
+other_names:
+- name: Gonzalez, V.
+- name: Gonzalez, Vicente
+- name: V. Gonzalez
 ids:
   twitter: RepGonzalez
   youtube: UC5H6oYLKQ_xIXO5CG7fh4hw
   facebook: USCongressmanVicenteGonzalez
-other_names:
-- name: Gonzalez, Vicente
 other_identifiers:
 - scheme: bioguide
   identifier: G000581
@@ -90,3 +85,9 @@ other_identifiers:
   identifier: Vicente Gonzalez Jr.
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Vicente_Gonz%C3%A1lez
+- url: https://en.wikipedia.org/wiki/Vicente_Gonzalez_(politician)
+- url: https://gonzalez.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/166483/vicente-gonzalez
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/vicente_gonzalez/412725
diff --git a/data/us/legislature/Victoria-Spartz-bdb81964-c3cc-5f48-8854-7b9c88c23755.yml b/data/us/legislature/Victoria-Spartz-bdb81964-c3cc-5f48-8854-7b9c88c23755.yml
index ede4acb91b..1869e17f5d 100644
--- a/data/us/legislature/Victoria-Spartz-bdb81964-c3cc-5f48-8854-7b9c88c23755.yml
+++ b/data/us/legislature/Victoria-Spartz-bdb81964-c3cc-5f48-8854-7b9c88c23755.yml
@@ -2,31 +2,41 @@ id: ocd-person/bdb81964-c3cc-5f48-8854-7b9c88c23755
 name: Victoria Spartz
 given_name: Victoria
 family_name: Spartz
-gender: F
 birth_date: 1978-10-06
+gender: Female
+email: https://spartz.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/S000929.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IN-5
 offices:
 - classification: capitol
-  address: 1609 Longworth House Office Building Washington DC 20515-1405
+  address: 1609 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-2276
+- classification: district
+  address: 420 S. High St., Suite 207, Muncie, IN 47305
+  voice: 765-639-0671
+- classification: district
+  address: 5540 Pebble Village Lane Suite 400, Noblesville, IN 46062
+  voice: 317-848-0201
+  fax: 765-846-7306
 links:
 - url: https://spartz.house.gov
   note: website
+- url: https://spartz.house.gov/
+other_names:
+- name: Spartz, V.
+- name: V. Spartz
 ids:
   twitter: RepSpartz
 other_identifiers:
@@ -48,3 +58,10 @@ other_identifiers:
   identifier: '178203'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Victoria_Spartz
+- url: https://en.wikipedia.org/wiki/Victoria_Spartz
+- url: https://spartz.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/victoria_spartz/456822
+- url: https://www.linkedin.com/in/victoria-spartz-91440a8
+- url: https://www.spartzforcongress.com/about
diff --git a/data/us/legislature/Vince-Fong-2d6b7f7f-a241-5064-9812-9506beb2b76e.yml b/data/us/legislature/Vince-Fong-2d6b7f7f-a241-5064-9812-9506beb2b76e.yml
index 4827d5a33e..abdde0530c 100644
--- a/data/us/legislature/Vince-Fong-2d6b7f7f-a241-5064-9812-9506beb2b76e.yml
+++ b/data/us/legislature/Vince-Fong-2d6b7f7f-a241-5064-9812-9506beb2b76e.yml
@@ -2,26 +2,38 @@ id: ocd-person/2d6b7f7f-a241-5064-9812-9506beb2b76e
 name: Vince Fong
 given_name: Vince
 family_name: Fong
-gender: M
 birth_date: 1979-10-24
+gender: Male
+email: https://fong.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/F000480.jpg
 party:
-- start_date: '2024-06-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2024-06-03'
-  end_date: '2025-01-03'
+- start_date: 2024-06-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-20
 offices:
 - classification: capitol
-  address: 2468 Rayburn House Office Building Washington DC 20515-0520
+  address: 2468 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2915
+  fax: 202-225-2908
+- classification: district
+  address: 2187 Herndon Ave. Suite 101, Clovis, CA 93611
+  voice: 559-701-2530
+- classification: district
+  address: 9700 Stockdale Highway Suite 300, Bakersfield, CA 93311
+  voice: 661-327-3611
+  fax: 661-637-0867
 links:
 - url: https://fong.house.gov
   note: website
+- url: https://fong.house.gov/
+other_names:
+- name: Fong, V.
+- name: V. Fong
+- name: V.K. Fong
 other_identifiers:
 - scheme: bioguide
   identifier: F000480
@@ -37,3 +49,8 @@ other_identifiers:
   identifier: Vince Fong
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Vince_Fong
+- url: https://en.wikipedia.org/wiki/Vince_Fong
+- url: https://fong.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/vincentkfong
diff --git a/data/us/legislature/Virginia-Foxx-b77761e4-93cb-5fbb-972e-5d591198df8f.yml b/data/us/legislature/Virginia-Foxx-b77761e4-93cb-5fbb-972e-5d591198df8f.yml
index 795d18f2bf..a8623ec7f6 100644
--- a/data/us/legislature/Virginia-Foxx-b77761e4-93cb-5fbb-972e-5d591198df8f.yml
+++ b/data/us/legislature/Virginia-Foxx-b77761e4-93cb-5fbb-972e-5d591198df8f.yml
@@ -2,81 +2,84 @@ id: ocd-person/b77761e4-93cb-5fbb-972e-5d591198df8f
 name: Virginia Foxx
 given_name: Virginia
 family_name: Foxx
-gender: F
 birth_date: 1943-06-29
+gender: Female
+email: https://foxx.house.gov/connect/default.aspx
 image: https://theunitedstates.io/images/congress/450x550/F000450.jpg
 party:
-- start_date: '2005-01-04'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-5
 offices:
 - classification: capitol
-  address: 2462 Rayburn House Office Building Washington DC 20515-3305
+  address: 2462 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-2071
+  fax: 202-225-2995
 - classification: district
-  address: 400 Shadowline Dr. Suite 205; Boone, NC 28607
-  voice: 828-265-0240
-  fax: 828-265-0390
-  name: 'District Office #1'
-- classification: district
-  address: 3540 Clemmons Rd. Suite 125; Clemmons, NC 27012
+  address: 3540 Clemmons Road Suite 125, Clemmons, NC 27012
   voice: 336-778-0211
   fax: 336-778-2290
-  name: 'District Office #2'
+- classification: district
+  address: 400 Shadowline Drive Suite 205, Boone, NC 28607
+  voice: 828-265-0240
+  fax: 336-778-2290
 links:
 - url: https://foxx.house.gov
   note: website
+- url: https://foxx.house.gov/
+other_names:
+- name: Foxx, V.
+- name: V. Foxx
+- name: V.A. Foxx
 ids:
   twitter: VirginiaFoxx
   youtube: UCggineJcxJn80TRXxdQbx6w
@@ -112,3 +115,9 @@ other_identifiers:
   identifier: kg:/m/02b5dz
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Virginia_Foxx
+- url: https://en.wikipedia.org/wiki/Virginia_Foxx
+- url: https://foxx.house.gov
+- url: https://justfacts.votesmart.org/candidate/biography/6051/virginia-foxx
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/virginia_foxx/400643
diff --git a/data/us/legislature/W-Gregory-Steube-5fdae4c2-ba21-56a4-ae8c-5e95a175a90a.yml b/data/us/legislature/W-Gregory-Steube-5fdae4c2-ba21-56a4-ae8c-5e95a175a90a.yml
index e2217d8a95..1d8bd438af 100644
--- a/data/us/legislature/W-Gregory-Steube-5fdae4c2-ba21-56a4-ae8c-5e95a175a90a.yml
+++ b/data/us/legislature/W-Gregory-Steube-5fdae4c2-ba21-56a4-ae8c-5e95a175a90a.yml
@@ -1,43 +1,53 @@
 id: ocd-person/5fdae4c2-ba21-56a4-ae8c-5e95a175a90a
-name: W. Gregory Steube
-given_name: W.
+name: Greg Steube
+given_name: Greg
 family_name: Steube
-middle_name: Gregory
-gender: M
 birth_date: 1978-05-19
+gender: Male
+email: https://steube.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/S001214.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-17
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-17
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: FL-17
 offices:
 - classification: capitol
-  address: 2457 Rayburn House Office Building Washington DC 20515-0917
+  address: 2457 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-5792
+  fax: 202-225-3132
 - classification: district
-  address: 226 Taylor St Suite 230; Punta Gorda, FL 33950-4457
-  voice: 941-575-9101
+  address: '226 Taylor St., #230, Punta Gorda, FL 33950'
+  voice: 941-499-3214
   fax: 941-575-9103
-  name: 'District Office #1'
+- classification: district
+  address: 401 W. Venice Ave. Suite 157, Venice, FL 34285
+  voice: 941-499-3214
+- classification: district
+  address: 7590 Fruitville Road Suite 102, Sarasota, FL 34240
+  voice: 941-499-3214
 links:
 - url: https://steube.house.gov
   note: website
+- url: https://steube.house.gov/
+other_names:
+- name: G. Steube
+- name: Steube, G.
+- name: W. Gregory Steube
+- name: W.G. Steube
 ids:
   twitter: RepGregSteube
 other_identifiers:
@@ -63,3 +73,9 @@ other_identifiers:
   identifier: Greg Steube
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Greg_Steube
+- url: https://en.wikipedia.org/wiki/Greg_Steube
+- url: https://justfacts.votesmart.org/candidate/biography/117248/greg-steube
+- url: https://steube.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/gregory_steube/412766
diff --git a/data/us/legislature/Warren-Davidson-1eaeee77-2e74-51b9-a70f-30e16378f080.yml b/data/us/legislature/Warren-Davidson-1eaeee77-2e74-51b9-a70f-30e16378f080.yml
index 51f1bd0f17..4d3829aba3 100644
--- a/data/us/legislature/Warren-Davidson-1eaeee77-2e74-51b9-a70f-30e16378f080.yml
+++ b/data/us/legislature/Warren-Davidson-1eaeee77-2e74-51b9-a70f-30e16378f080.yml
@@ -2,58 +2,56 @@ id: ocd-person/1eaeee77-2e74-51b9-a70f-30e16378f080
 name: Warren Davidson
 given_name: Warren
 family_name: Davidson
-gender: M
 birth_date: 1970-03-01
+gender: Male
+email: https://davidson.house.gov/email
 image: https://theunitedstates.io/images/congress/450x550/D000626.jpg
 party:
-- start_date: '2016-06-09'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2016-06-09'
-  end_date: '2017-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-8
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-8
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-8
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-8
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2016-06-09
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: OH-8
 offices:
 - classification: capitol
-  address: 2113 Rayburn House Office Building Washington DC 20515-3508
+  address: 2113 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6205
 - classification: district
-  address: 76 E. High St. 3rd Floor; Springfield, OH 45502
-  voice: 937-322-1120
-  name: 'District Office #1'
-- classification: district
-  address: 20 Dotcom Drive; Troy, OH 45373
-  voice: 937-339-1524
-  name: 'District Office #2'
+  address: 5520 Harrison Ave. Suite C, Cincinnati, OH 45248
+  voice: 513-779-5400
 - classification: district
-  address: '8857 Cincinnati-Dayton Rd. Suite #102; West Chester, OH 45069'
+  address: 8857 Cincinnati-Dayton Road Suite 102, West Chester, OH 45069
   voice: 513-779-5400
-  name: 'District Office #3'
+  fax: 937-339-1524
 links:
 - url: https://davidson.house.gov
   note: website
+other_names:
+- name: Davidson, W.
+- name: W. Davidson
+- name: W.E. Davidson
 ids:
   twitter: WarrenDavidson
   youtube: UCMzuyZWzk44YRNesFzPTeUw
@@ -87,3 +85,9 @@ other_identifiers:
   identifier: '21564'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Warren_Davidson
+- url: https://davidson.house.gov
+- url: https://en.wikipedia.org/wiki/Warren_Davidson
+- url: https://justfacts.votesmart.org/candidate/biography/166760/warren-davidson
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/gotowd
diff --git a/data/us/legislature/Wesley-Hunt-2cb7c1ce-a9a1-5644-bfb8-14508d2d5f87.yml b/data/us/legislature/Wesley-Hunt-2cb7c1ce-a9a1-5644-bfb8-14508d2d5f87.yml
index 9304e3f296..3e49afd825 100644
--- a/data/us/legislature/Wesley-Hunt-2cb7c1ce-a9a1-5644-bfb8-14508d2d5f87.yml
+++ b/data/us/legislature/Wesley-Hunt-2cb7c1ce-a9a1-5644-bfb8-14508d2d5f87.yml
@@ -2,27 +2,36 @@ id: ocd-person/2cb7c1ce-a9a1-5644-bfb8-14508d2d5f87
 name: Wesley Hunt
 given_name: Wesley
 family_name: Hunt
-middle_name: Parish
-gender: M
 birth_date: 1981-11-13
+gender: Male
+email: https://hunt.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/H001095.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-38
 offices:
 - classification: capitol
-  address: 1520 Longworth House Office Building Washington DC 20515-0001
+  address: 1520 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5646
+- classification: district
+  address: 5599 San Felipe St. Suite 950, Houston, TX 77056
+  voice: 832-357-0555
+- classification: district
+  address: 990 Village Square Drive Suite G-900, Tomball, TX 77375
+  voice: 346-246-7355
 links:
 - url: https://hunt.house.gov
   note: website
+- url: https://hunt.house.gov/
+other_names:
+- name: Hunt, W.
+- name: W. Hunt
+- name: W.P. Hunt
 ids:
   twitter: RepWesleyHunt
 other_identifiers:
@@ -44,3 +53,11 @@ other_identifiers:
   identifier: Wesley Hunt (Texas Congress)
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Wesley_Hunt_(Congressional_candidate,_Texas)
+- url: https://en.wikipedia.org/wiki/Wesley_Hunt
+- url: https://hunt.house.gov
+- url: https://justfacts.votesmart.org/candidate/188147/wesley-hunt
+- url: https://justfacts.votesmart.org/candidate/biography/188147/wesley-hunt
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/wesley_hunt/456946
+- url: https://www.linkedin.com/in/wesley-hunt-33800095
diff --git a/data/us/legislature/Wiley-Nickel-9866e387-b0c1-5f4d-b5da-dbde28ac482a.yml b/data/us/legislature/Wiley-Nickel-9866e387-b0c1-5f4d-b5da-dbde28ac482a.yml
index a46988fcb3..049f972c4a 100644
--- a/data/us/legislature/Wiley-Nickel-9866e387-b0c1-5f4d-b5da-dbde28ac482a.yml
+++ b/data/us/legislature/Wiley-Nickel-9866e387-b0c1-5f4d-b5da-dbde28ac482a.yml
@@ -2,26 +2,33 @@ id: ocd-person/9866e387-b0c1-5f4d-b5da-dbde28ac482a
 name: Wiley Nickel
 given_name: Wiley
 family_name: Nickel
-gender: M
 birth_date: 1975-11-23
+gender: Male
+email: https://nickel.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/N000194.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-02
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NC-13
 offices:
 - classification: capitol
-  address: 1133 Longworth House Office Building Washington DC 20515-3313
+  address: 1133 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4531
+- classification: district
+  address: "1411\xBD Aversboro Road, Garner, NC 27529"
+  voice: 984-275-6150
 links:
 - url: https://nickel.house.gov
   note: website
+- url: https://nickel.house.gov/
+other_names:
+- name: G.W. Nickel
+- name: Nickel, W.
+- name: W. Nickel
 other_identifiers:
 - scheme: bioguide
   identifier: N000194
@@ -41,3 +48,9 @@ other_identifiers:
   identifier: '178326'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Wiley_Nickel
+- url: https://en.wikipedia.org/wiki/Wiley_Nickel
+- url: https://justfacts.votesmart.org/candidate/178326/wiley-nickel-iii
+- url: https://nickel.house.gov
+- url: https://theunitedstates.io
+- url: https://www.linkedin.com/in/wiley-nickel-4a7266
diff --git a/data/us/legislature/William-R-Keating-ec0f62a4-5b85-5df2-888a-200166766b17.yml b/data/us/legislature/William-R-Keating-ec0f62a4-5b85-5df2-888a-200166766b17.yml
index a4b36b30e0..b64a959733 100644
--- a/data/us/legislature/William-R-Keating-ec0f62a4-5b85-5df2-888a-200166766b17.yml
+++ b/data/us/legislature/William-R-Keating-ec0f62a4-5b85-5df2-888a-200166766b17.yml
@@ -1,73 +1,75 @@
 id: ocd-person/ec0f62a4-5b85-5df2-888a-200166766b17
-name: William R. Keating
-given_name: William
+name: Bill Keating
+given_name: Bill
 family_name: Keating
-middle_name: R.
-gender: M
 birth_date: 1952-09-06
+gender: Male
+email: https://keating.house.gov/zip_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/K000375.jpg
 party:
-- start_date: '2011-01-05'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-10
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: MA-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: MA-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: MA-9
+  district: MA-10
 offices:
 - classification: capitol
-  address: 2351 Rayburn House Office Building Washington DC 20515-2109
+  address: 2351 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-3111
+  fax: 202-225-5658
 - classification: district
-  address: 259 Stevens St. Suite E; Hyannis, MA 02601
-  voice: 508-771-6868
-  fax: 508-790-1959
-  name: 'District Office #1'
-- classification: district
-  address: 128 Union Street Suite 103; New Bedford, MA 02740
+  address: 128 Union St. Suite 103, New Bedford, MA 02740
   voice: 508-999-6462
   fax: 508-999-6468
-  name: 'District Office #2'
 - classification: district
-  address: 170 Court St.; Plymouth, MA 02360
+  address: 251 Stevens St. Suite E, Hyannis, MA 02601
+  voice: 508-771-6868
+  fax: 508-790-1959
+- classification: district
+  address: 50 Resnik Road Suite 103, Plymouth, MA 02360
   voice: 508-746-9000
   fax: 508-732-0072
-  name: 'District Office #3'
 links:
 - url: https://keating.house.gov
   note: website
+- url: https://keating.house.gov/
+other_names:
+- name: B. Keating
+- name: Keating, B.
+- name: W.R. Keating
+- name: William R. Keating
 ids:
   twitter: USRepKeating
   youtube: UC7KPV4xdxO2dms9vl6tETmg
@@ -103,3 +105,9 @@ other_identifiers:
   identifier: Bill Keating
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Bill_Keating
+- url: https://en.wikipedia.org/wiki/William_R._Keating
+- url: https://keating.house.gov
+- url: https://keating.house.gov/about/full-biography
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/william_keating/412435
diff --git a/data/us/legislature/William-R-Timmons-IV-678a7e1c-3834-5536-937f-fdb30edca68e.yml b/data/us/legislature/William-R-Timmons-IV-678a7e1c-3834-5536-937f-fdb30edca68e.yml
index e50c229573..9067d587d8 100644
--- a/data/us/legislature/William-R-Timmons-IV-678a7e1c-3834-5536-937f-fdb30edca68e.yml
+++ b/data/us/legislature/William-R-Timmons-IV-678a7e1c-3834-5536-937f-fdb30edca68e.yml
@@ -1,46 +1,45 @@
 id: ocd-person/678a7e1c-3834-5536-937f-fdb30edca68e
-name: William R. Timmons IV
+name: William Timmons
 given_name: William
 family_name: Timmons
-middle_name: R.
-gender: M
 birth_date: 1984-04-30
+gender: Male
+email: https://timmons.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/T000480.jpg
 party:
-- start_date: '2019-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-4
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-4
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: SC-4
 offices:
 - classification: capitol
-  address: 267 Cannon House Office Building Washington DC 20515-4004
+  address: 267 Cannon House Office Building, Washington, DC 20515
   voice: 202-225-6030
 - classification: district
-  address: 104 S Main St Suite 801; Greenville, SC 29601-2711
+  address: 114 Trade St., Greer, SC 29651
   voice: 864-241-0175
-  name: 'District Office #1'
-- classification: district
-  address: 101 W Saint John St Suite 303; Spartanburg, SC 29306-5179
-  voice: 864-583-3264
-  name: 'District Office #2'
 links:
 - url: https://timmons.house.gov
   note: website
+- url: https://timmons.house.gov/
+other_names:
+- name: Timmons, W.
+- name: W. Timmons
+- name: W.R. Timmons
+- name: William R. Timmons IV
 ids:
   twitter: RepTimmons
 other_identifiers:
@@ -66,3 +65,11 @@ other_identifiers:
   identifier: William Timmons
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/William_Timmons
+- url: https://en.wikipedia.org/wiki/William_Timmons
+- url: https://justfacts.votesmart.org/candidate/biography/168923/william-timmons
+- url: https://theunitedstates.io
+- url: https://timmons.house.gov
+- url: https://timmons.house.gov/about
+- url: https://votetimmons.com/about/william-timmons
+- url: https://www.govtrack.us/congress/members/william_timmons/412815
diff --git a/data/us/legislature/Yadira-Caraveo-4e28b856-d0c9-53f7-8dbd-bb9c6b99f145.yml b/data/us/legislature/Yadira-Caraveo-4e28b856-d0c9-53f7-8dbd-bb9c6b99f145.yml
index 1e2f4186ef..126267077b 100644
--- a/data/us/legislature/Yadira-Caraveo-4e28b856-d0c9-53f7-8dbd-bb9c6b99f145.yml
+++ b/data/us/legislature/Yadira-Caraveo-4e28b856-d0c9-53f7-8dbd-bb9c6b99f145.yml
@@ -2,27 +2,39 @@ id: ocd-person/4e28b856-d0c9-53f7-8dbd-bb9c6b99f145
 name: Yadira Caraveo
 given_name: Yadira
 family_name: Caraveo
-middle_name: D.
-gender: F
 birth_date: 1980-12-23
+gender: Female
+email: https://caraveo.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/C001134.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CO-8
 offices:
 - classification: capitol
-  address: 1024 Longworth House Office Building Washington DC 20515-0001
+  address: 1024 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5625
+  fax: 771-200-5726
+- classification: district
+  address: 10701 Melody Drive Suite 500, Northglenn, CO 80234
+  voice: 303-723-6560
+  fax: 771-200-5726
+- classification: district
+  address: 3400 W. 16th St. Building 1S, Suite C, Greeley, CO 80634
+  voice: 970-324-2567
+  fax: 771-200-5726
 links:
 - url: https://caraveo.house.gov
   note: website
+- url: https://caraveo.house.gov/
+other_names:
+- name: Caraveo, Y.
+- name: Y. Caraveo
+- name: Y.D. Caraveo
 ids:
   twitter: RepCaraveoMD
 other_identifiers:
@@ -46,3 +58,11 @@ other_identifiers:
   identifier: '181770'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Yadira_Caraveo
+- url: https://caraveo.house.gov
+- url: https://en.wikipedia.org/wiki/Yadira_Caraveo
+- url: https://justfacts.votesmart.org/candidate/181770/yadira-caraveo
+- url: https://justfacts.votesmart.org/candidate/biography/181770/yadira-caraveo
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/yadira_caraveo/456887
+- url: https://www.linkedin.com/in/yadira-c-112212b0
diff --git a/data/us/legislature/Young-Kim-34a22a9d-abf9-5e79-91f5-e4e08be6d2c9.yml b/data/us/legislature/Young-Kim-34a22a9d-abf9-5e79-91f5-e4e08be6d2c9.yml
index 197206df5b..61bb65a1a3 100644
--- a/data/us/legislature/Young-Kim-34a22a9d-abf9-5e79-91f5-e4e08be6d2c9.yml
+++ b/data/us/legislature/Young-Kim-34a22a9d-abf9-5e79-91f5-e4e08be6d2c9.yml
@@ -2,36 +2,44 @@ id: ocd-person/34a22a9d-abf9-5e79-91f5-e4e08be6d2c9
 name: Young Kim
 given_name: Young
 family_name: Kim
-middle_name: Oak
-gender: F
 birth_date: 1962-10-18
+gender: Female
+email: https://youngkim.house.gov/contact/
 image: https://theunitedstates.io/images/congress/450x550/K000397.jpg
 party:
-- start_date: '2021-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-39
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-40
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-40
+  district: CA-39
 offices:
 - classification: capitol
-  address: 1306 Longworth House Office Building Washington DC 20515-0540
+  address: 1306 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-4111
+- classification: district
+  address: 180 N. Riverview Drive Suite 150, Anaheim, CA 92808
+  voice: 714-984-2440
+- classification: district
+  address: Mission Viejo City Hall 200 Civic Center, Mission Viejo, CA 92691
+  voice: 949-268-6706
 links:
 - url: https://youngkim.house.gov
   note: website
-ids:
-  twitter: RepYoungKim
+- url: https://youngkim.house.gov/
 other_names:
 - name: Kim (CA)
+- name: Kim, Y.
+- name: Y. Kim
+- name: Y.O. Kim
+ids:
+  twitter: RepYoungKim
 other_identifiers:
 - scheme: bioguide
   identifier: K000397
@@ -51,3 +59,10 @@ other_identifiers:
   identifier: '151787'
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Young_Kim_(California)
+- url: https://en.wikipedia.org/wiki/Young_Kim
+- url: https://justfacts.votesmart.org/candidate/151787/young-kim
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/young_kim/456802
+- url: https://www.linkedin.com/in/young-kim-77126a6
+- url: https://youngkim.house.gov
diff --git a/data/us/legislature/Yvette-D-Clarke-969d3e67-5686-5b4c-a8fe-5ec702a7343d.yml b/data/us/legislature/Yvette-D-Clarke-969d3e67-5686-5b4c-a8fe-5ec702a7343d.yml
index eb4c8edf4b..9baef4fba1 100644
--- a/data/us/legislature/Yvette-D-Clarke-969d3e67-5686-5b4c-a8fe-5ec702a7343d.yml
+++ b/data/us/legislature/Yvette-D-Clarke-969d3e67-5686-5b4c-a8fe-5ec702a7343d.yml
@@ -1,79 +1,82 @@
 id: ocd-person/969d3e67-5686-5b4c-a8fe-5ec702a7343d
-name: Yvette D. Clarke
+name: Yvette Clarke
 given_name: Yvette
 family_name: Clarke
-middle_name: D.
-gender: F
 birth_date: 1964-11-21
+gender: Female
+email: https://clarke.house.gov/contact/email/
 image: https://theunitedstates.io/images/congress/450x550/C001067.jpg
 party:
-- start_date: '2007-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-11
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+  district: NY-9
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-11
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+  district: NY-9
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-11
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+  district: NY-9
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-9
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-9
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NY-9
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: NY-11
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: NY-11
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: NY-9
+  district: NY-11
 offices:
 - classification: capitol
-  address: 2058 Rayburn House Office Building Washington DC 20515-3209
+  address: 2058 Rayburn House Office Building, Washington, DC 20515
   voice: 202-225-6231
+  fax: 202-226-0112
 - classification: district
-  address: 222 Lenox Rd. Suites 1 & 2; Brooklyn, NY 11226
+  address: 222 Lenox Road Suite 1 and 2, Brooklyn, NY 11226
   voice: 718-287-1142
   fax: 718-287-1223
-  name: 'District Office #1'
 links:
 - url: https://clarke.house.gov
   note: website
+- url: https://clarke.house.gov/
+other_names:
+- name: Clarke (NY)
+- name: Clarke, Y.
+- name: Y. Clarke
+- name: Y.D. Clarke
+- name: Yvette D. Clarke
 ids:
   twitter: RepYvetteClarke
   youtube: UC8SuQiuL2P9fUHAxuRoTdUQ
   facebook: repyvettedclarke
-other_names:
-- name: Clarke (NY)
 other_identifiers:
 - scheme: bioguide
   identifier: C001067
@@ -105,3 +108,10 @@ other_identifiers:
   identifier: kg:/m/06h90t
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Yvette_Clarke
+- url: https://clarke.house.gov
+- url: https://en.wikipedia.org/wiki/Yvette_Clarke
+- url: https://justfacts.votesmart.org/candidate/44741/yvette-clarke
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/yvette_clarke/412221
+- url: https://www.linkedin.com/in/yvette-clarke-9b3aa810
diff --git a/data/us/legislature/Zachary-Nunn-144ba1b8-981f-58d8-b85d-c38fca7d524c.yml b/data/us/legislature/Zachary-Nunn-144ba1b8-981f-58d8-b85d-c38fca7d524c.yml
index 216599d761..fd10d998b4 100644
--- a/data/us/legislature/Zachary-Nunn-144ba1b8-981f-58d8-b85d-c38fca7d524c.yml
+++ b/data/us/legislature/Zachary-Nunn-144ba1b8-981f-58d8-b85d-c38fca7d524c.yml
@@ -1,32 +1,44 @@
 id: ocd-person/144ba1b8-981f-58d8-b85d-c38fca7d524c
-name: Zachary Nunn
-given_name: Zachary (Zach)
+name: Zach Nunn
+given_name: Zach
 family_name: Nunn
-middle_name: Martin
-gender: M
 birth_date: 1979-05-04
+gender: Male
+email: https://nunn.house.gov/contact
 image: https://theunitedstates.io/images/congress/450x550/N000193.jpg
 party:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
-  name: Republican
+- name: Republican
 roles:
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: IA-3
 offices:
 - classification: capitol
-  address: 1232 Longworth House Office Building Washington DC 20515-1503
+  address: 1232 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-5476
+- classification: district
+  address: 208 W. Taylor St., Creston, IA 50801
+  voice: 641-220-9093
+- classification: district
+  address: 223 E. Main St., Ottumwa, IA 52501
+  voice: 641-220-9641
+- classification: district
+  address: 400 Locust St. Suite 250, Des Moines, IA 50309
+  voice: 515-400-8180
 links:
 - url: https://nunn.house.gov
   note: website
-ids:
-  twitter: ZachNunn
+- url: https://nunn.house.gov/
 other_names:
 - name: Nunn (IA)
+- name: Nunn, Z.
+- name: Z. Nunn
+- name: Z.M. Nunn
+- name: Zachary Nunn
+ids:
+  twitter: ZachNunn
 other_identifiers:
 - scheme: bioguide
   identifier: N000193
@@ -46,3 +58,12 @@ other_identifiers:
   identifier: Zach Nunn
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Zach_Nunn
+- url: https://en.wikipedia.org/wiki/Zach_Nunn
+- url: https://justfacts.votesmart.org/candidate/151170/zach-nunn
+- url: https://justfacts.votesmart.org/candidate/biography/151170/zach-nunn
+- url: https://nunn.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/zachary_zach_nunn/456898
+- url: https://www.linkedin.com/in/zachnunn
+- url: https://zachnunn.com/about
diff --git a/data/us/legislature/Zoe-Lofgren-80764021-2b87-5b48-8999-98943700dea8.yml b/data/us/legislature/Zoe-Lofgren-80764021-2b87-5b48-8999-98943700dea8.yml
index 6bbde6390b..a31d9f333e 100644
--- a/data/us/legislature/Zoe-Lofgren-80764021-2b87-5b48-8999-98943700dea8.yml
+++ b/data/us/legislature/Zoe-Lofgren-80764021-2b87-5b48-8999-98943700dea8.yml
@@ -2,100 +2,106 @@ id: ocd-person/80764021-2b87-5b48-8999-98943700dea8
 name: Zoe Lofgren
 given_name: Zoe
 family_name: Lofgren
-gender: F
 birth_date: 1947-12-21
+gender: Female
+email: https://lofgren.house.gov/address_authentication?form=/contact
 image: https://theunitedstates.io/images/congress/450x550/L000397.jpg
 party:
-- start_date: '1995-01-04'
-  end_date: '2025-01-03'
-  name: Democratic
+- name: Democratic
 roles:
-- start_date: '1995-01-04'
-  end_date: '1997-01-03'
+- start_date: 2023-01-03
+  end_date: 2025-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '1997-01-07'
-  end_date: '1999-01-03'
+  district: CA-18
+- start_date: 2021-01-03
+  end_date: 2023-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '1999-01-06'
-  end_date: '2001-01-03'
+  district: CA-19
+- start_date: 2019-01-03
+  end_date: 2021-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2001-01-03'
-  end_date: '2003-01-03'
+  district: CA-19
+- start_date: 2017-01-03
+  end_date: 2019-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2003-01-07'
-  end_date: '2005-01-03'
+  district: CA-19
+- start_date: 2015-01-06
+  end_date: 2017-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2005-01-04'
-  end_date: '2007-01-03'
+  district: CA-19
+- start_date: 2013-01-03
+  end_date: 2015-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-16
-- start_date: '2007-01-04'
-  end_date: '2009-01-03'
+  district: CA-19
+- start_date: 2011-01-05
+  end_date: 2013-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-16
-- start_date: '2009-01-06'
-  end_date: '2011-01-03'
+- start_date: 2009-01-06
+  end_date: 2011-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-16
-- start_date: '2011-01-05'
-  end_date: '2013-01-03'
+- start_date: 2007-01-04
+  end_date: 2009-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: CA-16
-- start_date: '2013-01-03'
-  end_date: '2015-01-03'
+- start_date: 2005-01-04
+  end_date: 2007-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
-- start_date: '2015-01-06'
-  end_date: '2017-01-03'
+  district: CA-16
+- start_date: 2003-01-07
+  end_date: 2005-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
-- start_date: '2017-01-03'
-  end_date: '2019-01-03'
+  district: CA-16
+- start_date: 2001-01-03
+  end_date: 2003-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
-- start_date: '2019-01-03'
-  end_date: '2021-01-03'
+  district: CA-16
+- start_date: 1999-01-06
+  end_date: 2001-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
-- start_date: '2021-01-03'
-  end_date: '2023-01-03'
+  district: CA-16
+- start_date: 1997-01-07
+  end_date: 1999-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-19
-- start_date: '2023-01-03'
-  end_date: '2025-01-03'
+  district: CA-16
+- start_date: 1995-01-04
+  end_date: 1997-01-03
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
-  district: CA-18
+  district: CA-16
 offices:
 - classification: capitol
-  address: 1401 Longworth House Office Building Washington DC 20515-0518
+  address: 1401 Longworth House Office Building, Washington, DC 20515
   voice: 202-225-3072
 - classification: district
-  address: 635 N. First St. Suite B; San Jose, CA 95112
+  address: 142 W. Alisal St. Room E116, Salinas, CA 93901
+  voice: 831-837-6000
+- classification: district
+  address: 635 N. 1st St. Suite B, San Jose, CA 95112
   voice: 408-271-8700
-  name: 'District Office #1'
 links:
 - url: https://lofgren.house.gov
   note: website
+- url: https://lofgren.house.gov/
+other_names:
+- name: Lofgren, Z.
+- name: S.E. Lofgren
+- name: Z. Lofgren
 ids:
   twitter: RepZoeLofgren
   youtube: UCOaQ79adORFcaTuJZoIFuZQ
@@ -131,3 +137,9 @@ other_identifiers:
   identifier: kg:/m/024t94
 sources:
 - url: https://theunitedstates.io/
+- url: https://ballotpedia.org/Zoe_Lofgren
+- url: https://en.wikipedia.org/wiki/Zoe_Lofgren
+- url: https://justfacts.votesmart.org/candidate/21899/zoe-lofgren
+- url: https://lofgren.house.gov
+- url: https://theunitedstates.io
+- url: https://www.govtrack.us/congress/members/zoe_lofgren/400245
diff --git a/data/us/legislature/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml b/data/us/retired/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml
similarity index 82%
rename from data/us/legislature/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml
rename to data/us/retired/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml
index 34c23d83ad..7919884a7f 100644
--- a/data/us/legislature/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml
+++ b/data/us/retired/Bill-Pascrell-Jr-bff03292-2b2c-55fc-aa20-83dce2fccd77.yml
@@ -81,27 +81,7 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-9
-offices:
-- classification: capitol
-  address: 2409 Rayburn House Office Building Washington DC 20515-3009
-  voice: 202-225-5751
-- classification: district
-  address: 2-10 N. Van Brunt St.; Englewood, NJ 07631
-  voice: 201-935-2248
-  name: 'District Office #1'
-- classification: district
-  address: 367 Valley Brook Ave.; Lyndhurst, NJ 07071
-  voice: 201-935-2248
-  name: 'District Office #2'
-- classification: district
-  address: 330 Passaic St.; Passaic, NJ 07055
-  voice: 973-472-4510
-  name: 'District Office #3'
-- classification: district
-  address: 200 Federal Plz. Suite 500; Paterson, NJ 07505
-  voice: 973-523-5152
-  fax: 973-523-0637
-  name: 'District Office #4'
+offices: []
 links:
 - url: https://pascrell.house.gov
   note: website
diff --git a/data/us/legislature/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml b/data/us/retired/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml
similarity index 78%
rename from data/us/legislature/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml
rename to data/us/retired/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml
index 1e3ad6ce1c..8ce029821f 100644
--- a/data/us/legislature/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml
+++ b/data/us/retired/Donald-M-Payne-Jr-fa65b2cc-a6a5-56fa-8c78-5bc2ecdd93e6.yml
@@ -46,25 +46,7 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: NJ-10
-offices:
-- classification: capitol
-  address: 106 Cannon House Office Building Washington DC 20515-3010
-  voice: 202-225-3436
-- classification: district
-  address: 1455 Liberty Ave.; Hillside, NJ 07205
-  voice: 862-229-2994
-  fax: 862-225-2941
-  name: 'District Office #1'
-- classification: district
-  address: 253 Martin Luther King Dr.; Jersey City, NJ 07305
-  voice: 201-369-0392
-  fax: 201-369-0395
-  name: 'District Office #2'
-- classification: district
-  address: 60 Nelson Pl. 14th Floor; Newark, NJ 07102
-  voice: 973-645-3213
-  fax: 973-645-5902
-  name: 'District Office #3'
+offices: []
 links:
 - url: https://payne.house.gov
   note: website
diff --git a/data/us/legislature/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml b/data/us/retired/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml
similarity index 85%
rename from data/us/legislature/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml
rename to data/us/retired/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml
index 676e0d72d3..73cdcc871c 100644
--- a/data/us/legislature/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml
+++ b/data/us/retired/Mike-Gallagher-0f9b050b-b8cf-56d9-bc31-edfcdd3c2fe5.yml
@@ -30,14 +30,7 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: WI-8
-offices:
-- classification: capitol
-  address: 1211 Longworth House Office Building Washington DC 20515-4908
-  voice: 202-225-5665
-- classification: district
-  address: 1702 Scheuring Rd B; De Pere, WI 54115-9567
-  voice: 920-301-4500
-  name: 'District Office #1'
+offices: []
 links:
 - url: https://gallagher.house.gov
   note: website
diff --git a/data/us/legislature/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml b/data/us/retired/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml
similarity index 82%
rename from data/us/legislature/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml
rename to data/us/retired/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml
index 0c467ac0c6..89476b5df7 100644
--- a/data/us/legislature/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml
+++ b/data/us/retired/Sheila-Jackson-Lee-99710435-8a59-5f14-9acd-da267980551c.yml
@@ -85,27 +85,7 @@ roles:
   type: lower
   jurisdiction: ocd-jurisdiction/country:us/government
   district: TX-18
-offices:
-- classification: capitol
-  address: 2314 Rayburn House Office Building Washington DC 20515-4318
-  voice: 202-225-3816
-- classification: district
-  address: 4300 Lyons Ave.; Houston, TX 77020
-  voice: 713-227-7740
-  name: 'District Office #1'
-- classification: district
-  address: 1919 Smith St. Suite 1180; Houston, TX 77002
-  voice: 713-655-0050
-  fax: 713-655-1612
-  name: 'District Office #2'
-- classification: district
-  address: 6719 W Montgomery Rd Suite 204; Houston, TX 77091-3105
-  voice: 713-691-4882
-  name: 'District Office #3'
-- classification: district
-  address: 420 W 19th St; Houston, TX 77008-3914
-  voice: 713-861-4070
-  name: 'District Office #4'
+offices: []
 links:
 - url: https://jacksonlee.house.gov
   note: website