diff --git a/functions/src/create-notification.ts b/functions/src/create-notification.ts
index 7601789e..356ad200 100644
--- a/functions/src/create-notification.ts
+++ b/functions/src/create-notification.ts
@@ -96,6 +96,7 @@ export const createNotification = async (
       if (!sendToEmail) continue
 
       if (reason === 'your_contract_closed' && privateUser && sourceContract) {
+        // TODO: include number and names of bettors waiting for creator to resolve their market
         await sendMarketCloseEmail(
           reason,
           sourceUser,
@@ -287,6 +288,7 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     }
     if (sendToEmail) {
       if (sourceType === 'comment') {
+        // TODO: change subject of email title to be more specific, i.e.: replied to you on/tagged you on/comment
         await sendNewCommentEmail(
           reason,
           privateUser,
diff --git a/functions/src/email-templates/500-mana.html b/functions/src/email-templates/500-mana.html
index 8ba5f114..c8f6a171 100644
--- a/functions/src/email-templates/500-mana.html
+++ b/functions/src/email-templates/500-mana.html
@@ -285,7 +285,7 @@
                                           <div
                                             style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
                                             <p style="margin: 10px 0;">This e-mail has been sent to {{name}},
-                                              <a href="{{unsubscribeLink}}" style="
+                                              <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/creating-market.html b/functions/src/email-templates/creating-market.html
index 1b6f1849..5599bedd 100644
--- a/functions/src/email-templates/creating-market.html
+++ b/functions/src/email-templates/creating-market.html
@@ -490,7 +490,7 @@
                                     ">
                                             <p style="margin: 10px 0">
                                               This e-mail has been sent to {{name}},
-                                              <a href="{{unsubscribeLink}}" style="
+                                              <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/interesting-markets.html b/functions/src/email-templates/interesting-markets.html
index 5418e377..7c3e653d 100644
--- a/functions/src/email-templates/interesting-markets.html
+++ b/functions/src/email-templates/interesting-markets.html
@@ -440,7 +440,7 @@
                                                                                     <p style="margin: 10px 0">
                                                                                         This e-mail has been sent to
                                                                                         {{name}},
-                                                                                        <a href="{{unsubscribeLink}}" style="
+                                                                                        <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/market-answer-comment.html b/functions/src/email-templates/market-answer-comment.html
index 175c465e..a19aa7c3 100644
--- a/functions/src/email-templates/market-answer-comment.html
+++ b/functions/src/email-templates/market-answer-comment.html
@@ -526,7 +526,7 @@
                       "
                       >our Discord</a
                     >! Or,
-                    <a href="{{unsubscribeLink}}" style="
+                    <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/market-answer.html b/functions/src/email-templates/market-answer.html
index 96a11771..b2d7f727 100644
--- a/functions/src/email-templates/market-answer.html
+++ b/functions/src/email-templates/market-answer.html
@@ -366,7 +366,7 @@
                         text-decoration: underline;
                         margin: 0;
                       ">our Discord</a>! Or,
-                  <a href="{{unsubscribeLink}}" style="
+                  <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/market-close.html b/functions/src/email-templates/market-close.html
index 45a888ac..ee7976b0 100644
--- a/functions/src/email-templates/market-close.html
+++ b/functions/src/email-templates/market-close.html
@@ -484,7 +484,7 @@
                         text-decoration: underline;
                         margin: 0;
                       ">our Discord</a>! Or,
-                  <a href="{{unsubscribeLink}}" style="
+                  <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/market-comment.html b/functions/src/email-templates/market-comment.html
index 73849989..23e20dac 100644
--- a/functions/src/email-templates/market-comment.html
+++ b/functions/src/email-templates/market-comment.html
@@ -366,7 +366,7 @@
                         text-decoration: underline;
                         margin: 0;
                       ">our Discord</a>! Or,
-                  <a href="{{unsubscribeLink}}" style="
+                  <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/market-resolved.html b/functions/src/email-templates/market-resolved.html
index b9d215fa..de29a0f1 100644
--- a/functions/src/email-templates/market-resolved.html
+++ b/functions/src/email-templates/market-resolved.html
@@ -499,7 +499,7 @@
                         text-decoration: underline;
                         margin: 0;
                       ">our Discord</a>! Or,
-                  <a href="{{unsubscribeLink}}" style="
+                  <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/one-week.html b/functions/src/email-templates/one-week.html
index d8c3df73..b8e233d5 100644
--- a/functions/src/email-templates/one-week.html
+++ b/functions/src/email-templates/one-week.html
@@ -280,7 +280,7 @@
                                     ">
                                   <p style="margin: 10px 0">
                                     This e-mail has been sent to {{name}},
-                                    <a href="{{unsubscribeLink}}" style="
+                                    <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/thank-you.html b/functions/src/email-templates/thank-you.html
index 78a7af26..7ac72d0a 100644
--- a/functions/src/email-templates/thank-you.html
+++ b/functions/src/email-templates/thank-you.html
@@ -215,7 +215,7 @@
                                                                     style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
                                                                     <p style="margin: 10px 0;">This e-mail has been sent
                                                                         to {{name}},
-                                                                        <a href="{{unsubscribeLink}}" style="
+                                                                        <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/email-templates/welcome.html b/functions/src/email-templates/welcome.html
index 189dd2e9..dccec695 100644
--- a/functions/src/email-templates/welcome.html
+++ b/functions/src/email-templates/welcome.html
@@ -287,7 +287,7 @@
                                           <div
                                             style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
                                             <p style="margin: 10px 0;">This e-mail has been sent to {{name}},
-                                              <a href="{{unsubscribeLink}}" style="
+                                              <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
                                         " target="_blank">click here to manage your notifications</a>.
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index 47169dbb..b9d34363 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -153,7 +153,7 @@ export const sendWelcomeEmail = async (
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const unsubscribeLink = `${DOMAIN}/notifications?tab=settings&section=${
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
     'onboarding_flow' as keyof notification_subscription_types
   }`
 
@@ -163,7 +163,7 @@ export const sendWelcomeEmail = async (
     'welcome',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -221,7 +221,7 @@ export const sendOneWeekBonusEmail = async (
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const unsubscribeLink = `${DOMAIN}/notifications?tab=settings&section=${
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
     'onboarding_flow' as keyof notification_subscription_types
   }`
   return await sendTemplateEmail(
@@ -230,7 +230,7 @@ export const sendOneWeekBonusEmail = async (
     'one-week',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
       manalink: 'https://manifold.markets/link/lj4JbBvE',
     },
     {
@@ -254,7 +254,7 @@ export const sendCreatorGuideEmail = async (
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const unsubscribeLink = `${DOMAIN}/notifications?tab=settings&section=${
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
     'onboarding_flow' as keyof notification_subscription_types
   }`
   return await sendTemplateEmail(
@@ -263,7 +263,7 @@ export const sendCreatorGuideEmail = async (
     'creating-market',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -288,7 +288,7 @@ export const sendThankYouEmail = async (
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const unsubscribeLink = `${DOMAIN}/notifications?tab=settings&section=${
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
     'thank_you_for_purchases' as keyof notification_subscription_types
   }`
 
@@ -298,7 +298,7 @@ export const sendThankYouEmail = async (
     'thank-you',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -479,7 +479,7 @@ export const sendInterestingMarketsEmail = async (
     'interesting-markets',
     {
       name: firstName,
-      unsubscribeLink: unsubscribeUrl,
+      unsubscribeUrl,
 
       question1Title: contractsToSend[0].question,
       question1Link: contractUrl(contractsToSend[0]),