diff --git a/_includes/default_head_tags.html b/_includes/default_head_tags.html
index 2b366a3..0cc0093 100644
--- a/_includes/default_head_tags.html
+++ b/_includes/default_head_tags.html
@@ -35,8 +35,8 @@
 <!-- Description tags -->
 {% if page.excerpt %}
 <!-- HTML Meta Tag Description -->
-<meta name="description" content="{{page.excerpt | strip_html | strip}}">
-<meta property="og:description" content="{{page.excerpt | strip_html | strip}}">
+<meta name="description" content="{{page.excerpt | strip_html | strip | xml_escape}}">
+<meta property="og:description" content="{{page.excerpt | strip_html | strip | xml_escape}}">
 {% endif %}
 
 <!-- Image preview tags -->
@@ -62,7 +62,7 @@
 
 <meta property="og:image" content="{{image | absolute_url}}">
   {% if alt %} <!-- Note og:image:alt must immediately follow og:image tag -->
-  <meta property="og:image:alt" content="{{alt | strip}}">
+  <meta property="og:image:alt" content="{{alt | xml_escape }}">
   {% endif %}
 {% endif %}
 
diff --git a/_includes/footer.html b/_includes/footer.html
index 6a39576..3d332db 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -10,5 +10,6 @@
      <section class = "webring">
         <a href="https://xn--sr8hvo.ws/previous">←</a>
         An <a href="https://xn--sr8hvo.ws">IndieWeb Webring</a>
-        <a href="https://xn--sr8hvo.ws/next">→</a><section>
+        <a href="https://xn--sr8hvo.ws/next">→</a>
+     </section>
 </footer>
\ No newline at end of file
diff --git a/_includes/icons/mastodon.svg b/_includes/icons/mastodon.svg
index 41067ca..96a2be3 100644
--- a/_includes/icons/mastodon.svg
+++ b/_includes/icons/mastodon.svg
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   class="invertable"
-   width="61.076954mm"
-   height="65.47831mm"
-   viewBox="0 0 216.4144 232.00976"
-   version="1.1"
-   id="svg1824"
-   sodipodi:docname="mastodon.svg"
-   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+    class="invertable"
+    width="61.076954mm"
+    height="65.47831mm"
+    viewBox="0 0 216.4144 232.00976"
+    version="1.1"
+    id="svg1824"
+    sodipodi:docname="mastodon.svg"
+    inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs1828" />
   <sodipodi:namedview
diff --git a/_includes/icons/rss.svg b/_includes/icons/rss.svg
index 836ca35..80ce3cf 100644
--- a/_includes/icons/rss.svg
+++ b/_includes/icons/rss.svg
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   class="invertable"
-   role="img"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg1094"
-   sodipodi:docname="rss.svg"
-   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+    class="invertable"
+    role="img"
+    viewBox="0 0 24 24"
+    version="1.1"
+    id="svg1094"
+    sodipodi:docname="rss.svg"
+    inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs1098" />
   <sodipodi:namedview
diff --git a/_layouts/post.html b/_layouts/post.html
index 00ae638..21c1bdd 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -37,7 +37,7 @@
                 {{ page.social_text | default_mastodon_text }}
                 <img src = "{{ page.social_image }}"
                     class = "u-featured"
-                    alt="{{page.alt | smartify}}">
+                    alt="{{page.alt | xml_escape }}">
             </div>
             <div class="e-content">
             {{ content }}
@@ -46,8 +46,8 @@
         {% if page.commentid %}  
         <div id="comments" class="comments">
             <h2>Comments</h2>
-        {% endif %}
         </div>
+        {% endif %}
     </main>
     {% include footer.html %}
   </body>