epstein-files 1.2.1__py3-none-any.whl → 1.2.5__py3-none-any.whl

epstein_files/util/highlighted_group.py

@@ -1,5 +1,6 @@
 import json
 import re
+from collections import defaultdict
 from dataclasses import dataclass, field
 
 from rich.console import Console
@@ -11,8 +12,8 @@ from epstein_files.util.constant.strings import *
 from epstein_files.util.constant.urls import ARCHIVE_LINK_COLOR
 from epstein_files.util.constants import (EMAILER_ID_REGEXES, EPSTEIN_V_ROTHSTEIN_EDWARDS,
      OSBORNE_LLP, REPLY_REGEX, SENT_FROM_REGEX)
+from epstein_files.util.data import sort_dict, without_falsey
 from epstein_files.util.doc_cfg import *
-from epstein_files.util.data import without_falsey
 from epstein_files.util.env import args
 from epstein_files.util.logging import logger
 
@@ -153,7 +154,7 @@ class HighlightedNames(HighlightedText):
             name_patterns = [remove_question_marks(name).replace(' ', r"\s+")]
 
         if ' ' in name:
-            for partial_name in [extract_first_name(name), extract_last_name(name), reversed_name(name)]:
+            for partial_name in [reversed_name(name), extract_first_name(name), extract_last_name(name)]:  # Order matters
                 if partial_name.lower() not in NAMES_TO_NOT_HIGHLIGHT and SIMPLE_NAME_REGEX.match(partial_name):
                     name_patterns.append(partial_name.replace(' ', r"\s+"))
 
@@ -239,11 +240,14 @@ HIGHLIGHTED_NAMES = [
             'Valeria Chomsky': f"wife of {NOAM_CHOMSKY}",
         },
         patterns=[
+            r"Andy\s*Lippman",  # Media Lab
+            r"Arizona\s*State\s*University",
             r"Bard\s+((Early )?College|High School|Schools)",
             r"Brotherton",
             r"Carl\s*Sagan",
             r"Columbia",
             r"Dan(iel|ny) Kahneman",
+            r"(Francis\s*)?Crick",
             r"J(ames|im)\s*Watson",
             r"(Lord\s*)?Martin\s*Rees",
             r"Massachusetts\s*Institute\s*of\s*Technology",
@@ -256,10 +260,13 @@ HIGHLIGHTED_NAMES = [
             r"Princeton(\s*University)?",
             r"Regeneron",
             r"(Richard\s*)?Dawkins",
+            r"(Sandy\s*)?Pentland",  # Media Lab
             r"Sanofi",
             r"Stanford(\s*University)?(\s*Hospital)?",
             r"(Stephen\s*)?Hawking",
             r"(Steven?\s*)?Pinker",
+            r"Texas\s*A&M",
+            r"Tulane",
             r"UCLA",
         ],
     ),
@@ -276,19 +283,23 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"Buhari",
             r"Econet(\s*Wireless)",
+            r"Ethiopian?",
             r"Ghana(ian)?",
             r"Glencore",
             r"Goodluck Jonathan",
             r"Johannesburg",
-            r"Kenya",
+            r"Kenyan?",
             r"Nigerian?",
             r"Okey Enelamah",
+            r"(Paul\s*)?Kagame",
+            r"Rwandan?",
             r"Senegal(ese)?",
             r"Serengeti",
             r"(South\s*)?African?",
             r"(Strive\s*)?Masiyiwa",
-            r"Tanzania",
+            r"Tanzanian?",
             r"Ugandan?",
+            r"(Yoweri\s*)?Museveni",
             r"Zimbabwe(an)?",
         ],
     ),
