diff --git a/api/sitemap.xml.ts b/api/sitemap.xml.ts
index f591ed8b2d..721eaac296 100644
--- a/api/sitemap.xml.ts
+++ b/api/sitemap.xml.ts
@@ -2,7 +2,7 @@ import { NextApiRequest, NextApiResponse } from 'next'
 
 import { SiteMap } from '../lib/types'
 import { host } from '../lib/config'
-import { getSiteMaps } from '../lib/get-site-maps'
+import { getSiteMap } from '../lib/get-site-map'
 
 export default async (
   req: NextApiRequest,
@@ -12,7 +12,7 @@ export default async (
     return res.status(405).send({ error: 'method not allowed' })
   }
 
-  const siteMaps = await getSiteMaps()
+  const siteMap = await getSiteMap()
 
   // cache sitemap for up to one hour
   res.setHeader(
@@ -20,7 +20,7 @@ export default async (
     'public, s-maxage=3600, max-age=3600, stale-while-revalidate=3600'
   )
   res.setHeader('Content-Type', 'text/xml')
-  res.write(createSitemap(siteMaps[0]))
+  res.write(createSitemap(siteMap))
   res.end()
 }
 
diff --git a/components/Footer.tsx b/components/Footer.tsx
index 5707d16a9c..2de159e330 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -26,8 +26,7 @@ export const Footer: React.FC<{
 
   return (
     <footer className={styles.footer}>
-      <div className={styles.copyright}>Copyright 2021 {config.author}</div>
-
+    <div className={styles.copyright}>Copyright {new Date().getFullYear()} {config.author}</div>
       {hasMounted ? (
         <div className={styles.settings}>
           <a
diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx
index 266717b51c..f925578d3f 100644
--- a/components/NotionPage.tsx
+++ b/components/NotionPage.tsx
@@ -38,6 +38,7 @@ import { ReactUtterances } from './ReactUtterances'
 
 import styles from './styles.module.css'
 
+// NOTE: if your site doesn't use these, then we recommend switching them to load lazily
 // const Code = dynamic(() =>
 //   import('react-notion-x').then((notion) => notion.Code)
 // )
@@ -59,10 +60,6 @@ const Equation = dynamic(() =>
   import('react-notion-x').then((notion) => notion.Equation)
 )
 
-// we're now using a much lighter-weight tweet renderer react-static-tweets
-// instead of the official iframe-based embed widget from twitter
-// const Tweet = dynamic(() => import('react-tweet-embed'))
-
 const Modal = dynamic(
   () => import('react-notion-x').then((notion) => notion.Modal),
   { ssr: false }
@@ -108,7 +105,7 @@ export const NotionPage: React.FC<types.PageProps> = ({
   })
 
   if (!config.isServer) {
-    // add important objects to the window global for easy debugging
+    // add important variables to the global window object for easy debugging
     const g = window as any
     g.pageId = pageId
     g.recordMap = recordMap
@@ -122,6 +119,9 @@ export const NotionPage: React.FC<types.PageProps> = ({
 
   // const isRootPage =
   //   parsePageId(block.id) === parsePageId(site.rootNotionPageId)
+
+  // this is all very customizable logic depending on the contents and
+  // structure of your site
   const isBlogPost =
     block.type === 'page' && block.parent_table === 'collection'
   const showTableOfContents = !!isBlogPost
@@ -170,7 +170,7 @@ export const NotionPage: React.FC<types.PageProps> = ({
         }
       }}
     >
-      <PageHead site={site} />
+      <PageHead />
 
       <Head>
         <meta property='og:title' content={title} />
diff --git a/components/Page404.tsx b/components/Page404.tsx
index ae933e85de..65dc499be1 100644
--- a/components/Page404.tsx
+++ b/components/Page404.tsx
@@ -6,11 +6,11 @@ import { PageHead } from './PageHead'
 import styles from './styles.module.css'
 
 export const Page404: React.FC<types.PageProps> = ({ site, pageId, error }) => {
-  const title = site?.name || 'Notion Page Not Found'
+  const title = site?.name ? `${site.name} Page Not Found` : 'Page Not Found'
 
   return (
     <>
-      <PageHead site={site} />
+      <PageHead />
 
       <Head>
         <meta property='og:site_name' content={title} />
diff --git a/components/PageHead.tsx b/components/PageHead.tsx
index 4072159fde..22096bfb64 100644
--- a/components/PageHead.tsx
+++ b/components/PageHead.tsx
@@ -1,10 +1,7 @@
+import React from 'react'
 import Head from 'next/head'
-import * as React from 'react'
-import * as types from 'lib/types'
 
-// TODO: remove duplication between PageHead and NotionPage Head
-
-export const PageHead: React.FC<types.PageProps> = ({ site }) => {
+export const PageHead = () => {
   return (
     <Head>
       <meta charSet='utf-8' />
@@ -13,16 +10,6 @@ export const PageHead: React.FC<types.PageProps> = ({ site }) => {
         name='viewport'
         content='width=device-width, initial-scale=1, shrink-to-fit=no'
       />
-
-      {site?.description && (
-        <>
-          <meta name='description' content={site.description} />
-          <meta property='og:description' content={site.description} />
-        </>
-      )}
-
-      <meta name='theme-color' content='#EB625A' />
-      <meta property='og:type' content='website' />
     </Head>
   )
 }
diff --git a/lib/canonical-page-map-cache.ts b/lib/canonical-page-map-cache.ts
new file mode 100644
index 0000000000..ed1d373309
--- /dev/null
+++ b/lib/canonical-page-map-cache.ts
@@ -0,0 +1,5 @@
+import { CanonicalPageMap } from './types'
+
+export const getCanonicalPageMapCache = async (): Promise<CanonicalPageMap> => {
+  // TODO
+}
diff --git a/lib/cloudflare-kv.ts b/lib/cloudflare-kv.ts
new file mode 100644
index 0000000000..e18bf8e4db
--- /dev/null
+++ b/lib/cloudflare-kv.ts
@@ -0,0 +1,99 @@
+import fetch from 'node-fetch'
+
+export class CloudflareKV {
+  accountId: string
+  apiKey: string
+  namespaceId: string
+  _headers: any
+
+  constructor({
+    accountId,
+    apiKey,
+    namespaceId
+  }: {
+    accountId: string
+    apiKey: string
+    namespaceId: string
+  }) {
+    this.accountId = accountId
+    this.apiKey = apiKey
+    this.namespaceId = namespaceId
+
+    this._headers = {
+      Authorization: `Bearer ${this.apiKey}`
+    }
+  }
+
+  async get(key: string) {
+    const url = this._getUrl(key)
+    const headers = this._headers
+
+    const res = await fetch(url, {
+      headers
+    })
+
+    if (res.ok) {
+      return res.text()
+    } else if (res.status === 404) {
+      return undefined
+    } else {
+      const body = await res.text()
+
+      throw new Error(`Error ${res.status} ${body}`)
+    }
+  }
+
+  async put(
+    key: string,
+    value,
+    {
+      expiration,
+      expirationTtl
+    }: {
+      expiration?: number
+      expirationTtl?: number
+    } = {}
+  ) {
+    const url = new URL(this._getUrl(key))
+    const headers = this._headers
+    const query: any = {}
+
+    if (expiration) {
+      query.expiration = expiration
+    }
+
+    if (expirationTtl) {
+      query.expiration_ttl = Math.max(60, expirationTtl)
+    }
+
+    url.search = new URLSearchParams(query).toString()
+    const res = await fetch(url.toString(), {
+      method: 'PUT',
+      body: value,
+      headers
+    })
+
+    console.log('CLOUDFLARE PUT', { key, value, ok: res.ok })
+    if (!res.ok) {
+      console.log(await res.text())
+    }
+    return res.ok
+  }
+
+  async delete(key: string): Promise<boolean> {
+    const url = this._getUrl(key)
+    const headers = this._headers
+
+    const res = await fetch(url, {
+      method: 'DELETE',
+      headers
+    })
+
+    return res.ok
+  }
+
+  _getUrl(key: string) {
+    const { accountId, namespaceId } = this
+    return `https://api.cloudflare.com/client/v4/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`
+  }
+}
diff --git a/lib/get-all-pages.ts b/lib/get-all-pages.ts
index 44a4c30a5c..6331d88c95 100644
--- a/lib/get-all-pages.ts
+++ b/lib/get-all-pages.ts
@@ -1,5 +1,6 @@
 import pMemoize from 'p-memoize'
 import { getAllPagesInSpace } from 'notion-utils'
+import stringify from 'fast-json-stable-stringify'
 
 import * as types from './types'
 import { includeNotionIdInUrls } from './config'
@@ -8,16 +9,38 @@ import { getCanonicalPageId } from './get-canonical-page-id'
 
 const uuid = !!includeNotionIdInUrls
 
-export const getAllPages = pMemoize(getAllPagesImpl, { maxAge: 60000 * 5 })
+export const getAllPages = pMemoize(getAllPagesImpl, {
+  maxAge: 60000 * 5,
+  cacheKey: (args) => stringify(args)
+})
 
 export async function getAllPagesImpl(
   rootNotionPageId: string,
-  rootNotionSpaceId: string
-): Promise<Partial<types.SiteMap>> {
+  rootNotionSpaceId: string,
+  {
+    concurrency = 4,
+    pageConcurrency = 3,
+    full = false,
+    targetPageId = null
+  }: {
+    concurrency?: number
+    pageConcurrency?: number
+    full?: boolean
+    targetPageId?: string
+  } = {}
+): Promise<types.PartialSiteMap> {
   const pageMap = await getAllPagesInSpace(
     rootNotionPageId,
     rootNotionSpaceId,
-    notion.getPage.bind(notion)
+    (pageId: string) =>
+      notion.getPage(pageId, {
+        signFileUrls: full,
+        concurrency: pageConcurrency
+      }),
+    {
+      concurrency,
+      targetPageId
+    }
   )
 
   const canonicalPageMap = Object.keys(pageMap).reduce(
diff --git a/lib/get-preview-images.ts b/lib/get-preview-images.ts
index 502f765454..49d47a3e11 100644
--- a/lib/get-preview-images.ts
+++ b/lib/get-preview-images.ts
@@ -28,22 +28,28 @@ export async function getPreviewImages(
   }
 
   const imageDocs = await db.db.getAll(...imageDocRefs)
-  const results = await pMap(imageDocs, async (model, index) => {
-    if (model.exists) {
-      return model.data() as types.PreviewImage
-    } else {
-      const json = {
-        url: images[index],
-        id: model.id
-      }
-      console.log('createPreviewImage server-side', json)
+  const results = await pMap(
+    imageDocs,
+    async (model, index) => {
+      if (model.exists) {
+        return model.data() as types.PreviewImage
+      } else {
+        const json = {
+          url: images[index],
+          id: model.id
+        }
+        console.log('createPreviewImage server-side', json)
 
-      // TODO: should we fire and forget here to speed up builds?
-      return got
-        .post(api.createPreviewImage, { json })
-        .json() as Promise<types.PreviewImage>
+        // TODO: should we fire and forget here to speed up builds?
+        return got
+          .post(api.createPreviewImage, { json })
+          .json() as Promise<types.PreviewImage>
+      }
+    },
+    {
+      concurrency: 16
     }
-  })
+  )
 
   return results
     .filter(Boolean)
diff --git a/lib/get-site-map.ts b/lib/get-site-map.ts
new file mode 100644
index 0000000000..50dd21dae6
--- /dev/null
+++ b/lib/get-site-map.ts
@@ -0,0 +1,31 @@
+import { getAllPages } from './get-all-pages'
+import { getSiteForDomain } from './get-site-for-domain'
+import * as config from './config'
+import * as types from './types'
+
+export async function getSiteMap({
+  concurrency = 4,
+  pageConcurrency = 3,
+  full = false
+}: {
+  concurrency?: number
+  pageConcurrency?: number
+  full?: boolean
+} = {}): Promise<types.SiteMap> {
+  const site = await getSiteForDomain(config.domain)
+
+  const siteMap = await getAllPages(
+    site.rootNotionPageId,
+    site.rootNotionSpaceId,
+    {
+      concurrency,
+      pageConcurrency,
+      full
+    }
+  )
+
+  return {
+    site,
+    ...siteMap
+  }
+}
diff --git a/lib/get-site-maps.ts b/lib/get-site-maps.ts
deleted file mode 100644
index 55173da1a2..0000000000
--- a/lib/get-site-maps.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import pMap from 'p-map'
-
-import { getAllPages } from './get-all-pages'
-import { getSites } from './get-sites'
-import * as types from './types'
-
-export async function getSiteMaps(): Promise<types.SiteMap[]> {
-  const sites = await getSites()
-
-  const siteMaps = await pMap(
-    sites,
-    async (site, index) => {
-      try {
-        console.log(
-          'getSiteMap',
-          `${index + 1}/${sites.length}`,
-          `(${(((index + 1) / sites.length) * 100) | 0}%)`,
-          site
-        )
-
-        return {
-          site,
-          ...(await getAllPages(site.rootNotionPageId, site.rootNotionSpaceId))
-        } as types.SiteMap
-      } catch (err) {
-        console.warn('site build error', index, site, err)
-      }
-    },
-    {
-      concurrency: 4
-    }
-  )
-
-  return siteMaps.filter(Boolean)
-}
diff --git a/lib/get-sites.ts b/lib/get-sites.ts
deleted file mode 100644
index e9c8b31bb7..0000000000
--- a/lib/get-sites.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { getSiteForDomain } from './get-site-for-domain'
-import * as config from './config'
-import * as types from './types'
-
-export async function getSites(): Promise<types.Site[]> {
-  return [await getSiteForDomain(config.domain)]
-}
diff --git a/lib/resolve-notion-page.ts b/lib/resolve-notion-page.ts
index a048cf5203..92d09d9e86 100644
--- a/lib/resolve-notion-page.ts
+++ b/lib/resolve-notion-page.ts
@@ -5,22 +5,22 @@ import * as acl from './acl'
 import * as types from './types'
 import { pageUrlOverrides, pageUrlAdditions } from './config'
 import { getPage } from './notion'
-import { getSiteMaps } from './get-site-maps'
+import { getSiteMap } from './get-site-map'
 import { getSiteForDomain } from './get-site-for-domain'
 
-export async function resolveNotionPage(domain: string, rawPageId?: string) {
-  let site: types.Site
+export async function resolveNotionPage(domain: string, rawPageUri?: string) {
   let pageId: string
+  let site: types.Site
   let recordMap: ExtendedRecordMap
 
-  if (rawPageId && rawPageId !== 'index') {
-    pageId = parsePageId(rawPageId)
+  if (rawPageUri && rawPageUri !== 'index') {
+    pageId = parsePageId(rawPageUri)
 
     if (!pageId) {
       // check if the site configuration provides an override of a fallback for
       // the page's URI
       const override =
-        pageUrlOverrides[rawPageId] || pageUrlAdditions[rawPageId]
+        pageUrlOverrides[rawPageUri] || pageUrlAdditions[rawPageUri]
 
       if (override) {
         pageId = parsePageId(override)
@@ -37,10 +37,9 @@ export async function resolveNotionPage(domain: string, rawPageId?: string) {
       recordMap = resources[1]
     } else {
       // handle mapping of user-friendly canonical page paths to Notion page IDs
-      // e.g., /developer-x-entrepreneur versus /71201624b204481f862630ea25ce62fe
-      const siteMaps = await getSiteMaps()
-      const siteMap = siteMaps[0]
-      pageId = siteMap.canonicalPageMap[rawPageId]
+      // e.g., /foo versus /71201624b204481f862630ea25ce62fe
+      const siteMap = await getSiteMap()
+      pageId = siteMap?.canonicalPageMap?.[rawPageUri]
 
       if (pageId) {
         // TODO: we're not re-using the site from siteMaps because it is
@@ -58,13 +57,14 @@ export async function resolveNotionPage(domain: string, rawPageId?: string) {
       } else {
         return {
           error: {
-            message: `Not found "${rawPageId}"`,
+            message: `Not found "${rawPageUri}"`,
             statusCode: 404
           }
         }
       }
     }
   } else {
+    // resolve the site's home page
     site = await getSiteForDomain(domain)
     pageId = site.rootNotionPageId
 
diff --git a/lib/types.ts b/lib/types.ts
index 3ac70f05a3..f72b16c8b4 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -50,7 +50,13 @@ export interface SiteMap {
   canonicalPageMap: CanonicalPageMap
 }
 
+export interface PartialSiteMap {
+  pageMap: PageMap
+  canonicalPageMap: CanonicalPageMap
+}
+
 export interface CanonicalPageMap {
+  // inverse page mapping from canonial path to page id
   [canonicalPageId: string]: string
 }
 
diff --git a/package.json b/package.json
index 13823a88bd..d6364e6908 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "chrome-aws-lambda": "^5.5.0",
     "classnames": "^2.2.6",
     "dangerously-set-html-content": "^1.0.8",
+    "fast-json-stable-stringify": "^2.1.0",
     "fathom-client": "^3.0.0",
     "got": "^11.8.1",
     "isomorphic-unfetch": "^3.1.0",
diff --git a/pages/[pageId].tsx b/pages/[pageId].tsx
index 15a093f35d..8a8202f061 100644
--- a/pages/[pageId].tsx
+++ b/pages/[pageId].tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { isDev, domain } from 'lib/config'
-import { getSiteMaps } from 'lib/get-site-maps'
+import { getSiteMap } from 'lib/get-site-map'
 import { resolveNotionPage } from 'lib/resolve-notion-page'
 import { NotionPage } from 'components'
 
@@ -36,22 +36,18 @@ export async function getStaticPaths() {
     }
   }
 
-  const siteMaps = await getSiteMaps()
+  const siteMap = await getSiteMap()
+  const paths = Object.keys(siteMap.canonicalPageMap).map((pageId) => ({
+    params: {
+      pageId
+    }
+  }))
+  console.log(paths)
 
-  const ret = {
-    paths: siteMaps.flatMap((siteMap) =>
-      Object.keys(siteMap.canonicalPageMap).map((pageId) => ({
-        params: {
-          pageId
-        }
-      }))
-    ),
-    // paths: [],
+  return {
+    paths,
     fallback: true
   }
-
-  console.log(ret.paths)
-  return ret
 }
 
 export default function NotionDomainDynamicPage(props) {
diff --git a/site.config.js b/site.config.js
index c0e7683b18..b3fe02f1aa 100644
--- a/site.config.js
+++ b/site.config.js
@@ -39,6 +39,11 @@ module.exports = {
   // variables specified in .env.example
   isPreviewImageSupportEnabled: false,
 
+  // whether or not to include notion IDs as suffixes in URLs
+  // NOTE: this will make incremental SSG much faster with the downside of
+  // having less pretty URLs
+  includeNotionIdInUrls: false,
+
   // map of notion page IDs to URL paths (optional)
   // any pages defined here will override their default URL paths
   // example:
diff --git a/yarn.lock b/yarn.lock
index 709b29deb1..91e0604397 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2226,7 +2226,7 @@ fast-glob@^3.1.1:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
