diff --git a/layouts/partials/page-content/auto-h1-description.html b/layouts/partials/page-content/auto-h1-description.html
index f9d1d14..3b9b9ca 100644
--- a/layouts/partials/page-content/auto-h1-description.html
+++ b/layouts/partials/page-content/auto-h1-description.html
@@ -1,4 +1,7 @@
-{{- $isEmptyContent := eq (len .Content) 0 -}} {{/* (not .File) */}}
+{{- $isEmptyContent := true -}}
+{{- with .Content -}} {{/* avoid nil pointer err on (len .Content). this happens if a shortcode malfunctions and hides real error info. */}}
+    {{- $isEmptyContent = eq (len .) 0 -}} {{/* (not .File) */}}
+{{- end -}}
 {{- $showOnlyOnEmpty := .Param "show_auto_heading_only_on_empty_content" | default true -}}
 {{- if eq $isEmptyContent $showOnlyOnEmpty -}}
     {{- $showListTitle := and .IsNode (.Param "list_show_auto_title" | default true) -}}
diff --git a/layouts/shortcodes/figure-asset.html b/layouts/shortcodes/figure-asset.html
index 19c572e..9cc08a9 100644
--- a/layouts/shortcodes/figure-asset.html
+++ b/layouts/shortcodes/figure-asset.html
@@ -18,7 +18,7 @@
     {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
         <figcaption>
             {{ with (.Get "title") -}}
-                <h4>{{ . }}</h4>
+                <h6>{{ . }}</h6>
             {{- end -}}
             {{- if or (.Get "caption") (.Get "attr") -}}<small>
                 {{- .Get "caption" | markdownify -}}
diff --git a/layouts/shortcodes/figure-bundle.html b/layouts/shortcodes/figure-bundle.html
new file mode 100644
index 0000000..355f5b5
--- /dev/null
+++ b/layouts/shortcodes/figure-bundle.html
@@ -0,0 +1,34 @@
+{{/* 
+    code copies entire from hugo built-in figure template, with grateful thanks.
+    only addition is on .src, to get get image from page bundle with 
+    fingerprint rather than just a straight string input. also small rather 
+    than p for caption.
+*/}}
+<figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
+    {{- if .Get "link" -}}
+        <a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
+    {{- end }}
+    <img src="{{ ($.Page.Resources.GetMatch (.Get "src") | fingerprint).Permalink }}"
+         {{- if or (.Get "alt") (.Get "caption") }}
+         alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
+         {{- end -}}
+         {{- with .Get "width" }} width="{{ . }}"{{ end -}}
+         {{- with .Get "height" }} height="{{ . }}"{{ end -}}
+    /> <!-- Closing img tag -->
+    {{- if .Get "link" }}</a>{{ end -}}
+    {{- if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
+        <figcaption>
+            {{ with (.Get "title") -}}
+                <h6>{{ . }}</h6>
+            {{- end -}}
+            {{- if or (.Get "caption") (.Get "attr") -}}<small>
+                {{- .Get "caption" | markdownify -}}
+                {{- with .Get "attrlink" -}}
+                    <a href="{{ . }}">
+                {{- end -}}
+                {{- .Get "attr" | markdownify -}}
+                {{- if .Get "attrlink" }}</a>{{ end }}</small>
+            {{- end }}
+        </figcaption>
+    {{- end }}
+</figure>
\ No newline at end of file
diff --git a/layouts/sitemap.xml b/layouts/sitemap.xml
index 8840d72..1b8adc4 100644
--- a/layouts/sitemap.xml
+++ b/layouts/sitemap.xml
@@ -20,9 +20,15 @@
                 />{{ end }}{{ range .Params.sitemap_images }}
     <image:image>
         <image:loc>{{ (resources.Get .src | fingerprint).Permalink }}</image:loc>{{ with .title }}
-        <image:title>{{ . }}</image:title>{{ end }}
-    </image:image>
-  {{ end }}{{ end }}
+        <image:title>{{ . }}</image:title>{{ end }}{{ with .caption }}
+        <image:caption>{{ . }}</image:caption>{{ end }}
+    </image:image>{{ end }}{{ range .Resources.ByType "image" }}
+    <image:image>
+        <image:loc>{{ ( . | fingerprint).Permalink }}</image:loc>{{ with .Title }}
+        <image:title>{{ . }}</image:title>{{ end }}{{ with .Params.caption }}
+        <image:caption>{{ . }}</image:caption>{{ end }}
+    </image:image>{{ end }}
   </url>
   {{ end }}
+  {{ end }}
 </urlset>
\ No newline at end of file