diff --git a/cscweb.xsl b/cscweb.xsl
index e6d129a..0fa469e 100644
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:param name="g_date" required="yes" />
diff --git a/xsl/books.xsl b/xsl/books.xsl
index 8b07488..1e3a4c7 100644
--- a/xsl/books.xsl
+++ b/xsl/books.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="all-books">
diff --git a/xsl/common.xsl b/xsl/common.xsl
index 7d2d1b7..9e6ab86 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="cscpage">
diff --git a/xsl/directory.xsl b/xsl/directory.xsl
index 9b213d1..f9dca0e 100644
--- a/xsl/directory.xsl
+++ b/xsl/directory.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="directory">
diff --git a/xsl/events.xsl b/xsl/events.xsl
index 0f54831..7c490ef 100644
--- a/xsl/events.xsl
+++ b/xsl/events.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template name="events">
diff --git a/xsl/exec.xsl b/xsl/exec.xsl
index 17de9e6..5986e7b 100644
--- a/xsl/exec.xsl
+++ b/xsl/exec.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="execlist">
diff --git a/xsl/functions.xsl b/xsl/functions.xsl
index 2d91a73..e0ce8fe 100644
--- a/xsl/functions.xsl
+++ b/xsl/functions.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:function name="csc:term" as="xs:string">
diff --git a/xsl/media.xsl b/xsl/media.xsl
index 5805ca5..ca5d3a5 100644
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="mediafile">
@@ -51,10 +52,11 @@
   <xsl:param name="infotext" />
   <xsl:param name="mirror" />
   <xsl:param name="bittorrent" />
+  <xsl:variable name="realurl" select="fn:encode-for-uri(concat('http://csclub.uwaterloo.ca/media/', @title, '.html'))" />
   <xsl:result-document method="xml" encoding="ISO-8859-1" 
       doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" 
       doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-      href="{translate(concat($g_root, '/media/', @title , $suffix, '.html'), ' ', ' ')}">
+      href="{concat($g_root, '/media/', @title, $suffix, '.html')}">
     <html>
       <head>
         <title><xsl:value-of select="@title" /></title>
@@ -94,14 +96,21 @@
             </xsl:if>
           </strong></div>
         </xsl:if>
-        <xsl:if test="@buttons">
+        <xsl:if test="@buttons = 'yes'">
           <br/><br/>
           <!-- digg button -->
+          <script type="text/javascript">
+            digg_url = '<xsl:value-of select="$realurl" />';
+          </script>
           <script src="http://digg.com/tools/diggthis.js"
                   type="text/javascript"><xsl:text> </xsl:text></script>
           <!-- reddit button -->
-          <script type="text/javascript" 
-                  src="http://reddit.com/button.js?t=3"><xsl:text> </xsl:text></script>
+          <script type="text/javascript">
+            reddit_url = '<xsl:value-of select="$realurl" />';
+            reddit_title = '<xsl:value-of select="@title" />';
+          </script>
+          <script src="http://reddit.com/button.js?t=3"
+                  type="text/javascript"><xsl:text> </xsl:text></script>
         </xsl:if>
         <xsl:if test="other">
         <div>
@@ -111,7 +120,7 @@
         <br/>
         <!-- AddThis Bookmark Button -->
         <script type="text/javascript">
-          addthis_url    = location.href;
+          addthis_url    = '<xsl:value-of select="$realurl" />';
           addthis_title  = document.title;
           addthis_pub    = 'calumt';
         </script>
diff --git a/xsl/members.xsl b/xsl/members.xsl
index d9ec509..33f3486 100644
--- a/xsl/members.xsl
+++ b/xsl/members.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="members-this-term">
diff --git a/xsl/menu.xsl b/xsl/menu.xsl
index 6602144..ebdc7ec 100644
--- a/xsl/menu.xsl
+++ b/xsl/menu.xsl
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
     xmlns:csc="http://www.csclub.uwaterloo.ca/xslt">
 
 <xsl:template match="menuitem">
