diff --git a/cave_data/1623-2012-ns-01.html b/cave_data/1623-2012-ns-01.html
index 0313cc307..cff2f6022 100644
--- a/cave_data/1623-2012-ns-01.html
+++ b/cave_data/1623-2012-ns-01.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:33 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:33 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><!-- '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-2012-ns-01</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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2012-ns-01</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-2012-ns-01+1623-2012-ns-01 '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>
 
 <explorers></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/2012-ns-01/2012-ns-01.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>tagged by Noel Snape in 2012; abseiled down in 2013 to window to pitch in between this and AntsInYourPants Hoehle 2013-03</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. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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/2012-ns-01/2012-ns-01.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2012-ns-01</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>
diff --git a/cave_data/1623-2012-ns-02.html b/cave_data/1623-2012-ns-02.html
index a0ecf709e..0ee601d98 100644
--- a/cave_data/1623-2012-ns-02.html
+++ b/cave_data/1623-2012-ns-02.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:40 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:40 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><!-- '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-2012-ns-02</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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2012-ns-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-2012-ns-02+1623-2012-ns-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>
 
 <explorers>Noel Snape</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/2012-ns-02/2012-ns-02.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>None. No relevant logbook entry for 2012.08.11 either.</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>nowt</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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/2012-ns-02/2012-ns-02.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2012-ns-02</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>
diff --git a/cave_data/1623-2012-ns-03.html b/cave_data/1623-2012-ns-03.html
index 81c5b8edf..f6ee49fa5 100644
--- a/cave_data/1623-2012-ns-03.html
+++ b/cave_data/1623-2012-ns-03.html
@@ -1,41 +1,64 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:37 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-2012-ns-03</caveslug>
-<official_name>Slime Cave</official_name><!-- 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>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2012-ns-03</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-2012-ns-03</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>Slime Cave</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></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>2012-ns-03</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-2012-ns-03</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-2012-ns-03</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-2012-ns-03+1623-2012-ns-03 '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>
 
-<explorers>CUCC (Noel Snape, Hannah Bunyan, Julian Todd)</explorers>
-<underground_description>Large entrance leads down "slimey" slope into chamber. Rift at North and South ends quickly become too tight. Total rock blockage in floor</underground_description>
-<equipment>None required</equipment>
+<explorers>CUCC (Noel Snape, Hannah Bunyan, Julian Todd)</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/2012-ns-03/2012-ns-03.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>Large entrance leads down "slimey" slope into chamber. Rift at North and South ends quickly become too tight. Total rock blockage in floor</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>None required</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>2012-ns-03</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>Not in kataster</kataster_status>
-<underground_centre_line></underground_centre_line>
+<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>36m</length>
-<depth>8.5m</depth>
+<length>36m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>8.5m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>17m</extent>
-<survex_file>caves-1623/2012-ns-03/2012-ns-03.svx</survex_file>
-<description_file></description_file><!-- Leave BLANK if this is the only description is in this form -->
-<url>1623/2012-ns-03.html</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1623/2012-ns-03.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-2012-ns-05.html b/cave_data/1623-2012-ns-05.html
index 6a2a4b964..ea83664d6 100644
--- a/cave_data/1623-2012-ns-05.html
+++ b/cave_data/1623-2012-ns-05.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 5, 2023, 1:49 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:35 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,
 make sure you update the database by doing a full data import. If you edit it using the online form
@@ -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. 5, 2023, 1:49 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:35 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2012-ns-06.html b/cave_data/1623-2012-ns-06.html
index e0da97cc6..d1d31f9a4 100644
--- a/cave_data/1623-2012-ns-06.html
+++ b/cave_data/1623-2012-ns-06.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:36 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:36 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><!-- '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-2012-ns-06</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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2012-ns-06</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-2012-ns-06+1623-2012-ns-06 '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>
 
 <explorers>CUCC Ian Walker, Noel Snape</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/2012-ns-06/2012-ns-06.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>simple 20m shaft, but no *ref link or location</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. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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>
-<survex_file>caves-1623/2012-ns-06/2012-ns-06.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2012-ns-06</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>
diff --git a/cave_data/1623-2012-ns-09.html b/cave_data/1623-2012-ns-09.html
index e5f4fbe04..cf3266240 100644
--- a/cave_data/1623-2012-ns-09.html
+++ b/cave_data/1623-2012-ns-09.html
@@ -1,40 +1,64 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:40 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:40 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-2012-ns-09</caveslug>
-<official_name>Bergspitze Schacht</official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2012-ns-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-2012-ns-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>Bergspitze Schacht</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></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>2012-ns-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-2012-ns-09b</entranceslug>
-  <letter>b</letter>
+  <entranceslug>1623-2012-ns-09b</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-2012-ns-09+1623-2012-ns-09b '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>
 
