diff --git a/THANKS b/THANKS
index f7004e7..3f1c19e 100644
--- a/THANKS
+++ b/THANKS
@@ -1,6 +1,8 @@
-DeWitt Clinton - Mac OSX
-Mary Gardiner - PythonPath
-Elias Torres - FOAF OnlineAccounts
+DeWitt Clinton  - Mac OSX
+Mary Gardiner   - PythonPath
+Elias Torres    - FOAF OnlineAccounts
+Jacques Distler - Template patches
+Michael Koziarski - HTTP Auth fix
 
 This codebase represents a radical refactoring of Planet 2.0, which lists
 the following contributors:
diff --git a/planet/spider.py b/planet/spider.py
index 87271e6..5dd7d2d 100644
--- a/planet/spider.py
+++ b/planet/spider.py
@@ -191,7 +191,7 @@ def spiderFeed(feed):
     elif data.status == 500:
        data.feed['planet_message'] = "internal server error"
     elif data.status >= 400:
-       data.feed['planet_message'] = "http status %s" % status
+       data.feed['planet_message'] = "http status %s" % data.status
 
     # perform user configured scrub operations on the data
     scrub(feed, data)
diff --git a/planet/splice.py b/planet/splice.py
index fed2504..bd20d2f 100644
--- a/planet/splice.py
+++ b/planet/splice.py
@@ -34,11 +34,20 @@ def splice():
     createTextElement(author, 'email', config.owner_email())
     feed.appendChild(author)
 
-    createTextElement(feed, 'id', config.feed())
-    link = doc.createElement('link')
-    link.setAttribute('rel', 'self')
-    link.setAttribute('href', config.feed())
-    feed.appendChild(link)
+    if config.feed():
+        createTextElement(feed, 'id', config.feed())
+        link = doc.createElement('link')
+        link.setAttribute('rel', 'self')
+        link.setAttribute('href', config.feed())
+        if config.feedtype():
+            link.setAttribute('type', "application/%s+xml" % config.feedtype())
+        feed.appendChild(link)
+
+    if config.link():
+        link = doc.createElement('link')
+        link.setAttribute('rel', 'alternate')
+        link.setAttribute('href', config.link())
+        feed.appendChild(link)
 
     # insert entry information
     for mtime,file in dir[:items]:
diff --git a/themes/asf/config.ini b/themes/asf/config.ini
index 6e43cc4..cb372e7 100644
--- a/themes/asf/config.ini
+++ b/themes/asf/config.ini
@@ -17,3 +17,4 @@ bill_of_materials:
   images/feed-icon-10x10.png
   images/opml.png
   images/foaf.png
+  images/venus.png
diff --git a/themes/asf/index.html.xslt b/themes/asf/index.html.xslt
index acb60e3..e6e5a89 100644
--- a/themes/asf/index.html.xslt
+++ b/themes/asf/index.html.xslt
@@ -15,7 +15,7 @@
         <meta name="robots" content="noindex,nofollow" />
         <meta name="generator" content="{atom:generator}" />
         <xsl:if test="atom:link[@rel='self']">
-          <link rel="alternate" href="{atom:link[@rel='self']/@uri}"
+          <link rel="alternate" href="{atom:link[@rel='self']/@href}"
             title="{atom:title}" type="{atom:link[@rel='self']/@type}" />
         </xsl:if>
         <link rel="shortcut icon" href="/favicon.ico" />
@@ -92,8 +92,8 @@
             <dt>Powered by:</dt>
             <dd>
               <a href="http://intertwingly.net/code/venus/">
-                <img src="images/planet.png" width="80" height="15"
-                  alt="Planet" border="0"/>
+                <img src="images/venus.png" width="80" height="15"
+                  alt="Venus" border="0"/>
               </a>
             </dd>
             <dt>Export:</dt>
@@ -212,7 +212,7 @@
         </xsl:attribute>
       </xsl:if>
       <xsl:attribute name="class">content</xsl:attribute>
-      <xsl:copy-of select="@*|node()"/>
+      <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
 
@@ -227,4 +227,15 @@
       <xsl:copy-of select="."/>
     </div>
   </xsl:template>
+
+  <!-- Feedburner detritus -->
+  <xsl:template match="xhtml:div[@class='feedflare']"/>
+
+  <!-- pass through everything else -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/themes/common/images/venus.png b/themes/common/images/venus.png
new file mode 100644
index 0000000..685035d
Binary files /dev/null and b/themes/common/images/venus.png differ
diff --git a/themes/mobile/config.ini b/themes/mobile/config.ini
index f98e0ce..920cfa6 100644
--- a/themes/mobile/config.ini
+++ b/themes/mobile/config.ini
@@ -20,3 +20,4 @@ bill_of_materials:
   images/feed-icon-10x10.png
   images/opml.png
   images/foaf.png
+  images/venus.png
diff --git a/themes/mobile/mobile.html.xslt b/themes/mobile/mobile.html.xslt
index 7d92a2e..62b2ff3 100644
--- a/themes/mobile/mobile.html.xslt
+++ b/themes/mobile/mobile.html.xslt
@@ -54,8 +54,8 @@
             <dt>Powered by:</dt>
             <dd>
               <a href="http://intertwingly.net/code/venus/">
-                <img src="images/planet.png" width="80" height="15"
-                  alt="Planet" border="0"/>
+                <img src="images/venus.png" width="80" height="15"
+                  alt="Venus" border="0"/>
               </a>
             </dd>
             <dt>Export:</dt>