diff --git a/cave_data/1623-2001-09.html b/cave_data/1623-2001-09.html
index f70420fe4..7f676b76e 100644
--- a/cave_data/1623-2001-09.html
+++ b/cave_data/1623-2001-09.html
@@ -1,40 +1,62 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:21 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- 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 -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:21 p.m. UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
 <cave>
-<non_public>False</non_public>
-<caveslug>1623-2001-09</caveslug>
-<official_name>Funkberaterschacht</official_name>
-<area>1623</area>
-<area>2b</area>
-<kataster_code>-0</kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2001-09</unofficial_number>
+<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
+<caveslug>1623-2001-09</caveslug><!--(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>Funkberaterschacht</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>1623</area><!-- e.g. "1623" -->
+<kataster_code>-0</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)
+    W   Wasserh&ouml;hlen (Caves with water)
+   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
+    E   Eishohlen (Caves with ice formations)
+    S   Schachth&ouml;hlen (Caves with pitches)
+    H   Halbh&ouml;hlen (Rock shelters ?)
+
+    -   unerforscht (unexplored)
+    =   befahren (visited)
+    ×   teilweise vermessen (partly surveyed)
+    +   erforscht (exploration considered complete)
+ -->
+<kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2001-09</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-2001-09</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-2001-09</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 -->
+  <letter></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>
 
-<explorers>Entrance noted CUCC 2001 Olly B, Martin</explorers>
-<underground_description></underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
+<explorers>Entrance noted CUCC 2001 Olly B, Martin</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status></kataster_status>
-<underground_centre_line>Claimed to be in dataset (not clear where)</underground_centre_line>
-<notes></notes>
-<length></length>
-<depth></depth>
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes>Centreline Claimed to be in dataset (not clear where)</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file></survex_file>
-<description_file></description_file>
-<url>1623/2001-09/2001-09.html</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2017-NR-02.html b/cave_data/1623-2017-NR-02.html
index d02155af2..bdc1be073 100644
--- a/cave_data/1623-2017-NR-02.html
+++ b/cave_data/1623-2017-NR-02.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:19 p.m. 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 -->
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:19 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2017-NR-02</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  1623-2017-NR-02+1623-2017-NR-02 'Z' == -->
   <letter></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>
 
@@ -56,16 +55,18 @@ QM C "looks like it gets smaller and craps out after a while, body-sized phreati
 , see also notes in <a href="/logbookedit/2017-07-22a">22 July</a>,</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
 <survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status></kataster_status>
-<underground_centre_line>Sketch plan and elev in scanned notes, not in logbook
-"Quite a nice shaft" - Nathan.</underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
 <notes><a href='/1623/l/2017-NR-02_03.html'><img src='/1623/t/2017-NR-02_03.jpg' /></a><br>
-pitch below small ceiling underneath a small downclimb on the cairned path. on the edge of a depression ~10m away from a snow plug.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+pitch below small ceiling underneath a small downclimb on the cairned path. on the edge of a depression ~10m away from a snow plug.
+<p>
+
+Sketch plan and elev in scanned notes, not in logbook
+"Quite a nice shaft" - Nathan.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>20</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2017-NR-02/2017-NR-02.html</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/cave_data/1623-234.html b/cave_data/1623-234.html
index 26f760e43..76f08cf90 100644
--- a/cave_data/1623-234.html
+++ b/cave_data/1623-234.html
@@ -1,45 +1,67 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:22 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- 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 -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:22 p.m. UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
 <cave>