-<explorers>CUCC (Ian Walker, Hannah Walker, Noel Snape)</explorers>
-<underground_description>50m series of pitches broken by boulder ledges. Total blockage at bottom</underground_description>
-<equipment>65m rope, 5 hangers & maillons, 1 deviation sling and crab</equipment>
-<references></references>
-<survey>2012-ns-09</survey>
+<explorers>CUCC (Ian Walker, Hannah Walker, Noel Snape)</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/2012-ns-09/2012-ns-09.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>50m series of pitches broken by boulder ledges. Total blockage at bottom</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>65m rope, 5 hangers & maillons, 1 deviation sling and crab</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>2012-ns-09</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>not in kataster</kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length>17m</length>
-<depth>52m</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></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length>17m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>52m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>12m</extent>
-<survex_file>caves-1623/2012-ns-09/2012-ns-09.svx</survex_file>
-<description_file></description_file>
-<url>1623/2012-ns-09</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1623/2012-ns-09</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-2012-ns-10.html b/cave_data/1623-2012-ns-10.html
index 3d8d6db41..24dacc1f1 100644
--- a/cave_data/1623-2012-ns-10.html
+++ b/cave_data/1623-2012-ns-10.html
@@ -1,40 +1,64 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:41 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:41 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-2012-ns-10</caveslug>
-<official_name>Kleine Baum H&ouml;hle</official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2012-ns-10</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-2012-ns-10</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>Kleine Baum H&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></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>2012-ns-10</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-2012-ns-10</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-2012-ns-10</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-2012-ns-10+1623-2012-ns-10 '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>
 
-<explorers>CUCC (Noel Snape, Hannah Walker, Ian Walker)</explorers>
-<underground_description>Down snowslope entrance leads round a corner to bouldery chamber. Various ways on totally choked. Rift ascends at far end up dangerous frost shatter slope. Draft sinks in boulders in main part of cave.</underground_description>
-<equipment>30m rope, tied round large boulder at entrance</equipment>
-<references></references>
-<survey>2012-ns-10</survey>
+<explorers>CUCC (Noel Snape, Hannah Walker, Ian Walker)</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/2012-ns-10/2012-ns-10.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>Down snowslope entrance leads round a corner to bouldery chamber. Various ways on totally choked. Rift ascends at far end up dangerous frost shatter slope. Draft sinks in boulders in main part of cave.</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>30m rope, tied round large boulder at entrance</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>2012-ns-10</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>not in kataster</kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length>26m</length>
-<depth>8m</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></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length>26m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>8m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>18m</extent>
-<survex_file>caves-1623/2012-ns-10/2012-ns-10.svx</survex_file>
-<description_file></description_file>
-<url>1623/2012-ns-10</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<url>1623/2012-ns-10</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-2012-ns-12.html b/cave_data/1623-2012-ns-12.html
index 39ffefaaa..3f82e5c81 100644
--- a/cave_data/1623-2012-ns-12.html
+++ b/cave_data/1623-2012-ns-12.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:43 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:43 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><!-- '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-2012-ns-12</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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2012-ns-12</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-2012-ns-12+1623-2012-ns-12 '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>
 
 <explorers></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/2012-ns-12/2012-ns-12.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>simple shaft</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>no *ref, no description, no logbook</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>15m</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/2012-ns-12/2012-ns-12.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2012-ns-12</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>
diff --git a/cave_data/1623-2012-ns-15.html b/cave_data/1623-2012-ns-15.html
index f573af908..4301dc5ce 100644
--- a/cave_data/1623-2012-ns-15.html
+++ b/cave_data/1623-2012-ns-15.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
+<!-- If you edit this 1623-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 Oct. 10, 2023, 6:44 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><!-- '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-2012-ns-15</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></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -33,10 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2012-ns-15</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-2012-ns-15+1623-2012-ns-15 '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>
 
 <explorers>Julian Todd,Noel Snape</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/2012-ns-15/2012-ns-15.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><a href="/logbookentry/2012-08-20/t2012-08-20a_surface_pr">Logbook 2012-08-20</a></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. -->
@@ -47,7 +56,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <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>
-<survex_file>caves-1623/2012-ns-15/2012-ns-15.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+
 <description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1623/2012-ns-15</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>
diff --git a/cave_data/1623-233.html b/cave_data/1623-233.html
index 6a130782b..00da098c3 100644
--- a/cave_data/1623-233.html
+++ b/cave_data/1623-233.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 10, 2023, 11:28 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6: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,
 make sure you update the database by doing a full data import. If you edit it using the online form
@@ -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 Sept. 10, 2023, 11:28 a.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6: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>
@@ -19,7 +19,7 @@ the form documented at
 <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-233</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>Betthupferie</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code>2/S +</kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
 
@@ -45,11 +45,14 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 </entrance>
 
 <explorers>ARGE</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/233/233.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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file>caves-1623/233/233.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></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. -->
