diff --git a/src/routes/settings.import.tsx b/src/routes/settings.import.tsx
index 2329218..016c0fa 100644
--- a/src/routes/settings.import.tsx
+++ b/src/routes/settings.import.tsx
@@ -190,40 +190,52 @@ const IMPORTERS: ImporterConfig[] = [
     conflict: "external_id",
     required: ["case_number", "title", "client_id"],
     aliases: {
+      // Identifiers
       id: "external_id", caseid: "external_id", externalid: "external_id", mycaseid: "external_id",
       casenumber: "case_number", number: "case_number", mattercode: "case_number",
       caseno: "case_number", casenum: "case_number",
+      // Title / matter name
       name: "title", title: "title", mattername: "title",
       casemattername: "title", casename: "title",
+      // Client linkage — prefer association name; client number takes precedence over name
       companyid: "_clientext", clientid: "_clientext",
       clientno: "_clientext", clientnumber: "_clientext",
-      company: "_clientname", client: "_clientname",
+      company: "_clientname", client: "_clientname", client1: "_clientname",
       communityassociation: "_clientname", associationname: "_clientname",
-      managementcompany: "_clientname",
+      managementcompany: "_mgmtcompany",
+      // Descriptions
       description: "description", casedescription: "description",
       summary: "case_summary", casesummary: "case_summary",
+      // Practice area
       practicearea: "practice_area", area: "practice_area",
       caseinquirytype: "practice_area", representation: "practice_area",
       associationtype: "practice_area",
+      // Status / stage
       status: "status", casestage: "status",
+      // Dates
       opened: "opened_at", openedat: "opened_at", dateopened: "opened_at", opendate: "opened_at",
       closed: "closed_at", closedat: "closed_at", dateclosed: "closed_at", closeddate: "closed_at",
       caseclosed: "_closedflag",
+      // Court info
       court: "court", judge: "judge", jurisdiction: "jurisdiction",
       district: "jurisdiction", county: "jurisdiction", countylocation: "jurisdiction",
       courtinformation: "court", primarycaselocation: "court",
-      caseCaption: "case_caption", caption: "case_caption",
+      casecaption: "case_caption", caption: "case_caption",
       courtcasenumber: "court_case_number",
       filingdate: "filing_date",
       nexthearing: "next_hearing_date", nexthearingdate: "next_hearing_date",
       pretrialconference: "next_hearing_date", trial: "next_hearing_date",
+      // Opposing
       opposingparty: "opposing_party",
       defendants: "opposing_party", plaintiffs: "opposing_party",
       opposingcounsel: "opposing_counsel", opposingcounsels: "opposing_counsel",
       opposingcounselfirm: "opposing_counsel_firm",
       opposingcounselemail: "opposing_counsel_email",
       opposingcounselphone: "opposing_counsel_phone",
-      leadattorney: "_assignedname", originatingattorney: "_originatingname",
+      // Attorneys
+      leadattorney: "_assignedname", leadattorney1: "_assignedname",
+      originatingattorney: "_originatingname",
+      // Money
       claimamount: "claim_amount", settlementamount: "settlement_amount",
       outstandingbalance: "claim_amount",
       casebalance: "claim_amount", ledgerbalance: "claim_amount",
@@ -232,6 +244,7 @@ const IMPORTERS: ImporterConfig[] = [
       flatfee: "flat_fee_amount",
       billingtype: "billing_method",
       soldate: "statute_of_limitations",
+      // Archive
       archived: "_archived", isarchived: "_archived",
     },
     numeric: ["claim_amount", "settlement_amount", "default_hourly_rate", "flat_fee_amount"],