-<non_public>False</non_public>
-<caveslug>1623-234</caveslug>
-<official_name>Hauchh&ouml;hle</official_name>
-<area>1623</area>
-<area>2d</area>
-<kataster_code>3/S/W x</kataster_code>
-<kataster_number>234</kataster_number> 
-<unofficial_number>2000-09</unofficial_number>
+<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
+<caveslug>1623-234</caveslug><!--(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>Hauchh&ouml;hle</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>1623</area><!-- e.g. "1623" -->
+<kataster_code>3/S/W x</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)
+    W   Wasserh&ouml;hlen (Caves with water)
+   (W)  Zeitweilig aktiv Wasserh&ouml;hlen (Caves with seasonal water)
+    E   Eishohlen (Caves with ice formations)
+    S   Schachth&ouml;hlen (Caves with pitches)
+    H   Halbh&ouml;hlen (Rock shelters ?)
+
+    -   unerforscht (unexplored)
+    =   befahren (visited)
+    ×   teilweise vermessen (partly surveyed)
+    +   erforscht (exploration considered complete)
+ -->
+<kataster_number>234</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2000-09</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
 
 <entrance>
-  <entranceslug>1623-234a</entranceslug>
-  <letter>a</letter>
+  <entranceslug>1623-234a</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 -->
+  <letter>a</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>
 
 <entrance>
-  <entranceslug>1623-234b</entranceslug>
-  <letter>b</letter>
+  <entranceslug>1623-234b</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 -->
+  <letter>b</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>
 
-<explorers>CUCC 2000, 2002, 2004, 2006, 2008.</explorers>
-<underground_description></p><ul><li><a href="upperlevel.html">Upper level</a></li><li><a href="pie.html">Pie Series + Wowoland level</a></li><li style="margin-top: 1em"><a href="gallery.html">Photo gallery</a></li></ul><p></underground_description>
-<equipment>20m rope + 2 slings for ent pitch; 5m handline + 1 or 2 slings for climb down into Flashgun Chamber. More needed for Pie Series and traverse to Sweet Sight.</equipment>
-<references></references>
-<survey>plan drawn up after 2008 expo:</p><p><a href="surveys/234-2008.png"><img alt="234 plan survey" src="surveys/234-2008small.png" /></a></p><p>(2004 version archived <a href="surveys/234-2004-survey.png">here</a>, or in colour <a href="surveys/234-2004-surveycolour.png">here</a>; 2005 version <a href="surveys/234-2005-survey.png">here</a>; 2006 version <a href="surveys/234-2006-surveycolour.png">here</a>; 2008 tunnel file <a href="surveys/234_2008-rl.xml">here</a>)</survey>
+<explorers>CUCC 2000, 2002, 2004, 2006, 2008.</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file>caves-1623/234/234.svx</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description></p><ul><li><a href="upperlevel.html">Upper level</a></li><li><a href="pie.html">Pie Series + Wowoland level</a></li><li style="margin-top: 1em"><a href="gallery.html">Photo gallery</a></li></ul><p></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment>20m rope + 2 slings for ent pitch; 5m handline + 1 or 2 slings for climb down into Flashgun Chamber. More needed for Pie Series and traverse to Sweet Sight.</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey>plan drawn up after 2008 expo:</p><p><a href="surveys/234-2008.png"><img alt="234 plan survey" src="surveys/234-2008small.png" /></a></p><p>(2004 version archived <a href="surveys/234-2004-survey.png">here</a>, or in colour <a href="surveys/234-2004-surveycolour.png">here</a>; 2005 version <a href="surveys/234-2005-survey.png">here</a>; 2006 version <a href="surveys/234-2006-surveycolour.png">here</a>; 2008 tunnel file <a href="surveys/234_2008-rl.xml">here</a>)</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status>Form submitted summer 2003 as part of a misnumbering cockup. Resolved 2004-07-28 with allocation of new number 234.</kataster_status>
-<underground_centre_line>In dataset; download <a href="234.3d">.3d file</a> or <a href="surveydata.tgz">Raw survey data</a></underground_centre_line>
-<notes></notes>
-<length></length>
-<depth></depth>
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes>Centreline in dataset; download <a href="234.3d">.3d file</a> or <a href="surveydata.tgz">Raw survey data</a></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file>caves-1623/234/234.svx</survex_file>
-<description_file></description_file>
-<url>1623/234/234.html</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-247.html b/cave_data/1623-247.html
index eb22cee41..33b645cae 100644
--- a/cave_data/1623-247.html
+++ b/cave_data/1623-247.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:21 p.m. 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 -->
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Oct. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:21 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-247</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  1623-247+1623-247 'Z' == -->
   <letter></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>
 
