diff --git a/prestatic/template.html b/prestatic/template.html
index ea52f62..1af322e 100644
--- a/prestatic/template.html
+++ b/prestatic/template.html
@@ -1,6 +1,6 @@
 <!--@exec
-page.title = html_escape_transform(run_macros(page.title))
-page.summary = html_escape_transform(run_macros(page.summary))
+page.title = run_macros(page.title)
+page.summary = run_macros(page.summary)
 @--><?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.1//EN'
           'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'>
@@ -34,8 +34,8 @@ page.summary = html_escape_transform(run_macros(page.summary))
     <meta name='DCTERMS.description' content='<!--@eval page.summary@-->' />
     <meta name='DCTERMS.creator' content='Niels Serup' />
     <meta name='DCTERMS.format' content='application/xhtml+xml' />
-    <meta name='DCTERMS.created' content='<!--@eval page.created@-->' />
-    <meta name='DCTERMS.modified' content='<!--@eval page.modified@-->' />
+    <meta name='DCTERMS.created' content='<!--@eval page.created_rfc3339@-->' />
+    <meta name='DCTERMS.modified' content='<!--@eval page.modified_rfc3339@-->' />
     <meta name='DCTERMS.language' content='en' />
     <meta name='DCTERMS.isPartOf' content='http://metanohi.org/' />
     <meta name='DCTERMS.isVersionOf' content='<!--@eval page.core_url@-->' />
@@ -44,9 +44,9 @@ page.summary = html_escape_transform(run_macros(page.summary))
     <meta name='DCTERMS.audience' content='individuals' />
 <!--@exec
 if page.licenses:
-    for x in page.licenses:
+    for x in filter(lambda x: x.url, page.licenses):
         print("""<link rel='copyright' href='{x.url}' />
-<meta name='DCTERMS.license' content='{x.url}' />""").format(x=x)@-->
+<meta name='DCTERMS.license' content='{x.url}' />""".format(x=x))@-->
     <meta name='robots' content='ALL' />
     <link rel='icon' type='image/png' href='/favicon.png' />
     <!--
diff --git a/rules.mege b/rules.mege
index f9e7e63..d68c34c 100644
--- a/rules.mege
+++ b/rules.mege
@@ -13,3 +13,6 @@ template template.html
 # Convert the static parts of HTML, CSS, and JS files
 convert prestatic/*.{css,js} static/
 convert prestatic/template.html .
+
+# Redirects (in site/)
+redirect mege projects/mege/
diff --git a/site/projects/mege/test.org b/site/projects/mege/test/basics.org
similarity index 98%
rename from site/projects/mege/test.org
rename to site/projects/mege/test/basics.org
index 6816ec7..6fb4a36 100644
--- a/site/projects/mege/test.org
+++ b/site/projects/mege/test/basics.org
@@ -1,4 +1,4 @@
-#+title: Test of mege features
+#+title: Test of basic mege features
 #&summary
 Test of many features
 #&
diff --git a/sitespecial/listdir.org b/sitespecial/listdir.org
index 5247a59..a28426d 100644
--- a/sitespecial/listdir.org
+++ b/sitespecial/listdir.org
@@ -1,5 +1,6 @@
 #+title: Directory listing: <@eval page.core_url@>
 
-#&deval
+#++deval
+#+BEGIN_SRC
 page.dirlist
-#&
+#+END_SRC
diff --git a/sitespecial/notfound.org b/sitespecial/notfound.org
index 8d1cf66..2e9cf20 100644
--- a/sitespecial/notfound.org
+++ b/sitespecial/notfound.org
@@ -1,7 +1,5 @@
 #+title: Error: Page not found
 
-The page <@deval repr(page.core_url)@> does not exist. The error was:
+* <@deval page.error@>
 
-#&block
-<@deval page.error@>
-#&
+The page <@deval repr(page.core_url)@> does not exist.
diff --git a/sitespecial/servererror.org b/sitespecial/servererror.org
index 50095f7..34b81a6 100644
--- a/sitespecial/servererror.org
+++ b/sitespecial/servererror.org
@@ -2,6 +2,4 @@
 
 There was an error, most likely due to sloppy programming:
 
-#&block
 <@deval page.error@>
-#&
diff --git a/sitespecial/showrevs.org b/sitespecial/showrevs.org
new file mode 100644
index 0000000..1cf9d1f
--- /dev/null
+++ b/sitespecial/showrevs.org
@@ -0,0 +1,5 @@
+#+title: Revisions for <@deval repr(page.path_shown)@>
+
+* Revisions for <@deval repr(page.path_shown)@>
+
+<@deval page.revisions@>
