diff --git a/templates/base.html b/templates/base.html
index 78194ab..dfe05d3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -33,7 +33,7 @@
 {% endif %}
     <a href="/1623/290/290">290 (FGH)</a> |
     <a href="/1626/359/359.html">359 (HC)</a> |
-    <a id="cavesLink" href="{% url "caveindex" %}">caves</a>  |
+    <a id="cavesLink" href="/caves">caves</a>  |
     <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
     <a href="/survexfile/">Survex</a> |
     <a href="{% url "survexcaveslist" %}">All Survex</a> |
diff --git a/templates/cave_debug.html b/templates/cave_debug.html
index c4df57b..e9076d6 100644
--- a/templates/cave_debug.html
+++ b/templates/cave_debug.html
@@ -11,15 +11,17 @@
 <tr><th>entrance</th>
 <th>ent slug</th>
 <th>Best station</th>
-<th>**</th>
+<th>url</th>
 </tr>
 {% for ent in ents %}
+{% if ent.bearings %}
 <tr>
+
   <td>
      #{{ent.id}} {{ent}}
   </td>
   <td>
-    {{ent.slug}}
+    {{ent.slug}} 
   </td>
     <td>
 {% if ent.best_station %}{{ent.best_station}}{% endif %}
@@ -27,7 +29,10 @@
     <td>    
 {% if ent.best_station %}{{ent.best_station_object.latlong}}{% endif %}
   </td>
-
+  <td>
+    {{ent.bearings}} 
+  </td>
+{% endif %}
 {% endfor %}
 </table>
 
diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml
index 3f132c3..64aaf88 100644
--- a/templates/dataformat/cave.xml
+++ b/templates/dataformat/cave.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!-- This file is generated by troggle on {{date}} UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
 <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
@@ -20,7 +20,7 @@ the form documented at
 <caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
 <official_name>{{ cave.official_name|default_if_none:""|safe }}</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
 <area>{{cave.areacode |safe }}</area><!-- e.g. "1623" -->
-<kataster_code>{{ cave.kataster_code|default_if_none:""|safe }}</kataster_code><!-- 'length-or-depth/type exploration'
+<kataster_code>{{ cave.kataster_code|default_if_none:"-"|safe }}</kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
     T   Trockenh&ouml;hlen (Dry caves)
@@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 {% for ce in cave.entrances.all %}
 <entrance>
   <entranceslug>{{ ce.entrance.slug|default_if_none:""|safe }}</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <!-- DEBUG  {{ce.cave}}+{{ce.entrance}} '{{ ce.entrance.singleletter }}' ={{ce.entranceletter}}= -->
   <letter>{{ ce.entranceletter|default_if_none:""|safe }}</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 {% endfor %}
@@ -58,7 +57,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <extent>{{cave.extent|default_if_none:""|safe }}</extent>
 
 <description_file>{{ cave.description_file|default_if_none:""|safe }}</description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>{{ cave.url|default_if_none:"1623/000"|safe }}</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
 </cave>
 </body>
 </html>
diff --git a/templates/dataformat/entrance.xml b/templates/dataformat/entrance.xml
index 98ca575..7acc740 100644
--- a/templates/dataformat/entrance.xml
+++ b/templates/dataformat/entrance.xml
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit>{{ entrance.lastvisit|default_if_none:""|safe }}</lastvisit>
 <approach>{{ entrance.approach|default_if_none:""|safe }}</approach>
 <underground_description>{{ entrance.underground_description|default_if_none:""|safe }}</underground_description>
-<photo>{{ entrance.photo|default_if_none:"<img src='/1623/000/000.jpg' />"|safe }}</photo>
+<photo>{{ entrance.photo|default_if_none:"<img src='/1623/others/t/82jont.jpg' />"|safe }}</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -38,13 +38,13 @@ though, you do not need to do a data import as it happens automatically -->
                       S? = Spit (?),
                       U  = Unmarked,
                       ?  = Unknown" -->
-<marking>{{ entrance.marking|default_if_none:""|safe }}</marking> 
+<marking>{{ entrance.marking|default_if_none:"?"|safe }}</marking> 
 <marking_comment>{{ entrance.marking_comment|default_if_none:""|safe }}</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
                           R = Refindable" -->
-<findability>{{ entrance.findability|default_if_none:""|safe }}</findability>
+<findability>{{ entrance.findability|default_if_none:"?"|safe }}</findability>
 <findability_description>{{ entrance.findability_description|default_if_none:""|safe }}</findability_description>
 <alt>{{ entrance.alt|default_if_none:""|safe }}</alt>
 <lat_wgs84>{{ entrance.lat_wgs84|default_if_none:""|safe }}</lat_wgs84> 
@@ -53,7 +53,6 @@ though, you do not need to do a data import as it happens automatically -->
 <other_station>{{ entrance.other_station|default_if_none:""|safe }}</other_station>
 <other_description>{{ entrance.other_description|default_if_none:""|safe }}</other_description>
 <bearings>{{ entrance.bearings|default_if_none:""|safe }}</bearings>
-<url>{{ entrance.url|default_if_none:""|safe }}</url>
 </entrance>
 </body>
 </html>