@@ -51,14 +50,13 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
 <survey></p><img src="247elev.jpg" /> <img src="247plan.jpg" /> <p>(drawn up partly from sketch in 2003 logbook and partly from memory)</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status>Form prepared 06/03/2005, sent May 2005, number issued August.</kataster_status>
-<underground_centre_line>caves-1623/247/247.svx</underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
 <notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>~20m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/247/247.html</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/cave_data/1623-76.html b/cave_data/1623-76.html
index 27dacdd58..e81637b95 100644
--- a/cave_data/1623-76.html
+++ b/cave_data/1623-76.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:16 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:20 p.m. 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 -->
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:16 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:20 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,19 +40,16 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-76a</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  1623-76+1623-76a 'Z' =a= -->
   <letter>a</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>
 
 <entrance>
   <entranceslug>1623-76b</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  1623-76+1623-76b 'Z' =b= -->
   <letter>b</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>
 
 <entrance>
   <entranceslug>1623-76main</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  1623-76+1623-76main 'Z' =main= -->
   <letter>main</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>
 
@@ -64,14 +61,13 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <survey><p>The lower parts of the 1970s surveys are based on measurement of rope lengths and thus probably best categorised as Grade 2.  The 2004 resurveyed depth for the taproom agrees closely with the 1970s surveys: <ul><li> <a href="../../years/1977/106.png">After first year of exploration (1977)</a></li><li> <a href="../../years/1978/106.png">After 1978 exploration</a></li><li> After 1979, the end of the original 1970's exploration:  <a href="76upper.png">Upper half</a> and <a href="76lower.png">Lower half</a></li><li> <a href="76_final_col_small.png">2004 new exploration and resurvey down to the taproom</a></li><li> <a href="76_A2_2005.jpg">2005 exploration and resurvey down to spent ledge</a> 
 [<a href="/expofiles/surveys/76/76_A2_2005.png">More detailed 3,182kB image</a>]</ul></p></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status></kataster_status>
-<underground_centre_line>Data for the sections covered so far by the resurvey project begun in 2004 can be downloaded as a <a href="76.3d">.3d file</a>.</underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes>Data for the sections covered so far by the resurvey project begun in 2004 can be downloaded as a <a href="76.3d">.3d file</a>.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
 <length>resurveyed so far</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>resurveyed so far; original depth ~506m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>resurveyed so far</extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/76/76.html</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/cave_data/1626-5.html b/cave_data/1626-5.html
index 990cfefcc..1b6d632a5 100644
--- a/cave_data/1626-5.html
+++ b/cave_data/1626-5.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:16 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Nov. 17, 2023, 7:18 p.m. 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 -->
@@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:16 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Nov. 17, 2023, 7:18 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -40,7 +40,6 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1626-5</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  1626-5+1626-5 'Z' == -->
   <letter></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>
 
@@ -51,14 +50,15 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
 <survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status></kataster_status>
-<underground_centre_line>Resurveyed by Olly Betts and Martin Sluka in 2002 [Is this next bit still true in 2023>]: but we don't have an entrance fix so the data isn't currently in the dataset.</underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>A resurgence cave of major importance, visited by CUCC in 1976 and 2002. Krenmayr gives it 278m long, seasonally active, very roomy water cave. The associated perennial resurgence is Naglbr&uuml;nndl, putting out 50-100 l/s.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes>A resurgence cave of major importance, visited by CUCC in 1976 and 2002. Krenmayr gives it 278m long, seasonally active, very roomy water cave. The associated perennial resurgence is Naglbr&uuml;nndl, putting out 50-100 l/s.
+<p>
+Resurveyed by Olly Betts and Martin Sluka in 2002 [Is this next bit still true in 2023>]: but we don't have an entrance fix so the data isn't currently in the dataset.</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
 <length>278m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
 
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1626/5/5.html</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>