@@ -300,6 +311,7 @@ HIGHLIGHTED_NAMES = [
             'Barry Josephson': 'American film producer, editor FamilySecurityMatters.org',
             BILL_SIEGEL: 'documentary film producer and director',
             DAVID_BLAINE: 'famous magician',
+            'David Brenner': 'American comedian and actor',
             'Richard Merkin': 'painter, illustrator and arts educator',
             STEVEN_PFEIFFER: 'Associate Director at Independent Filmmaker Project (IFP)',
             'Steven Gaydos': 'American screenwriter and journalist',
@@ -312,6 +324,9 @@ HIGHLIGHTED_NAMES = [
             r"Errol(\s*Morris)?",
             r"Etienne Binant",
             r"(Frank\s)?Gehry",
+            r"Harvey\s*Weinstein", r"wientstein", r"Weinstein\s*Co(s?|mpany)",
+            r"IFP",
+            r"Independent\s*Filmmaker\s*Project",
             r"Jagger",
             r"(Jeffrey\s*)?Katzenberg",
             r"(Johnny\s*)?Depp",
@@ -320,6 +335,8 @@ HIGHLIGHTED_NAMES = [
             r"Lena\s*Dunham",
             r"Madonna",
             r"Mark\s*Burnett",
+            r"New York Film Festival",
+            r"Peter Getzels",
             r"Phaidon",
             r"Ramsey Elkholy",
             r"Regan arts",
@@ -340,6 +357,7 @@ HIGHLIGHTED_NAMES = [
             r"BG",
             r"b?g?C3",
             r"(Bill\s*((and|or|&)\s*Melinda\s*)?)?Gates(\s*Foundation)?",
+            r"Kofi\s*Rashid",
             r"Melinda(\s*Gates)?",
             r"Microsoft",
             r"MSFT",
@@ -358,23 +376,27 @@ HIGHLIGHTED_NAMES = [
             r"Balaji",
             r"bitcoin(\s*Foundation)?",
             r"block ?chain(\s*capital)?",
+            r"Brian Forde",
             r"Brock(\s*Pierce)?",
             r"coins?",
+            r"Cory\s*Fields",  # bitcoin dev
             r"cr[iy]?pto(currenc(y|ies))?",
             r"Digital\s*Currenc(ies|y)(\s*Initiative)?",
             r"e-currency",
-            r"(Gavin )?Andress?en",
+            r"(Gavin )?Andress?en",  # bitcoin dev
             r"(Howard\s+)?Lutnic?k",
+            r"(Jim\s*)Pallotta",  # Media lab advisory board
             r"Libra",
             r"Madars",
             r"Mi(chael|ke)\s*Novogratz",
             r"(Patrick\s*)?Murck",
+            r"Ron Rivest",
             r"(Ross\s*)?Ulbricht",
             r"Silk\s*Road",
             r"SpanCash",
             r"Tether",
             r"virtual\s*currenc(ies|y)",
-            r"Wladimir( van der Laan)?",
+            r"Wladimir( van der Laan)?",  # bitcoin dev
             r"(zero\s+knowledge\s+|zk)pro(of|tocols?)",
         ],
     ),
@@ -385,11 +407,9 @@ HIGHLIGHTED_NAMES = [
             ALIREZA_ITTIHADIEH: 'CEO Freestream Aircraft Limited',
             BARBRO_C_EHNBOM: 'Swedish pharmaceuticals, SALSS',
             BARRY_J_COHEN: None,
-            'David Mitchell': 'Mitchell Holdings New York real estate developer',
-            FRED_HADDAD: "co-founder of Heck's in West Virginia",
+            'David Mitchell': 'Mitchell Holdings, New York real estate developer',
             GERALD_BARTON: "Maryland property developer Landmark Land Company",
             GORDON_GETTY: 'heir to oil tycoon J. Paul Getty',
-            NICHOLAS_RIBIS: 'Hilton CEO, former president of Trump Organization',
             'Philip Kafka': 'president of Prince Concepts (and son of Terry Kafka?)',
             ROBERT_LAWRENCE_KUHN: 'investment banker, China expert',
             TERRY_KAFKA: 'CEO of Impact Outdoor (highway billboards)',
@@ -398,7 +418,7 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"((Bill|David)\s*)?Koch(\s*(Bro(s|thers)|Industries))?",
             r"Gruterite",
-            r"(John\s*)?Kluge",
+            r"((John|Patricia)\s*)?Kluge",
             r"Marc Rich",
             r"(Mi(chael|ke)\s*)?Ovitz",
             r"(Steve\s+)?Wynn",
@@ -407,6 +427,7 @@ HIGHLIGHTED_NAMES = [
             r"Park Partners",
             r"SALSS",
             r"Swedish[-\s]*American\s*Life\s*Science\s*Summit",
+            r"Trilateral Commission",
             r"Valhi",
             r"(Yves\s*)?Bouvier",
         ],
@@ -418,6 +439,7 @@ HIGHLIGHTED_NAMES = [
             r"CBD",
             r"cannabis",
             r"marijuana",
+            r"psychedelic",
             r"THC",
             r"WEED(guide|maps)?[^s]?",
         ],
@@ -474,6 +496,7 @@ HIGHLIGHTED_NAMES = [
             r"(Barac?k )?Obama",
             r"((Bill|Hillart?y)\s*)?Clinton",
             r"((Chuck|Charles)\s*)?S(ch|hc)umer",
+            r"Debbie\s*Wasserman\s*Schultz",
             r"Dem(ocrat(ic)?)?",
             r"(Diana\s*)?DeGette",
             r"DNC",
@@ -491,6 +514,7 @@ HIGHLIGHTED_NAMES = [
             r"(Matteo\s*)?Salvini",
             r"Maxine\s*Waters",
             r"(Nancy )?Pelosi",
+            r"Open Society( Global Board)?",
             r"Ron\s*Dellums",
             r"Schumer",
             r"(Tim(othy)?\s*)?Geithner",
@@ -506,16 +530,19 @@ HIGHLIGHTED_NAMES = [
             EVA: "possibly Epstein's ex-girlfriend (?)",
             'Eva Dubin': f"Epstein's ex-girlfriend now married to {GLENN_DUBIN}",
         },
-        patterns=[r"((Celina|Eva( Anderss?on)?|Glenn) )?Dubin"],
+        patterns=[r"((Celina|Eva( Anderss?on)?|Glenn?) )?Dubin"],
     ),
     HighlightedNames(
         label='employee',
         style='medium_purple4',
         emailers={
             'Alfredo Rodriguez': "Epstein's butler, stole the journal",
-            ERIC_ROTH: 'jet decorator',
+            'Bernard Kruger': "Epstein's doctor",
+            EDUARDO_ROBLES: f'home builder at Creative Kingdom Dubai',
+            ERIC_ROTH: 'jet decorator at International Jet',
             GWENDOLYN_BECK: 'Epstein fund manager in the 90s',
             JANUSZ_BANASIAK: "Epstein's house manager",
+            "John Allessi": "Epstein's houseman",
             JEAN_HUGUEN: 'interior design at Alberto Pinto Cabinet',
             LAWRANCE_VISOSKI: "Epstein's pilot",
             LESLEY_GROFF: f"Epstein's assistant",
@@ -523,7 +550,7 @@ HIGHLIGHTED_NAMES = [
             MERWIN_DELA_CRUZ: None,  # HOUSE_OVERSIGHT_032652 Groff says "Jojo and Merwin both requested off Nov. 25 and 26"
             NADIA_MARCINKO: "Epstein's pilot",
             'Sean J. Lancaster': 'airplane reseller',
-            ZUBAIR_KHAN: 'cybersecurity firm Tranchulas CEO, InsightsPod founder, Islamabad / Dubai',
+            ZUBAIR_KHAN: 'Tranchulas cybersecurity, InsightsPod founder, Islamabad / Dubai',
         },
         patterns=[
             r"Adriana\s*Ross",
@@ -539,7 +566,7 @@ HIGHLIGHTED_NAMES = [
             MARK_EPSTEIN: 'brother of Jeffrey',
         },
         patterns=[
-            r"JEGE",
+            r"JEGE(\s*Inc)",
             r"LSJ",
         ],
     ),
@@ -556,7 +583,9 @@ HIGHLIGHTED_NAMES = [
             DAVID_SCHOEN: f"{CRIMINAL_DEFENSE_ATTORNEY} after 2019 arrest",
             DEBBIE_FEIN: EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY,
             'Erika Kellerhals': 'attorney in St. Thomas',
+            FRED_HADDAD: "co-founder of Heck's in West Virginia",
             GERALD_LEFCOURT: f'friend of {ALAN_DERSHOWITZ}',
+            'Howard Rubenstein': f"Epstein's former spokesman",
             JACK_GOLDBERGER: CRIMINAL_DEFENSE_2008,
             JACKIE_PERCZEK: CRIMINAL_DEFENSE_2008,
             JAY_LEFKOWITZ: f"Kirkland & Ellis partner, {CRIMINAL_DEFENSE_2008}",
@@ -599,7 +628,7 @@ HIGHLIGHTED_NAMES = [
         emailers={
             ANDRZEJ_DUDA: 'former president of Poland',
             'Caroline Lang': 'daughter of Jack Lang',
-            "Edward Rod Larsen": f"son of {TERJE_ROD_LARSEN}",
+            EDWARD_ROD_LARSEN: f"son of {TERJE_ROD_LARSEN}",
             'Fabrice Aidan': f'diplomat who worked with {TERJE_ROD_LARSEN}',
             'Jack Lang': 'former French Minister of National Education',
             MIROSLAV_LAJCAK: 'Russia-friendly Slovakian politician, friend of Steve Bannon',
@@ -608,6 +637,7 @@ HIGHLIGHTED_NAMES = [
             THORBJORN_JAGLAND: 'former prime minister of Norway, Nobel Peace Prize Committee',
         },
         patterns=[
+            r"AfD",
             r"(Angela )?Merk(el|le)",
             r"Austria",
             r"(Benjamin\s*)?Harnwell",
@@ -647,6 +677,7 @@ HIGHLIGHTED_NAMES = [
             r"Paris",
             r"Polish",
             r"pope",
+            r"Scotland",
             r"(Sebastian )?Kurz",
             r"Stockholm",
             r"Strasbourg",
@@ -656,6 +687,7 @@ HIGHLIGHTED_NAMES = [
             r"(Tony\s)?Blair",
             r"U\.K\.",
             r"Ukrain(e|ian)",
+            r"Venice",
             r"(Vi(c|k)tor\s+)?Orbah?n",
             r"Vienna",
             r"Zug",
@@ -684,8 +716,11 @@ HIGHLIGHTED_NAMES = [
             'Skip Rimer': 'Milken Institute (Michael Milken)',
             'Steven Elkman': DEUTSCHE_BANK,
             'Vahe Stepanian': 'Cetera Financial Group',
+            VINIT_SAHNI: f"analyst at {DEUTSCHE_BANK} and {GOLDMAN_SACHS}",
         },
         patterns=[
+            r"Ace\s*Greenberg",
+            r"AIG",
             r"((anti.?)?money\s+)?launder(s?|ers?|ing)?(\s+money)?",
             r"Apollo",
             r"Ari\s*Glass",
@@ -705,8 +740,11 @@ HIGHLIGHTED_NAMES = [
             r"FRBNY",
             r"Goldman(\s*Sachs)",
             r"GRAT",
+            r"Gratitude (America|& Enhanced)",  # Leon Black and/or Epstein charity?
+            r"Hank\s*Greenburg",
             r"HSBC",
             r"Invesco",
+            r"Jamie\s*D(imon)?",
             r"(Janet\s*)?Yellen",
             r"(Jerome\s*)?Powell(?! M\. Cabot)",
             r"(Jimmy\s*)?Cayne",
@@ -715,17 +753,18 @@ HIGHLIGHTED_NAMES = [
             r"Madoff",
             r"Merrill(\s*Lynch)?",
             r"(Michael\s*)?Cembalest",
-            r"(Mi(chael|ke)\s*)?Milken(\s*Conference)?",
+            r"(Mi(chael|ke)\s*)?Milken(\s*Conference|Institute)?",
             r"Mizrahi\s*Bank",
             r"MLPF&S",
             r"Morgan Stanley",
             r"(Peter L. )?Scher",
             r"(Ray\s*)?Dalio",
             r"(Richard\s*)?LeFrak",
-            r"Schwartz?man",
+            r"(Ste(phen|ve)\s*)?Schwart?z?man",
             r"Serageldin",
             r"UBS",
             r"us.gio@jpmorgan.com",
+            r"Wall\s*Street(?!\s*Jour)",
         ],
     ),
     HighlightedNames(
@@ -746,6 +785,82 @@ HIGHLIGHTED_NAMES = [
             r"Thomas\s*(J\.?\s*)?Barrack(\s*Jr)?",
         ],
     ),
+    HighlightedNames(
+        label='government',
+        style='color(24) bold',
+        emailers={
+            ANN_MARIE_VILLAFANA: 'Southern District of Florida (SDFL) U.S. Attorney',
+            DANNY_FROST: 'Director of Communications at Manhattan D.A.',
+            'Police Code Enforcement': f"{PALM_BEACH} buildings code enforcement",
+        },
+        patterns=[
+            r"AG",
+            r"(Alicia\s*)?Valle",
+            r'Alice\s*Fisher|Fisher, Alice',
+            r"AML",
+            r"(Andrew\s*)?(McCabe|Natsios)",
+            r"Attorney General",
+            r"((Bob|Robert)\s*)?Mueller",
+            r"(Byung\s)?Pak",
+            r"Case 1:19-cv-03377(-LAP)?",
+            r"(CENT|NORTH|SOUTH)COM",
+            r"CFTC?",
+            r"CIA",
+            r"CIS",
+            r"CVRA",
+            r"DARPA",
+            r"Dep(artmen)?t\.?\s*of\s*(the\s*)?(Justice|Treasury)",
+            r"DHS",
+            r"DOJ",
+            r"FBI",
+            r"FCPA",
+            r"FDIC",
+            r"FDLE",
+            r"Federal\s*Bureau\s*of\s*Investigation",
+            r"FinCEN",
+            r"FINRA",
+            r"FOIA",
+            r"FTC",
+            r"(General\s*)?P(a|e)traeus",
+            r"Geoff\s*Ling",
+            r"IRS",
+            r"(James\s*)?Comey",
+            r"(Jennifer\s*Shasky\s*)?Calvery",
+            r"((Judge|Mark)\s*)?(Carney|Filip)",
+            r"(Judge\s*)?(Kenneth\s*)?(A\.?\s*)?Marra",
+            r"(Justice|Treasury)\s*Dep(t|artment)",
+            r"(Kirk )?Blouin",
+            r"KYC",
+            r"(Lann?a\s*)?Belohlavek",
+            r"NIH",
+            r"NPA",
+            r"NS(A|C)",
+            r"OCC",
+            r"OFAC",
+            r"(Michael\s*)?Reiter",
+            r"OGE",
+            r"Office\s*of\s*Government\s*Ethics",
+            r"police",
+            r"(Preet\s*)?Bharara",
+            r"SCOTUS",
+            r"SD(FL|NY)",
+            r"SEC",
+            r"Secret\s*Service",
+            r"Securities\s*and\s*Exchange\s*Commission",
+            r"Southern\s*District(\s*of\s*(Florida|New\s*York))?",
+            r"State\s*Dep(artmen)?t",
+            r"Strzok",
+            r"Supreme\s*Court",
+            r"Treasury\s*(Dep(artmen)?t|Secretary)",
+            r"TSA",
+            r"U\.?S\.? attorney",
+            r"USAID",
+            r"US\s*(AF|Army|Air\s*Force)",
+            r"Walter\s*Reed(\s*Army\s*Institute\s*of\s*Research)?",
+            r"(William\s*J\.?\s*)?Zloch",
+            r"WRAIR",
+        ],
+    ),
     HighlightedNames(
         label=HARVARD,
         style='light_goldenrod3',
@@ -773,8 +888,7 @@ HIGHLIGHTED_NAMES = [
         label='India',
         style='bright_green',
         emailers={
-            ANIL_AMBANI: 'chairman of Reliance Group',
-            VINIT_SAHNI: None,
+            ANIL_AMBANI: 'billionaire chairman of Reliance Group',
         },
         patterns=[
             r"Abraaj",
@@ -797,16 +911,18 @@ HIGHLIGHTED_NAMES = [
         emailers={
             EHUD_BARAK: 'former prime minister of Israel, Epstein business partner',
             'Mitchell Bard': 'director of the American-Israeli Cooperative Enterprise (AICE)',
-            'Nili Priell Barak': 'wife of Ehud Barak',
+            NILI_PRIELL_BARAK: 'wife of Ehud Barak',
         },
         patterns=[
             r"AIPAC",
             r"Bibi",
             r"(eh|(Ehud|Nili Priell)\s*)?barak",
+            r"EB",
             r"Ehud\s*Barack",
             r"Israeli?",
             r"Jerusalem",
             r"J\s*Street",
+            r"Menachem\s*Begin",
             r"Mossad",
             r"Netanyahu",
             r"(Sheldon\s*)?Adelson",
@@ -849,14 +965,18 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"ABC(\s*News)?",
+            r"Alexandra Wolfe|Wolfe, Alexandra",
+            r"AlterNet",
             r"Arianna(\s*Huffington)?",
             r"(Arthur\s*)?Kretchmer",
             r'Associated\s*Press',
             r"Axios",
             r"BBC",
+            r"(Bob|Robert)\s*Costa",
             r"Breitbart",
-            r"BuzzFeed",
-            r"CBS(\s*(4|Corp|News))?"
+            r"BuzzFeed(\s*News)?",
+            r"C-?Span",
+            r"CBS(\s*(4|Corp|News))?",
             r"Charlie\s*Rose",
             r"China\s*Daily",
             r"CNBC",
@@ -869,6 +989,7 @@ HIGHLIGHTED_NAMES = [
             r"Ed\s*Krassenstein",
             r"(Emily\s*)?Michot",
             r"Ezra\s*Klein",
+            r"Fire\s*and\s*Fury",
             r"Forbes",
             r"Fortune\s*Magazine",
             r"Fox\s*News(\.com)?",
@@ -881,8 +1002,10 @@ HIGHLIGHTED_NAMES = [
             r"Graydon(\s*Carter)?",
             r"Huff(ington)?(\s*Po(st)?)?",
             r"Ingram, David",
-            r"(James\s*)?(Hill|Patterson)",
+            r"James\s*Hill",
+            r"(James\s*)?Patterson",
             r"Jesse Kornbluth",
+            r"John\s*Connolly",
             r"Jonathan\s*Karl",
             r"Julie\s*(K.?\s*)?Brown", r'jbrown@miamiherald.com',
             r"(Katie\s*)?Couric",
@@ -892,7 +1015,7 @@ HIGHLIGHTED_NAMES = [
             r"(Les\s*)?Moonves",
             r"MarketWatch",
             r"Miami\s*Herald",
-            r"(Mi(chael|ke)\s*)?Bloomberg",
+            r"(Mi(chael|ke)\s*)?Bloomber[gq](\s*News)?",
             r"(Michele\s*)?Dargan",
             r"Morning News USA",
             r"(National\s*)?Enquirer",
@@ -904,13 +1027,14 @@ HIGHLIGHTED_NAMES = [
             r"Pro\s*Publica",
             r"Reuters",
             r"(Sean\s*)?Hannity",
+            r"Sharon Churcher",  # Daily Mail
             r"Sulzberger",
             r"SunSentinel",
             r"(The\s*)?Financial\s*Times",
             r"The\s*Guardian",
             r"TheHill",
             r"(The\s*)?Mail\s*On\s*Sunday",
-            r"(The\s*)?N(ew\s*)?Y(ork\s*)?(P(ost)?|T(imes)?)",
+            r"(The\s*)?N(ew\s*)?Y(ork)?\s*(Magazine|Observer|P(ost)?|T(imes)?)",
             r"(The\s*)?New\s*Yorker",
             r"(The\s*)?Wall\s*Street\s*Journal",
             r"(The\s*)?Wa(shington\s*)?Po(st)?",
@@ -952,7 +1076,7 @@ HIGHLIGHTED_NAMES = [
             r"((Enrique )?Pena )?Nieto",
             r"Lat(in)?\s*Am(erican?)?",
             r"Lula",
-            r"Mexic(an|o)",
+            r"(?<!New )Mexic(an|o)",
             r"(Nicolas\s+)?Maduro",
             r"Panama( Papers)?",
             r"Peru(vian)?",
@@ -960,90 +1084,61 @@ HIGHLIGHTED_NAMES = [
             r"Zambrano",
         ],
     ),
-    HighlightedNames(
-        label='government',
-        style='color(24) bold',
-        emailers={
-            ANN_MARIE_VILLAFANA: 'Southern District of Florida (SDFL) U.S. Attorney',
-            DANNY_FROST: 'Director of Communications at Manhattan D.A.',
-            'Police Code Enforcement': f"{PALM_BEACH} buildings code enforcement",
-        },
-        patterns=[
-            r"AG",
-            r"(Alicia\s*)?Valle",
-            r"AML",
-            r"(Andrew\s*)?McCabe",
-            r"Attorney General",
-            r"((Bob|Robert)\s*)?Mueller",
-            r"(Byung\s)?Pak",
-            r"Case 1:19-cv-03377(-LAP)?",
-            r"CFTC?",
-            r"CIA",
-            r"CIS",
-            r"CVRA",
-            r"Dep(artmen)?t\.?\s*of\s*(the\s*)?(Justice|Treasury)",
-            r"DHS",
-            r"DOJ",
-            r"FBI",
-            r"FCPA",
-            r"FDIC",
-            r"Federal\s*Bureau\s*of\s*Investigation",
-            r"FinCEN",
-            r"FINRA",
-            r"FOIA",
-            r"FTC",
-            r"(General\s*)?P(a|e)traeus",
-            r"IRS",
-            r"(James\s*)?Comey",
-            r"(Jennifer\s*Shasky\s*)?Calvery",
-            r"((Judge|Mark)\s*)?(Carney|Filip)",
-            r"(Judge\s*)?(Kenneth\s*)?(A\.?\s*)?Marra",
-            r"(Justice|Treasury)\s*Dep(t|artment)",
-            r"(Kirk )?Blouin",
-            r"KYC",
-            r"(Lann?a\s*)?Belohlavek",
-            r"NIH",
-            r"NS(A|C)",
-            r"OCC",
-            r"OFAC",
-            r"(Michael\s*)?Reiter",
-            r"OGE",
-            r"Office\s*of\s*Government\s*Ethics",
-            r"police",
-            r"(Preet\s*)?Bharara",
-            r"SCOTUS",
-            r"SD(FL|NY)",
-            r"SEC",
-            r"Secret\s*Service",
-            r"Securities\s*and\s*Exchange\s*Commission",
-            r"Southern\s*District(\s*of\s*(Florida|New\s*York))?",
-            r"State\s*Dep(artmen)?t",
-            r"Strzok",
-            r"Supreme\s*Court",
-            r"Treasury\s*(Dep(artmen)?t|Secretary)",
-            r"TSA",
-            r"U\.?S\.? attorney",
-            r"USAID",
-            r"(William\s*J\.?\s*)?Zloch",
-        ],
-    ),
     HighlightedNames(
         label=LOBBYIST,
         style='light_coral',
         emailers={
             BOB_CROWE: 'partner at Nelson Mullins',
             'Joshua Cooper Ramo': 'co-CEO of Henry Kissinger Associates',
-            KATHERINE_KEATING: 'Daughter of former Australian PM',
+            KATHERINE_KEATING: 'daughter of former Australian prime minister',
             MOHAMED_WAHEED_HASSAN: 'former president of the Maldives',
             OLIVIER_COLOM: 'France',
-            'Paul Keating': 'former PM of Australia',
+            'Paul Keating': 'former prime minister of Australia',
             PUREVSUREN_LUNDEG: 'Mongolian ambassador to the UN',
             'Stanley Rosenberg': 'former President of the Massachusetts Senate',
         },
         patterns=[
             r"CSIS",
+            r"elisabeth\s*feliho",
             r"(Kevin\s*)?Rudd",
             r"Stanley Rosenberg",
+            r"Vinoda\s*Basnayake",
+        ],
+    ),
+    HighlightedNames(
+        label='locations',
+        style='cornsilk1',
+        patterns=[
+            r"Alabama",
+            r"Arizona(?! State University)",
+            r"Aspen",
+            r"Berkeley",
+            r"Brooklyn",
+            r"California",
+            r"Canada",
+            r"Cape Cod",
+            r"Connecticut",
+            r"Florida",
+            r"Loudoun\s*County?",
+            r"Martha's\s*Vineyard",
+            r"Miami(?!\s?Herald)",
+            r"Nantucket",
+            r"New\s*(Jersey|Mexico)",
+            r"(North|South)\s*Carolina",
+            r"NY(C|\s*State)",
+            r"Orange\s*County",
+            r"Oregon",
+            r"Phoenix",
+            r"Portland",
+            r"Santa\s*Fe",
+            r"Telluride",
+            r"Teterboro",
+            r"Texas(?! A&M)",
+            r"Toronto",
+            r"Tu(sc|cs)on",
+            r"Vermont",
+            r"Washington(\s*D\.?C)?(?!\s*Post)",
+            r"Westchester",
         ],
     ),
     HighlightedNames(
@@ -1114,7 +1209,7 @@ HIGHLIGHTED_NAMES = [
             r"Mohammed\s+bin\s+Salman",
             r"Morocco",
             r"Mubarak",
-            r"Muslim",
+            r"Muslim(\s*Brotherhood)?",
             r"Nayaf",
             r"Pakistani?",
             r"Omar",
@@ -1138,6 +1233,7 @@ HIGHLIGHTED_NAMES = [
             r"Tripoli",
             r"Tunisian?",
             r"Turk(ey|ish)",
+            r"Turks(?! & Caicos)",
             r"UAE",
             r"((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
         ],
@@ -1185,8 +1281,10 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"(Matt(hew)? )?Hiltzi[gk]",
+            r"PR\s*Newswire",
             REPUTATION_MGMT,
             r"Reputation.com",
+            r"(Robert L\. )?Dilenschneider",
         ],
     ),
     HighlightedNames(
@@ -1201,8 +1299,10 @@ HIGHLIGHTED_NAMES = [
             r"Alberto\sGonzale[sz]",
             r"(Alex\s*)?Acosta",
             r"(Ben\s*)?Sasse",
+            r"Betsy Devos",
             r"((Bill|William)\s*)?Barr",
             r"Bill\s*Shine",
+            r"Blackwater",
             r"(Bob\s*)?Corker",
             r"(Brett\s*)?Kavanaugh",
             r"Broidy",
@@ -1210,12 +1310,16 @@ HIGHLIGHTED_NAMES = [
             r"(?<!Merwin Dela )Cruz",
             r"Devin\s*Nunes",
             r"(Don\s*)?McGa[hn]n",
+            r"Erik Prince",
             r"Gary\s*Cohn",
             r"George\s*(H\.?\s*)?(W\.?\s*)?Bush",
             r"(George\s*)?Nader",
             r"GOP",
             r"Jeff(rey)?\s*Sessions",
-            r"(John\s*(R.?\s*)?)Bolton",
+            r"(John\s*(R.?\s*)?)?Bolton",
+            r"Kasich",
+            r"Keith\s*Schiller",
+            r"Kelly(\s*Anne?)?\s*Conway|Kellyanne",
             r"Kissinger",
             r"Kobach",
             r"Kolfage",
@@ -1230,6 +1334,7 @@ HIGHLIGHTED_NAMES = [
             r"((General|Mike)\s*)?(Flynn|Pence)",
             r"(Mitt\s*)?Romney",
             r"Mnuchin",
+            r"(Newt\s*)Gingrich",
             r"Nikki",
             r"Haley",
             r"(Paul\s*)?(Manafort|Volcker)",
@@ -1238,8 +1343,9 @@ HIGHLIGHTED_NAMES = [
             r"Reagan",
             r"Reince", r"Priebus",
             r"Republican",
-            r"(Rex\s*)?Tillerson",
+            r"(Rex\s*)?Till?erson",
             r"(?<!Cynthia )(Richard\s*)?Nixon",
+            r"RNC",
             r"Tea\s*Party",
         ],
     ),
@@ -1281,6 +1387,8 @@ HIGHLIGHTED_NAMES = [
             r"(Natalia\s*)?Veselnitskaya",
             r"(Oleg\s*)?Deripaska",
             r"Oleksandr Vilkul",
+            r"Onexim",  # Prokhorov investment vehicle
+            r"Prokhorov",
             r"Rosneft",
             r"RT",
             r"St.?\s*?Petersburg",
@@ -1288,8 +1396,9 @@ HIGHLIGHTED_NAMES = [
             r"Russian?",
             r"Sberbank",
             r"Soviet(\s*Union)?",
+            r"Timur\s*Kulibayev",
             r"USSR",
-            r"Vladimir",
+            r"Vlad(imir)?(?! Yudash)",
             r"(Vladimir\s*)?Putin",
             r"Women\s*Empowerment",
             r"Xitrans",
@@ -1300,6 +1409,7 @@ HIGHLIGHTED_NAMES = [
         label='Southeast Asia',
         style='light_salmon3 bold',
         patterns=[
+            r"Australian?(?! Ave)",
             r"Bangkok",
             r"Burm(a|ese)",
             r"Cambodian?",
@@ -1307,6 +1417,7 @@ HIGHLIGHTED_NAMES = [
             r"Malaysian?",
             r"Maldives",
             r"Myan?mar",
+            r"New\s*Zealand",
             r"Philippines",
             r"South\s*Korean?",
             r"Tai(pei|wan)",
@@ -1327,8 +1438,10 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"AG?I",
+            r"Artificial\s*(General\s*)?Intelligence",
             r"Chamath", r"Palihapitiya",
             r"Danny\s*Hillis",
+            r"deep learning",
             r"Drew\s*Houston",
             r"Eric\s*Schmidt",
             r"Greylock(\s*Partners)?",
@@ -1357,10 +1470,12 @@ HIGHLIGHTED_NAMES = [
         style='red3 bold',
         emailers={
             'Bruce Moskowitz': "'Trump's health guy' according to Epstein",
+            NICHOLAS_RIBIS: 'Hilton CEO, former president of Trump Organization',
         },
         patterns=[
             r"@?realDonaldTrump",
             r"(Alan\s*)?Weiss?elberg",
+            r"Alex\s*Jones",
             r"\bDJ?T\b",
             r"Donald J. Tramp",
             r"(Donald\s+(J\.\s+)?)?Trump(ism|\s*(Org(anization)?|Properties)(\s*LLC)?)?",
@@ -1372,7 +1487,7 @@ HIGHLIGHTED_NAMES = [
             r"(Marla\s*)?Maples",
             r"(Matt(hew)? )?Calamari",
             r"\bMatt C\b",
-            r"Michael\s*Cohen",
+            r"Michael\s*(D\.?\s*)?Cohen",
             r"Melania",
             r"(Michael (J.? )?)?Boccio",
             r"Paul Rampell",
@@ -1398,25 +1513,30 @@ HIGHLIGHTED_NAMES = [
             r"Dominican\s*Republic",
             r"(Great|Little)\s*St.?\s*James",
             r"Haiti(an)?",
+            r"Jamaican?",
             r"(John\s*)deJongh(\s*Jr\.?)",
             r"(Kenneth E\. )?Mapp",
             r"PBI",
             r"Puerto\s*Ric(an|o)",
             r"S(ain)?t.?\s*Thomas",
             r"USVI",
-            r"(?<!Epstein )VI",
-            r"(The\s*)?Virgin\s*Islands(\s*Daily\s*News)?",  # Hard to make this work right
-            r"(West\s*)?Palm\s*Beach(?!\s*(Daily|Post))",
+            r"(?<!stein |vis-a-)VI(?!s-a-)",
+            r"(The\s*)?Virgin\s*Is(al|la)nds(\s*Daily\s*News)?",  # Hard to make this work right
+            r"(West\s*)?Palm\s*Beach(\s*County)?(?!\s*(Daily|Post))",
         ],
     ),
     HighlightedNames(
         label='victim',
         style='orchid1',
         patterns=[
-            r"(David\s*)?Bo[il]es",
+            r"#metoo",
+            r"(David\s*)?Bo[il]es(,?\s*Schiller( & Flexner)?)?",
             r"(Gloria\s*)?Allred",
             r"(Jane|Tiffany)\s*Doe",
             r"Katie\s*Johnson",
+            r"pedophile",
+            r"Stephanie\s*Clifford",
+            r"Stormy\s*Daniels",
             r"(Virginia\s+((L\.?|Roberts)\s+)?)?Giuffre",
             r"Virginia\s+Roberts",
         ],
@@ -1455,7 +1575,7 @@ HIGHLIGHTED_NAMES = [
 
     # Individuals
     HighlightedNames(
-        emailers={STEVEN_HOFFENBERG: "Epstein's Towers Financial ponzi scheme partner, prison 18 years"},
+        emailers={STEVEN_HOFFENBERG: "Epstein's Towers Financial ponzi partner, prison for 18 years"},
         style='dark_olive_green3',
         category=FINANCE,
         patterns=[r"(steven?\s*)?hoffenberg?w?"],
@@ -1471,8 +1591,8 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(emailers={MELANIE_WALKER: f"doctor, friend of {BILL_GATES}"}, style='pale_violet_red1', category=FRIEND),
     HighlightedNames(emailers={PAULA: "Epstein's ex-girlfriend who is now in the opera world"}, label='paula', style='pink1', category=FRIEND),
     HighlightedNames(emailers={PRINCE_ANDREW: 'British royal family'}, style='dodger_blue1', category='Europe'),
-    HighlightedNames(emailers={SOON_YI_PREVIN: 'wife of Woody Allen'}, style='hot_pink', category=FRIEND),
-    HighlightedNames(emailers={SULTAN_BIN_SULAYEM: 'CEO of DP World, chairman of ports in Dubai'}, style='green1', category=MIDEAST),
+    HighlightedNames(emailers={SOON_YI_PREVIN: 'wife of Woody Allen'}, style='hot_pink', category=ARTS),
+    HighlightedNames(emailers={SULTAN_BIN_SULAYEM: 'chairman of ports in Dubai, CEO of DP World'}, style='green1', category=MIDEAST),
 
     # HighlightedText not HighlightedNames bc of word boundary issue
     HighlightedText(
@@ -1495,7 +1615,7 @@ HIGHLIGHTED_TEXTS = [
     HighlightedText(
         label='header_field',
         style='plum4',
-        patterns=[r'^(> )?(Date|From|Sent|To|C[cC]|Importance|Reply-To|Subject|Bee|B[cC]{2}|Attachments|Flag|Classification):'],
+        patterns=[r'^>? ?(Date|From|Sent|To|C[cC]|Importance|Reply[- ]?To|Subject|Bee|B[cC]{2}|Attachments|Flag|Classification|((A|De(stinataire)?|Envoye|Expe(cl|d)iteur|Objet|Q) ?)):'],
     ),
     HighlightedText(
         label='http_links',
@@ -1549,6 +1669,41 @@ class EpsteinHighlighter(RegexHighlighter):
     """Finds and colors interesting keywords based on the above config."""
     base_style = f"{REGEX_STYLE_PREFIX}."
     highlights = [highlight_group.regex for highlight_group in ALL_HIGHLIGHTS]
+    highlight_counts = defaultdict(int)
+
+    def highlight(self, text: Text) -> None:
+        """overrides https://rich.readthedocs.io/en/latest/_modules/rich/highlighter.html#RegexHighlighter"""
+        highlight_regex = text.highlight_regex
+
+        for re_highlight in self.highlights:
+            highlight_regex(re_highlight, style_prefix=self.base_style)
+
+            if args.debug and isinstance(re_highlight, re.Pattern):
+                for match in re_highlight.finditer(text.plain):
+                    type(self).highlight_counts[(match.group(1) or 'None').replace('\n', ' ')] += 1
+
+    def print_highlight_counts(self, console: Console) -> None:
+        """Print counts of how many times strings were highlighted."""
+        highlight_counts = deepcopy(self.highlight_counts)
+        weak_date_regex = re.compile(r"^(\d\d?/|20|http|On ).*")
+
+        for highlighted, count in sort_dict(highlight_counts):
+            if highlighted is None or weak_date_regex.match(highlighted):
+                continue
+
+            try:
+                console.print(f"{highlighted:25s} highlighted {count} times")
+            except Exception as e:
+                logger.error(f"Failed to print highlight count {count} for {highlighted}")
+
+
+def get_highlight_group_for_name(name: str | None) -> HighlightedNames | None:
+    if name is None:
+        return None
+
+    for highlight_group in HIGHLIGHTED_NAMES:
+        if highlight_group.regex.search(name):
+            return highlight_group
 
 
 def get_style_for_category(category: str) -> str | None:
@@ -1584,15 +1739,6 @@ def styled_name(name: str | None, default_style: str = DEFAULT_NAME_STYLE) -> Te
     return Text(name or UNKNOWN, style=get_style_for_name(name, default_style=default_style))
 
 
-def get_highlight_group_for_name(name: str | None) -> HighlightedNames | None:
-    if name is None:
-        return None
-
-    for highlight_group in HIGHLIGHTED_NAMES:
-        if highlight_group.regex.search(name):
-            return highlight_group
-
-
 def _print_highlighted_names_repr() -> None:
     for hn in HIGHLIGHTED_NAMES:
         if isinstance(hn, HighlightedNames):