diff --git a/codemeta/templates/softwaresourcecode.html b/codemeta/templates/softwaresourcecode.html
index aedac02..92c2f87 100644
--- a/codemeta/templates/softwaresourcecode.html
+++ b/codemeta/templates/softwaresourcecode.html
@@ -64,12 +64,17 @@ <h3>Screenshots</h3>
 
     <div class="screenshots">
         {% for url, res2 in get_triples(g, sscres, SDO.screenshot, SDO.url) %}
-            <img src="{{ url }}" title="{{ g.value(res2, SDO.caption) }}" />
+            {% if g.value(res2, SDO.caption) %}
+                <img src="{{ url }}" alt="screenshot: {{ g.value(res2, SDO.caption) }}" title="{{ g.value(res2, SDO.caption) }}" />
+            {% else %}
+                <img src="{{ url }}" alt="screenshot" />
+            {% endif %}
         {% endfor %}
     </div>
     {% endif %}
 
     {% if g.value(sscres, CODEMETA.referencePublication) or g.value(sscres, SDO.citation) %}
+
     <h3>References</h3>
 
     <div class="references">
diff --git a/codemeta/templates/targetproduct.html b/codemeta/templates/targetproduct.html
index 08c5270..1c6f5fe 100644
--- a/codemeta/templates/targetproduct.html
+++ b/codemeta/templates/targetproduct.html
@@ -44,6 +44,46 @@ <h2 property="stype:executableName">{{ g.value(targetres, STYPE.executableName)
 
     {% endif %}
 
+    {% if g.value(targetres, SDO.screenshot)  %}
+    <h3>Screenshots</h3>
+
+    <div class="screenshots">
+        {% for url, res2 in get_triples(g, targetres, SDO.screenshot, SDO.url) %}
+            {% if g.value(res2, SDO.caption) %}
+                <img src="{{ url }}" alt="screenshot: {{ g.value(res2, SDO.caption) }}" title="{{ g.value(res2, SDO.caption) }}" />
+            {% else %}
+                <img src="{{ url }}" alt="screenshot" />
+            {% endif %}
+        {% endfor %}
+    </div>
+    {% endif %}
+
+    {% if g.value(targetres, CODEMETA.referencePublication) or g.value(targetres, SDO.citation) %}
+
+    <h3>References</h3>
+
+    <div class="references">
+        <ul>
+        {% for title, ref in get_triples(g, targetres, CODEMETA.referencePublication, contextgraph=contextgraph) %}
+        {% if ref %}
+        <li>{% include 'reference.html' %}</li>
+        {% else %}
+        <li>{{ title }}</li>
+        {% endif %}
+        {% endfor %}
+
+        {% for title, ref in get_triples(g, targetres, SDO.citation, contextgraph=contextgraph) %}
+        {% if ref %}
+        <li>{% include 'reference.html' %}</li>
+        {% else %}
+        <li>{{ title }}</li>
+        {% endif %}
+        {% endfor %}
+        </ul>
+    </div>
+
+    {% endif %}
+
     <div class="properties">
         <dl>
             <dt class="type">Type</dt>