epstein-files 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

epstein_files/util/highlighted_group.py

@@ -1,6 +1,5 @@
 import json
 import re
-from abc import ABC
 from dataclasses import dataclass, field
 
 from rich.highlighter import RegexHighlighter
@@ -12,7 +11,7 @@ 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, VIRGIN_ISLANDS)
 from epstein_files.util.doc_cfg import *
-from epstein_files.util.data import extract_last_name, without_falsey
+from epstein_files.util.data import extract_first_name, extract_last_name, without_falsey
 from epstein_files.util.logging import logger
 
 CIVIL_ATTORNEY = 'civil attorney'
@@ -38,7 +37,6 @@ CATEGORY_STYLE_MAPPING = {
 
 CATEGORY_STYLES = {
     JSON: 'dark_red',
-    JUNK: 'grey19',
     'letter': 'medium_orchid1'
 }
 
@@ -46,12 +44,11 @@ CATEGORY_STYLES = {
 @dataclass(kw_only=True)
 class BaseHighlight:
     """
-    Regex and style information.
+    Regex and style information for things we want to highlight.
 
     Attributes:
-        label (str): RegexHighlighter match group name, defaults to 1st 'emailers' key if only 1 emailer provided
+        label (str): RegexHighlighter match group name
         pattern (str): regex pattern identifying strings matching this group
-        regex (re.Pattern): matches self.pattern
         style (str): Rich style to apply to text matching this group
         theme_style_name (str): The style name that must be a part of the rich.Console's theme
     """
@@ -79,9 +76,6 @@ class HighlightedText(BaseHighlight):
     Attributes:
         label (str): RegexHighlighter match group name, defaults to 1st 'emailers' key if only 1 emailer provided
         patterns (list[str]): regex patterns identifying strings matching this group
-        regex (re.Pattern): matches self.pattern
-        style (str): Rich style to apply to text matching this group
-        theme_style_name (str): The style name that must be a part of the rich.Console's theme
     """
     patterns: list[str] = field(default_factory=list)
     _pattern: str = field(init=False)
@@ -112,6 +106,7 @@ class HighlightedNames(HighlightedText):
     """
     category: str = ''
     emailers: dict[str, str | None] = field(default_factory=dict)
+    should_match_first_last_name: bool = True
 
     def __post_init__(self):
         if not (self.emailers or self.patterns):
@@ -138,9 +133,12 @@ class HighlightedNames(HighlightedText):
 
     def _emailer_pattern(self, name: str) -> str:
         """Pattern matching 'name'. Extends value in EMAILER_ID_REGEXES with first/last name if it exists."""
+        if not self.should_match_first_last_name:
+            return name
+
         name = remove_question_marks(name)
+        first_name = extract_first_name(name)
         last_name = extract_last_name(name)
-        first_name = name.removesuffix(f" {last_name}")
 
         if name in EMAILER_ID_REGEXES:
             pattern = EMAILER_ID_REGEXES[name].pattern
@@ -225,7 +223,7 @@ HIGHLIGHTED_NAMES = [
             LAWRENCE_KRAUSS: 'theoretical physicist',
             LINDA_STONE: f'ex-Microsoft, {MIT_MEDIA_LAB}',
             MARK_TRAMO: 'professor of neurology at UCLA',
-            'Nancy Dahl': 'wife of Lawrence Krauss',
+            'Nancy Dahl': f'wife of {LAWRENCE_KRAUSS}',
             NEAL_KASSELL: 'professor of neurosurgery at University of Virginia',
             PETER_ATTIA: 'longevity medicine',
             ROBERT_TRIVERS: 'evolutionary biology',
@@ -236,20 +234,23 @@ HIGHLIGHTED_NAMES = [
             r"Brotherton",
             r"Carl\s*Sagan",
             r"Columbia",
+            r"Dan(iel|ny) Kahneman",
             r"David Grosof",
             r"J(ames|im)\s*Watson",
             r"(Lord\s*)?Martin\s*Rees",
             r"Massachusetts\s*Institute\s*of\s*Technology",
             r"Media\s*Lab",
-            r"Minsky",
+            r"(Marvin\s*)?Minsky",
             r"MIT(\s*Media\s*Lab)?",
             r"((Noam|Valeria)\s*)?Chomsky",
             r"Norman\s*Finkelstein",
+            r"Oxford(?! Analytica)",
             r"Praluent",
+            r"Princeton(\s*University)?",
             r"Regeneron",
             r"(Richard\s*)?Dawkins",
             r"Sanofi",
-            r"Stanford",
+            r"Stanford(\s*University)?(\s*Hospital)?",
             r"(Stephen\s*)?Hawking",
             r"(Steven?\s*)?Pinker",
             r"UCLA",
@@ -288,18 +289,19 @@ HIGHLIGHTED_NAMES = [
         label='bitcoin',
         style='orange1 bold',
         emailers={
-            'Jeffrey Wernick': 'former COO of Parler, involved in numerous crypto companies like Bitforex',
+            JEFFREY_WERNICK: 'former COO of Parler, involved in numerous crypto companies like Bitforex',
             JEREMY_RUBIN: 'developer/researcher',
             JOI_ITO: f"former head of {MIT_MEDIA_LAB} and MIT Digital Currency Initiative",
             ANTHONY_SCARAMUCCI: 'Skybridge Capital, FTX investor',
         },
         patterns=[
             r"Balaji",
-            r"bitcoin",
+            r"bitcoin(\s*Foundation)?",
             r"block ?chain(\s*capital)?",
             r"Brock(\s*Pierce)?",
             r"coins?",
             r"cr[iy]?pto(currenc(y|ies))?",
+            r"Digital\s*Currenc(ies|y)(\s*Initiative)?",
             r"e-currency",
             r"(Gavin )?Andressen",
             r"(Howard\s+)?Lutnic?k",
@@ -380,7 +382,7 @@ HIGHLIGHTED_NAMES = [
             r"Ministry\sof\sState\sSecurity",
             r"Mongolian?",
             r"MSS",
-            r"North\s*Korea",
+            r"North\s*Korean?",
             r"Peking",
             r"PRC",
             r"Pyongyang",
@@ -416,6 +418,7 @@ HIGHLIGHTED_NAMES = [
             r"Eric Holder",
             r"George\s*Mitchell",
             r"(George\s*)?Soros",
+            r"Hakeem\s*Jeffries",
             r"Hill?ary",
             r"HRC",
             r"(Jo(e|seph)\s*)?Biden",
@@ -441,7 +444,7 @@ HIGHLIGHTED_NAMES = [
     ),
     HighlightedNames(
         label='employee',
-        style='deep_sky_blue4',
+        style='medium_purple4',
         emailers={
             'Alfredo Rodriguez': "Epstein's butler, stole the journal",
             ERIC_ROTH: 'jet decorator',
@@ -454,7 +457,11 @@ HIGHLIGHTED_NAMES = [
             NADIA_MARCINKO: 'pilot',
             'Sean J. Lancaster': 'airplane reseller',
         },
-        patterns=[r"Merwin"],
+        patterns=[
+            r"Adriana\s*Ross",
+            r"Merwin",
+            r"(Sarah\s*)?Kellen", r"Vickers",  # Married name is Metiers
+        ],
     ),
     HighlightedNames(
         label=ENTERTAINER,
@@ -498,6 +505,7 @@ HIGHLIGHTED_NAMES = [
         style='purple',
         emailers={
             'Alan S Halperin': 'partner at Paul, Weiss',
+            ALAN_DERSHOWITZ: 'Harvard Law School professor and all around (in)famous American lawyer',
             ARDA_BESKARDES: 'NYC immigration attorney allegedly involved in sex-trafficking operations',
             BENNET_MOSKOWITZ: f'represented the {EPSTEIN_ESTATE_EXECUTOR}s',
             BRAD_KARP: 'head of the law firm Paul Weiss',
@@ -509,6 +517,7 @@ HIGHLIGHTED_NAMES = [
             JACKIE_PERCZEK: CRIMINAL_DEFENSE_2008,
             JAY_LEFKOWITZ: f"Kirkland & Ellis partner, {CRIMINAL_DEFENSE_2008}",
             JESSICA_CADWELL: f'paralegal to {ROBERT_D_CRITTON_JR}',  # house_oversight_030464
+            KEN_STARR: 'head of the Monica Lewinsky investigation against Bill Clinton',
             LILLY_SANCHEZ: CRIMINAL_DEFENSE_ATTORNEY,
             MARTIN_WEINBERG: CRIMINAL_DEFENSE_ATTORNEY,
             MICHAEL_MILLER: 'Steptoe LLP partner',
@@ -521,6 +530,7 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"(Barry (E. )?)?Krischer",
+            r"dersh",
             r"Kate Kelly",
             r"Kirkland\s*&\s*Ellis",
             r"(Leon\s*)?Jaworski",
@@ -544,6 +554,7 @@ HIGHLIGHTED_NAMES = [
         style='light_sky_blue3',
         emailers={
             ANDRZEJ_DUDA: 'former president of Poland',
+            'Fabrice Aidan': f'diplomat who worked with {TERJE_ROD_LARSEN}',
             MIROSLAV_LAJCAK: 'Russia-friendly Slovakian politician, friend of Steve Bannon',
             PETER_MANDELSON: 'UK politics',
             TERJE_ROD_LARSEN: 'Norwegian diplomat',
@@ -595,27 +606,13 @@ HIGHLIGHTED_NAMES = [
             r"Strasbourg",
             r"Strauss[- ]?Kahn",
             r"Swed(en|ish)(?![-\s]+American Life Scienc)",
-            r"Switzerland",
+            r"Swi(ss|tzerland)",
             r"(Tony\s)?Blair",
             r"U\.K\.",
             r"Ukrain(e|ian)",
             r"Vienna",
             r"Zug",
-        ],
-    ),
-    HighlightedNames(
-        label='famous lawyer',
-        style='medium_purple3',
-        emailers={
-            ALAN_DERSHOWITZ: 'Harvard Law School professor and all around (in)famous American lawyer',
-            'Fabrice Aidan': f'diplomat who worked with {TERJE_ROD_LARSEN}',
-            KEN_STARR: 'head of the Monica Lewinsky investigation against Bill Clinton',
-        },
-        patterns=[
-            r"(David\s*)?Bo[il]es",
-            r"dersh",
-            r"(Gloria\s*)?Allred",
-            r"(Mi(chael|ke)\s*)?Avenatti",
+            r"Zurich",
         ],
     ),
     HighlightedNames(
@@ -667,7 +664,8 @@ HIGHLIGHTED_NAMES = [
             r"j\.?p\.?\s*morgan(\.?com|\s*Chase)?",
             r"Madoff",
             r"Merrill(\s*Lynch)?",
-            r"(Michael\s*)?(Cembalest|Milken)",
+            r"(Michael\s*)?Cembalest",
+            r"(Mi(chael|ke)\s*)?Milken(\s*Conference)?",
             r"Mizrahi\s*Bank",
             r"MLPF&S",
             r"Morgan Stanley",
@@ -694,6 +692,7 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"Andrew Farkas",
+            r"Jonanthan and Kimberly Farkus",
             r"Thomas\s*(J\.?\s*)?Barrack(\s*Jr)?",
         ],
     ),
@@ -800,24 +799,26 @@ HIGHLIGHTED_NAMES = [
             r"Arianna(\s*Huffington)?",
             r"(Arthur\s*)?Kretchmer",
             r'Associated\s*Press',
+            r"Axios",
             r"BBC",
-            r"Bloomberg",
             r"Breitbart",
             r"Charlie\s*Rose",
             r"China\s*Daily",
             r"CNBC",
             r"CNN(politics?)?",
-            r"Con[cs]hita",
-            r"Sarnoff",
+            r"Con[cs]hita", r"Sarnoff",
+            r"Daily Business Review",
             r"(?<!Virgin[-\s]Islands[-\s])Daily\s*(Beast|Mail|News|Telegraph)",
             r"(David\s*)?(Pecker|Pegg)",
             r"David\s*Brooks",
             r"Ed\s*Krassenstein",
             r"(Emily\s*)?Michot",
             r"Ezra\s*Klein",
+            r"Fox\s*News(\.com)?",
             r"FrontPage Magazine",
             r"FT",
             r"(George\s*)?Stephanopoulus",
+            r"Ger(ald|ry)\s*Baker",
             r"Globe\s*and\s*Mail",
             r"Good\s*Morning\s*America",
             r"Graydon(\s*Carter)?",
@@ -829,9 +830,14 @@ HIGHLIGHTED_NAMES = [
             r"(Katie\s*)?Couric",
             r"Keith\s*Larsen",
             r"L\.?A\.?\s*Times",
+            r"Law(360|\.com|fare)",
+            r"MarketWatch",
             r"Miami\s*Herald",
+            r"(Mi(chael|ke)\s*)?Bloomberg",
             r"(Michele\s*)?Dargan",
+            r"Morning News USA",
             r"(National\s*)?Enquirer",
+            r"Newsweek",
             r"NYer",
             r"Palm\s*Beach\s*(Daily\s*News|Post)",
             r"PERVERSION\s*OF\s*JUSTICE",
@@ -843,6 +849,8 @@ HIGHLIGHTED_NAMES = [
             r"Susan Edelman",
             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*)?New\s*Yorker",
             r"(The\s*)?Wall\s*Street\s*Journal",
@@ -857,6 +865,18 @@ HIGHLIGHTED_NAMES = [
             r"[-\w.]+@(bbc|independent|mailonline|mirror|thetimes)\.co\.uk",
         ],
     ),
+    HighlightedNames(
+        label=JUNK,
+        style='gray46',
+        emailers={
+            'asmallworld@travel.asmallworld.net': None,
+            "digest-noreply@quora.com": None,
+            'editorialstaff@flipboard.com': None,
+            'How To Academy': None,
+            'Jokeland': None,
+        },
+        should_match_first_last_name=False,
+    ),
     HighlightedNames(
         label='Latin America',
         style='yellow',
@@ -866,11 +886,12 @@ HIGHLIGHTED_NAMES = [
             r"Bra[sz]il(ian)?",
             r"Caracas",
             r"Castro",
+            r"Chile",
             r"Colombian?",
             r"Cuban?",
             r"El\s*Salvador",
             r"((Enrique )?Pena )?Nieto",
-            r"Lat(in)?\s*Am(erica)?",
+            r"Lat(in)?\s*Am(erican?)?",
             r"Lula",
             r"Mexic(an|o)",
             r"(Nicolas\s+)?Maduro",
@@ -990,6 +1011,7 @@ HIGHLIGHTED_NAMES = [
             r"Basiji?",
             r"Beirut",
             r"Benghazi",
+            r"Brunei",
             r"Cairo",
             r"Chagoury",
             r"Damascus",
@@ -1078,6 +1100,7 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"\w+@mc2mm.com",
+            r"MC2",
             r"model(ed|ing)",
             r"(Nicole\s*)?Junkerman",  # Also a venture fund manager now
         ],
@@ -1100,6 +1123,7 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"(Matt(hew)? )?Hiltzi[gk]",
             REPUTATION_MGMT,
+            r"Reputation.com",
         ],
     ),
     HighlightedNames(
@@ -1123,7 +1147,6 @@ HIGHLIGHTED_NAMES = [
             r"(?<!Merwin Dela )Cruz",
             r"Devin\s*Nunes",
             r"(Don\s*)?McGa[hn]n",
-            r"Fox\s*News",
             r"George\s*(H\.?\s*)?(W\.?\s*)?Bush",
             r"(George\s*)?Nader",
             r"GOP",
@@ -1160,7 +1183,7 @@ HIGHLIGHTED_NAMES = [
         style='indian_red',
         emailers={
             ARIANE_DE_ROTHSCHILD: 'heiress',
-            JOHNNY_EL_HACHEM: f'works with {ARIANE_DE_ROTHSCHILD}',
+            JOHNNY_EL_HACHEM: f'Edmond de Rothschild Private Equity',
         },
         patterns=['AdR'],
     ),
@@ -1208,7 +1231,6 @@ HIGHLIGHTED_NAMES = [
             r"(Vitaly\s*)?Churkin",
         ],
     ),
-
     HighlightedNames(
         label='Southeast Asia',
         style='light_salmon3 bold',
@@ -1220,7 +1242,7 @@ HIGHLIGHTED_NAMES = [
             r"Malaysian?",
             r"Myan?mar",
             r"Philippines",
-            r"South\s*Korea",
+            r"South\s*Korean?",
             r"Tai(pei|wan)",
             r"Thai(land)?",
             r"Vietnam(ese)?",
@@ -1245,7 +1267,10 @@ HIGHLIGHTED_NAMES = [
             r"Eric\s*Schmidt",
             r"Greylock(\s*Partners)?",
             r"(?<!(ustin|Moshe)\s)Hoffmand?",
+            r"(Jeff\s*)?Bezos",
+            r"Larry Page",
             r"LinkedIn",
+            r"(Marc\s*)?Andreess?en",
             r"(Mark\s*)?Zuckerberg",
             r"Masa(yoshi)?(\sSon)?",
             r"Najeev",
@@ -1273,7 +1298,7 @@ HIGHLIGHTED_NAMES = [
             r"\bDJ?T\b",
             r"Donald J. Tramp",
             r"(Donald\s+(J\.\s+)?)?Trump(ism|\s*(Org(anization)?|Properties)(\s*LLC)?)?",
-            r"Don(ald| *Jr)(?! Rubin)",
+            r"Don(ald| *Jr)(?! (B|Rubin))",
             r"Ivank?a",
             r"Jared",
             r"Kushner",
@@ -1282,6 +1307,7 @@ HIGHLIGHTED_NAMES = [
             r"(Marla\s*)?Maples",
             r"(Matt(hew)? )?Calamari",
             r"\bMatt C\b",
+            r"Michael\s*Cohen",
             r"Melania",
             r"(Michael (J.? )?)?Boccio",
             r"Paul Rampell",
@@ -1295,6 +1321,8 @@ HIGHLIGHTED_NAMES = [
         label='victim',
         style='orchid1',
         patterns=[
+            r"(David\s*)?Bo[il]es",
+            r"(Gloria\s*)?Allred",
             r"(Jane|Tiffany)\s*Doe",
             r"Katie\s*Johnson",
             r"(Virginia\s+((L\.?|Roberts)\s+)?)?Giuffre",
@@ -1313,6 +1341,7 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"(Alan(\s*P.)?|MINTZ)\s*FRAADE",
             r"(J\.?\s*)?(Stan(ley)?\s*)?Pottinger",
+            r"(Mi(chael|ke)\s*)?Avenatti",
             r"Paul\s*(G.\s*)?Cassell",
             r"Rothstein\s*Rosenfeldt\s*Adler",
             r"(Scott\s*)?Rothstein",
@@ -1354,7 +1383,7 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"BG",
             r"b?g?C3",
-            r"(Bill\s*((and|or)\s*Melinda\s*)?)?Gates",
+            r"(Bill\s*((and|or)\s*Melinda\s*)?)?Gates(\s*Foundation)?",
             r"Melinda(\s*Gates)?",
             r"Microsoft",
             r"MSFT",
@@ -1369,6 +1398,7 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"(American\s*)?Dharma",
+            r"Biosphere",
             r"((Steve|Sean)\s*)?Bannon?",
         ],
     ),
@@ -1409,7 +1439,7 @@ HIGHLIGHTED_TEXTS = [
     HighlightedText(
         label='header_field',
         style='plum4',
-        patterns=[r'^(> )?(Date|From|Sent|To|C[cC]|Importance|Subject|Bee|B[cC]{2}|Attachments):'],
+        patterns=[r'^(> )?(Date|From|Sent|To|C[cC]|Importance|Reply-To|Subject|Bee|B[cC]{2}|Attachments):'],
     ),
     HighlightedText(
         label='http_links',
@@ -1456,6 +1486,7 @@ HIGHLIGHTED_TEXTS = [
 ]
 
 ALL_HIGHLIGHTS = HIGHLIGHTED_NAMES + HIGHLIGHTED_TEXTS
+JUNK_EMAILERS = [name for name in [hn for hn in HIGHLIGHTED_NAMES if hn.label == JUNK][0].emailers.keys()]
 
 
 class EpsteinHighlighter(RegexHighlighter):
@@ -1507,6 +1538,10 @@ def styled_category(category: str | None) -> Text:
     return Text(category, get_style_for_category(category) or 'wheat4')
 
 
+def styled_name(name: str | None, default_style: str = DEFAULT_NAME_STYLE) -> Text:
+    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

epstein_files/util/output.py

@@ -11,21 +11,24 @@ from epstein_files.util.constant import output_files
 from epstein_files.util.constant.html import *
 from epstein_files.util.constant.names import *
 from epstein_files.util.constant.output_files import JSON_FILES_JSON_PATH, JSON_METADATA_PATH
-from epstein_files.util.constant.strings import TIMESTAMP_DIM, TIMESTAMP_STYLE
+from epstein_files.util.constant.strings import DEFAULT_NAME_STYLE, TIMESTAMP_DIM, TIMESTAMP_STYLE
 from epstein_files.util.data import dict_sets_to_lists, sort_dict
 from epstein_files.util.env import args
 from epstein_files.util.file_helper import log_file_write
-from epstein_files.util.highlighted_group import QUESTION_MARKS_TXT
+from epstein_files.util.highlighted_group import (JUNK_EMAILERS, QUESTION_MARKS_TXT, get_category_txt_for_name,
+     get_info_for_name, get_style_for_name, styled_name)
 from epstein_files.util.logging import logger
 from epstein_files.util.rich import *
 
+OTHER_INTERESTING_EMAILS_SUBTITLE = 'Other Interesting Emails\n(these emails have been flagged as being of particular interest)'
 PRINT_COLOR_KEY_EVERY_N_EMAILS = 150
+ALT_INFO_STYLE = 'medium_purple4'
 
 # Order matters. Default names to print emails for.
 DEFAULT_EMAILERS = [
     JEREMY_RUBIN,
-    JOI_ITO,
     JABOR_Y,
+    JOI_ITO,
     STEVEN_SINOFSKY,
     AL_SECKEL,
     DANIEL_SIAD,
@@ -44,6 +47,18 @@ DEFAULT_EMAILERS = [
     JENNIFER_JACQUET,
     ZUBAIR_KHAN,
     None,
+    JEFFREY_EPSTEIN,
+]
+
+INTERESTING_EMAIL_IDS = [
+    '032229',  # Michael Wolff on strategy
+    '028784',  # seminars: Money / Power
+    '029342',  # Hakeem Jeffries
+    '023454',  # Email invitation sent to tech CEOs + Epstein
+    '030630',  # 'What happens with zubair's project?'
+    '033178',  # 'How is it going with Zubair?'
+    '022396',  # Ukraine friend
+    # '023627',  # Michael Wolff article (already printed bc epstein->epstein email)
 ]
 
 INVALID_FOR_EPSTEIN_WEB = JUNK_EMAILERS + KRASSNER_RECIPIENTS + [
@@ -56,30 +71,15 @@ INVALID_FOR_EPSTEIN_WEB = JUNK_EMAILERS + KRASSNER_RECIPIENTS + [
 
 def print_email_timeline(epstein_files: EpsteinFiles) -> None:
     """Print a table of all emails in chronological order."""
-    emails = [email for email in epstein_files.non_duplicate_emails() if not email.is_junk_mail()]
-    table = build_table(f'All {len(emails):,} Non-Junk Emails in Chronological Order', highlight=True)
-    table.add_column('ID', style=TIMESTAMP_DIM)
-    table.add_column('Sent At', style='dim')
-    table.add_column('Author', max_width=20)
-    table.add_column('Recipients', max_width=22)
-    table.add_column('Length', justify='right', style='wheat4')
-    table.add_column('Subject')
-
-    for email in Document.sort_by_timestamp(emails):
-        if email.is_junk_mail():
-            continue
+    emails = Document.sort_by_timestamp([e for e in epstein_files.non_duplicate_emails() if not e.is_junk_mail()])
+    title = f'Table of All {len(emails):,} Non-Junk Emails in Chronological Order (actual emails below)'
+    table = Email.build_emails_table(emails, title=title, show_length=True)
+    console.print(Padding(table, (2, 0)))
+    print_subtitle_panel('The Chronologically Ordered Emails')
+    console.line()
 
-        table.add_row(
-            email.epstein_media_link(link_txt=email.source_file_id()),
-            email.timestamp_without_seconds(),
-            email.author_txt(),
-            email.recipients_txt(max_full_names=1),
-            f"{email.length()}",
-            email.subject(),
-        )
-
-    console.line(2)
-    console.print(table)
+    for email in emails:
+        console.print(email)
 
 
 def print_emails_section(epstein_files: EpsteinFiles) -> list[Email]:
@@ -112,8 +112,19 @@ def print_emails_section(epstein_files: EpsteinFiles) -> list[Email]:
             print_color_key()
             num_emails_printed_since_last_color_key = 0
 
-    if not args.names:
-        epstein_files.print_email_device_info()
+    if args.names:
+        return already_printed_emails
+
+    # Print other interesting emails
+    already_printed_ids = [email.file_id for email in already_printed_emails]
+    extra_emails = [e for e in epstein_files.for_ids(INTERESTING_EMAIL_IDS) if e.file_id not in already_printed_ids]
+    print_subtitle_panel(OTHER_INTERESTING_EMAILS_SUBTITLE)
+    console.line()
+
+    for other_email in extra_emails:
+        console.print(other_email)
+
+    epstein_files.print_email_device_info()
 
     if args.all_emails:
         _verify_all_emails_were_printed(epstein_files, already_printed_emails)
@@ -219,7 +230,7 @@ def _all_emailers_table(epstein_files: EpsteinFiles) -> Table:
     attributed_emails = [e for e in epstein_files.non_duplicate_emails() if e.author]
     footer = f"(identified {len(epstein_files.email_author_counts)} authors of {len(attributed_emails):,}"
     footer = f"{footer} out of {len(epstein_files.non_duplicate_emails()):,} emails)"
-    counts_table = build_table("All of the Email Counterparties Who Appear in the Files", caption=footer)
+    counts_table = build_table("Everyone Who Sent or Received an Email in the Files", caption=footer)
 
     add_cols_to_table(counts_table, [
         'Name',
@@ -237,7 +248,7 @@ def _all_emailers_table(epstein_files: EpsteinFiles) -> Table:
 
     emailer_counts = {
         emailer: epstein_files.email_author_counts[emailer] + epstein_files.email_recipient_counts[emailer]
-        for emailer in epstein_files.all_emailers(True)
+        for emailer in epstein_files.all_emailers(include_useless=True)
     }
 
     for name, count in sort_dict(emailer_counts):
@@ -287,7 +298,7 @@ def _table_of_selected_emailers(_list: list[str | None], epstein_files: EpsteinF
     grey_idx = 0
 
     for i, name in enumerate(_list):
-        earliest_email_date = (epstein_files.earliest_email_at(name) or FALLBACK_TIMESTAMP).date()
+        earliest_email_date = (epstein_files.earliest_email_at(name)).date()
         year_months = (earliest_email_date.year * 12) + earliest_email_date.month
 
         # Color year rollovers more brightly
@@ -302,20 +313,20 @@ def _table_of_selected_emailers(_list: list[str | None], epstein_files: EpsteinF
         info = get_info_for_name(name)
         style = get_style_for_name(name, default_style='none')
 
+        if name == JEFFREY_EPSTEIN:
+            info = Text('(emails sent by Epstein to himself that would not otherwise be printed)', style=ALT_INFO_STYLE)
         if category and category.plain == 'paula':  # TODO: hacky
             category = None
         elif category and info:
             info = info.removeprefix(f"{category.plain}, ").removeprefix(category.plain)
         elif not name:
-            info = Text('(emails whose author or recipient could not be determined)', style='medium_purple4')
-        elif name in JUNK_EMAILERS:
-            category = Text('junk', style='gray30')
+            info = Text('(emails whose author or recipient could not be determined)', style=ALT_INFO_STYLE)
         elif style == 'none' and '@' not in name and not (category or info):
             info = QUESTION_MARKS_TXT
 
         table.add_row(
             Text(str(earliest_email_date), style=f"grey{GREY_NUMBERS[grey_idx]}"),
-            Text(name or UNKNOWN, style=get_style_for_name(name or UNKNOWN, default_style='dim')),
+            styled_name(name, default_style='dim'),
             category,
             f"{len(epstein_files.emails_for(name)):,}",
             info or '',