diff --git a/Data/Abbr/ICAO_airport_codes.csv b/Data/Abbr/ICAO_airport_codes.csv
index 5abd87cd..9965a961 100644
--- a/Data/Abbr/ICAO_airport_codes.csv
+++ b/Data/Abbr/ICAO_airport_codes.csv
@@ -36281,7 +36281,7 @@ KLLR,Little River Airport (USA)
 KLLU,Lamar Municipal Airport (USA)
 KLMO,Vance Brand Airport (USA)
 KLMS,Louisville Winston County Airport (USA)
-KLMT,Crater Lake-Klamath Regional Airport (USA)
+KLMT,"Crater Lake-Klamath Regional Airport (Oregon, USA)"
 KLNA,Palm Beach County Park Airport (USA)
 KLNC,Lancaster Airport (USA)
 KLND,Hunt Field (USA)
diff --git a/Data/Abbr/general.csv b/Data/Abbr/general.csv
index 3c2c98f9..6719d96c 100644
--- a/Data/Abbr/general.csv
+++ b/Data/Abbr/general.csv
@@ -786,7 +786,7 @@ CHRS,Canadian Heart Rhythm Society
 CHT,Certified Hand Therapist
 CI,"Chile (FIPS 10-4 country code),Côte d'Ivoire (ISO 3166 digram),Counter-Intelligence,101 (in Roman numerals)"
 Ci,Curie
-CIA,"Cairo International Airport,Central Intelligence Agency,Culinary Institute of America"
+CIA,"U.S. Central Intelligence Agency, Cairo International Airport, Culinary Institute of America"
 CIAO,"Critical Infrastructure Assurance Office,Component-Integrated ACE ORB"
 CIB,Complete In Box (Internet auction/trading listings)
 CIBC,Canadian Imperial Bank of Commerce
diff --git a/Data/Abbr/organizations.csv b/Data/Abbr/organizations.csv
index bbb404d1..8b12cdea 100644
--- a/Data/Abbr/organizations.csv
+++ b/Data/Abbr/organizations.csv
@@ -15,7 +15,6 @@ BMW, Bavarian Motor Works
 BND,Bundesnachrichtendienst (Germany)
 BVD, Bradley, Voorhees, and Day
 CERN,European Organization for Nuclear Research
-CIA,U.S. Central Intelligence Agency
 DHS,U.S. Department of Homeland
 DOC,U.S. Department of Commerce
 DOD,U.S. Department of Defense
@@ -52,9 +51,9 @@ NASA,National Aeronautics and Space Administration
 NATO,North Atlantic Treaty Organization
 NBC,National Broadcasting Company
 NIST,U.S. National Institute of Standards and Technology
+NIWA,National Institute of Water and Atmospheric Research Limited
 NHTSA,U.S. National Highway Traffic Safety Administration
 NORAD,North American Aerospace Defense Command (formerly North American Air Defense Command)
-NSA,U.S. National Security Agency
 NYPD,New York Police Department
 OECD,Organization for Economic Cooperation & Development
 SAARC,South Asian Association for Regional Cooperation