+<survey><pre>;Unfortunately we seem to have two caves numbered 233: 
+;Blaubeerschacht (2002)
+;and Bethupferle (2005)
+</pre></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></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 -->
diff --git a/entrance_data/1623-2012-ns-01.html b/entrance_data/1623-2012-ns-01.html
index 83a10ae7c..a0a17eb37 100644
--- a/entrance_data/1623-2012-ns-01.html
+++ b/entrance_data/1623-2012-ns-01.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:33 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:33 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-01</slug>
+<slug>1623-2012-ns-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,7 +49,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-ns-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2012-ns-02.html b/entrance_data/1623-2012-ns-02.html
index 1cf991d71..8c522dea7 100644
--- a/entrance_data/1623-2012-ns-02.html
+++ b/entrance_data/1623-2012-ns-02.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:40 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:40 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-02</slug>
+<slug>1623-2012-ns-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Noel did not record any location or description.</entrance_description>
 <explorers>Noel Snape</explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,9 +49,11 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.p2012-ns-02</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2012-ns-03.html b/entrance_data/1623-2012-ns-03.html
index a20a6cda4..b6b1e9d07 100644
--- a/entrance_data/1623-2012-ns-03.html
+++ b/entrance_data/1623-2012-ns-03.html
@@ -1,20 +1,31 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:37 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <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 Oct. 10, 2023, 6:37 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-03</slug>
+<slug>1623-2012-ns-03</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Small entrance at very S end of escarpment. Crawl into passage over sharp rocks</entrance_description>
-<explorers>Julian Todd, Noel Snape
-</explorers>
+<explorers>Julian Todd, Noel Snape</explorers>
 <map_description></map_description>
-<location_description>In E facing escarpent at S end, near highest point of hill. </location_description>
+<location_description>In E facing escarpent at S end, near highest point of hill.</location_description>
+<lastvisit></lastvisit>
 <approach>Take german path N of tunnocks. Cross one "valley" running roughly E-W. After ascending out of valley on cairned route, follow level section around several large shakjeholes/broken shafts. Turn right where the bunder thins (near the end of the hill). Upon reaching the edge of the escarpemt facing E from the top of this hill, follow it to the S end and the cave should be at the end, hidden by a boulder until you are upon it.</approach>
 <underground_description>sharp floored crawl</underground_description>
 <photo>t/ent.jpeg</photo>
@@ -38,7 +49,9 @@
 <alt>1885</alt>
 <northing>0411650</northing>
 <easting>5233408</easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-ns-03</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2012-ns-05.html b/entrance_data/1623-2012-ns-05.html
index 3031a07fd..27b298303 100644
--- a/entrance_data/1623-2012-ns-05.html
+++ b/entrance_data/1623-2012-ns-05.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:35 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:35 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-05</slug>
+<slug>1623-2012-ns-05</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,7 +49,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-ns-05</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2012-ns-06.html b/entrance_data/1623-2012-ns-06.html
index f0fe9b130..f4c56dab8 100644
--- a/entrance_data/1623-2012-ns-06.html
+++ b/entrance_data/1623-2012-ns-06.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:36 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:36 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-06</slug>
+<slug>1623-2012-ns-06</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,7 +49,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-ns-06</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2012-ns-09b.html b/entrance_data/1623-2012-ns-09b.html
index 37cebf62e..5dd3d265f 100644
--- a/entrance_data/1623-2012-ns-09b.html
+++ b/entrance_data/1623-2012-ns-09b.html
@@ -1,19 +1,31 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:40 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <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 Oct. 10, 2023, 6:40 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-09b</slug>
+<slug>1623-2012-ns-09b</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>Bergspitze Schacht</name>
 <entrance_description>Window dropping into chamber below a</entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description>immediataly next to a</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo>/home/expo/expofiles/expofiles/photos/2012/Noel/2012-ns-09-b1</photo>
@@ -37,7 +49,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-ns-09</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2012-ns-10.html b/entrance_data/1623-2012-ns-10.html
index 0a4276209..3eba0031b 100644
--- a/entrance_data/1623-2012-ns-10.html
+++ b/entrance_data/1623-2012-ns-10.html
@@ -1,19 +1,31 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- If you edit this file, make sure you update the websites database -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:41 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
+
+    <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
+    <!-- there is 1 required field: slug. The entrance will not appear without that. -->
+    <!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
+
 <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 Oct. 10, 2023, 6:41 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-10</slug>
+<slug>1623-2012-ns-10</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -37,9 +49,11 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.p2012-ns-10</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2012-ns-12.html b/entrance_data/1623-2012-ns-12.html
index 61f22e7e3..b34ac0643 100644
--- a/entrance_data/1623-2012-ns-12.html
+++ b/entrance_data/1623-2012-ns-12.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:43 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:43 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-12</slug>
+<slug>1623-2012-ns-12</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,9 +49,11 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.p2012-ns-12</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2012-ns-15.html b/entrance_data/1623-2012-ns-15.html
index d82d7c405..448f8b670 100644
--- a/entrance_data/1623-2012-ns-15.html
+++ b/entrance_data/1623-2012-ns-15.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
-<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- If you edit this 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 -->
 
     <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
     <!-- there is 1 required field: slug. The entrance will not appear without that. -->
@@ -12,14 +14,18 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:44 p.m. UTC using the form documented at 
+<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
+<br>
 <entrance>
 <non_public>False</non_public>
-<slug>1623-2012-ns-15</slug>
+<slug>1623-2012-ns-15</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -43,9 +49,11 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.p2012-ns-15</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
