diff --git a/cave_data/1623-2007-06.html b/cave_data/1623-2007-06.html
index 3dc4cc830..bf6bdd856 100644
--- a/cave_data/1623-2007-06.html
+++ b/cave_data/1623-2007-06.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 7, 2023, 7:43 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 11:48 a.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. 7, 2023, 7:43 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:48 a.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-2009-02.html b/cave_data/1623-2009-02.html
index a9e6aab6f..c6c377c39 100644
--- a/cave_data/1623-2009-02.html
+++ b/cave_data/1623-2009-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, 11:53 a.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, 11:53 a.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-2009-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>Schneeh&uuml;hnh&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><!-- 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,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2009-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-2009-02+1623-2009-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>Frank Tully</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/2009-02/2009-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></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. -->
@@ -50,7 +58,7 @@ No relevant logbook entry on this date either. Did Frank do this entirely on his
 <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/2009-02/2009-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/2009-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-2010-02.html b/cave_data/1623-2010-02.html
index 64161f527..f2f027aa9 100644
--- a/cave_data/1623-2010-02.html
+++ b/cave_data/1623-2010-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 27, 2023, 1:22 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 11:53 a.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 July 27, 2023, 1:22 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:53 a.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-2010-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>zigzag 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><!-- 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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2010-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-2010-02+1623-2010-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></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/2010-02/2010-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 -->
+<survex_file>caves-1623/2010-02/2010-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></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. -->
diff --git a/cave_data/1623-2010-04.html b/cave_data/1623-2010-04.html
index 983f87104..bb2a28084 100644
--- a/cave_data/1623-2010-04.html
+++ b/cave_data/1623-2010-04.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, 11:50 a.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, 11:50 a.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-2010-04</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-2010-04</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-2010-04+1623-2010-04 '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>becka, Andrew Atkinson, george</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/2010-04/2010-04.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>From logbook: Looking for 2nd Balkonhöhle entrance (dropping 2010-04) on 3rd July 2016
 
 <br>Dropped 2010-04 using naturals to get to snow slope. Andrew and I used the shovel to dig at the base and the side in 3 spots. Soft snow initially and some gaps but no draft. Gave up after less than an hour. Survey in wallet 2016#08.</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. -->
@@ -49,7 +58,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/2010-04/2010-04.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/2010-04</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-2010-07.html b/cave_data/1623-2010-07.html
index bde00bf44..66bd43de4 100644
--- a/cave_data/1623-2010-07.html
+++ b/cave_data/1623-2010-07.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, 11:56 a.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, 11:56 a.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-2010-07</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><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--><!-- Name of the cave (normally in German) -->
-<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<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><!-- 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-2010-07</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-2010-07+1623-2010-07 '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/2010-07/2010-07.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>Part of trip surface surveying beyond Tunnocks.
 
 Photos on Franks camera 780, 781, 782, 783
@@ -58,7 +67,7 @@ UTM 33T GPS</notes><!-- Normally empty, but place for anything else that should
 <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/2010-07/2010-07.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/2010-07</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-OW-7.html b/cave_data/1623-2012-OW-7.html
index 3ff91314a..b1f17da2f 100644
--- a/cave_data/1623-2012-OW-7.html
+++ b/cave_data/1623-2012-OW-7.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 16, 2023, 12:10 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 12:08 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. 16, 2023, 12:10 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 12:08 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-js-01.html b/cave_data/1623-2012-js-01.html
index c9f1183e0..e61858711 100644
--- a/cave_data/1623-2012-js-01.html
+++ b/cave_data/1623-2012-js-01.html
@@ -1,43 +1,66 @@
 <!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, 12:10 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, 12:10 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-js-01</caveslug>
-<official_name>Fruhlingsmiereschact</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-js-01</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-js-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>Fruhlingsmiereschact</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-js-01</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-js-01</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-2012-js-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-js-01+1623-2012-js-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>CUCC</explorers>
+<explorers>CUCC</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-js-01/2012-js-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>Entrance behind rock in large depression near 204d<br/>
 Small pretty white flower growing in entrance, hence name.<br/>
-Shithouse small loose entrance onto shaft, shaft craps out at bottom with packed gravel floor, no discernable draft</underground_description>
-<equipment></equipment>
+Shithouse small loose entrance onto shaft, shaft craps out at bottom with packed gravel floor, no discernable draft</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>2012-js-1.svx</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>
+<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>2.5</length>
-<depth>44</depth>
+<length>2.5</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>44</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-js-01/2012-js-01.svx</survex_file>
-<description_file></description_file><!-- Leave BLANK if this is the only description is in this form -->
-<url>1623/2012-js-01/2012-js-01.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-js-01/2012-js-01.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-2013-03.html b/cave_data/1623-2013-03.html
index 8abf2f83a..4c45fb8eb 100644
--- a/cave_data/1623-2013-03.html
+++ b/cave_data/1623-2013-03.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, 12:14 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, 12:14 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-2013-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>AntsInYourPants</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-2013-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-2013-03+1623-2013-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>Matt Watson,  Holly Bradley, Becka Lawson</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/2013-03/antsinyourpants.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>Logbook 2013-08-04
 <br>The first pitch had previously been dropped by Matt > a lovely y-hang off two naturals straight down to a snow and ice bridge 30m down. Becka & I had headed off to AinP ahead of the others to rerig the entrance (the rope had been removed after the prospecting but the slings had been left in place) I re-rigged this pitch feeling a little precarious as I wasn't wearing my oversuit or helmet! (It was a fine hot day so less clothes was needed here).
 <br>
@@ -52,7 +61,7 @@ The way on was through a hole in the ice in a corner of the cave.</underground_d
 <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/2013-03/antsinyourpants.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/2013-03</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-2014-BL888.html b/cave_data/1623-2014-BL888.html
index a20439216..70988a4bf 100644
--- a/cave_data/1623-2014-BL888.html
+++ b/cave_data/1623-2014-BL888.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 29, 2023, 3:13 p.m. UTC 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-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 July 29, 2023, 3:13 p.m. UTC using the form documented at
+<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>
@@ -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-2014-BL888</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>Silber Fisch Hoehle</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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2014-BL888</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-2014-BL888+1623-2014-BL888 '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/2014-BL888/2014-BL888.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/2014-BL888/2014-BL888.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>sketches in logbook and scanned in 2014#23
 (if 2014-888 is the same thing as 2014-BL888)</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. -->
diff --git a/cave_data/1623-Blaubeer.html b/cave_data/1623-Blaubeer.html
index 41592f97a..3fae257f3 100644
--- a/cave_data/1623-Blaubeer.html
+++ b/cave_data/1623-Blaubeer.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 26, 2023, 6 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:23 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 July 26, 2023, 6 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:23 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-Blaubeer</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
 
@@ -36,19 +36,23 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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>Blaubeer</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>blaubeer</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-Blaubeer</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-Blaubeer+1623-Blaubeer '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/blaubeer/blaubeer.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/blaubeer/blaubeer.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>We only have the survex file.</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/cave_data/1623-Juttahoehle.html b/cave_data/1623-Juttahoehle.html
index c980d5e55..bab75892c 100644
--- a/cave_data/1623-Juttahoehle.html
+++ b/cave_data/1623-Juttahoehle.html
@@ -1,5 +1,5 @@
 <!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 Oct. 10, 2023, 6:15 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. 6, 2023, 2:29 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:15 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -36,7 +36,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
     +   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>Juttahoehle</unofficial_number><!-- (Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<unofficial_number>juttahoehle</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-Juttahoehle</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 -->
@@ -44,19 +44,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
   <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>;erhalten am 12.11.1999 von Franz Lindenmayr</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. -->
+<explorers>;received from Franz Lindenmayr (Nov. 12. 1999)</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/juttahoehle/jutta.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><pre>;2000.03.08 W Created. Data moved out of 40/altsvx
 ;2013.05.13 W Not clear if this is in 40 or a different cave, and if so where it is.
 
 
-
-;Daten der Entdecker der Schneevulkanhalle
-;Schwarzmooskogel-Eishöhle (1623/40)
-;erhalten am 12.11.1999 von Franz Lindenmayr
-;Einzige Aufschrift: "3. Fassung vom 26.8.84"
-;Erläuterungen aufgrund einer anderen Liste, die aber hier zu passen scheint
-
 ;data from the first explorer of Schneevulkanhalle
 ; Schwarzmooskogel-Eishöhle (1623/40)
 ;received from Franz Lindenmayr (Nov. 12. 1999)
diff --git a/cave_data/pendingcaves.txt b/cave_data/pendingcaves.txt
index bcdc95325..abfc984a8 100644
--- a/cave_data/pendingcaves.txt
+++ b/cave_data/pendingcaves.txt
@@ -1,7 +1,5 @@
 1623-2012-sw-01
 1623-2012-sw-02
 1623-2012-sw-03
-1623-2013-CUCC-02
-1623-2013-CUCC-03
 1626-2019-rh-01
 1626-2019-rh-02
\ No newline at end of file
diff --git a/entrance_data/1623-2007-06.html b/entrance_data/1623-2007-06.html
index e14a67503..4671441ff 100644
--- a/entrance_data/1623-2007-06.html
+++ b/entrance_data/1623-2007-06.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 7, 2023, 7:43 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 11:48 a.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 -->
@@ -14,7 +14,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. 7, 2023, 7:43 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:48 a.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -51,7 +51,7 @@ though, you do not need to do a data import as it happens automatically -->
 <easting>83264</easting> 
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
-<tag_station>1623.02007-06</tag_station>
+<tag_station>1623.p2007-06</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2009-02.html b/entrance_data/1623-2009-02.html
index 097edb259..a56ff79e1 100644
--- a/entrance_data/1623-2009-02.html
+++ b/entrance_data/1623-2009-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, 11:53 a.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, 11:53 a.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-2009-02</slug>
+<slug>1623-2009-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>1623-2009-02</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.p2009-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2010-02.html b/entrance_data/1623-2010-02.html
index 98a6e2fae..7a485a8a8 100644
--- a/entrance_data/1623-2010-02.html
+++ b/entrance_data/1623-2010-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 1:22 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 11:53 a.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 -->
@@ -14,7 +14,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 July 27, 2023, 1:22 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 11:53 a.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -49,7 +49,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.t2010-02</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2010-04.html b/entrance_data/1623-2010-04.html
index 65d5b4bcc..0c70d6a36 100644
--- a/entrance_data/1623-2010-04.html
+++ b/entrance_data/1623-2010-04.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, 11:50 a.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, 11:50 a.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-2010-04</slug>
+<slug>1623-2010-04</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.p2010-04</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2010-07.html b/entrance_data/1623-2010-07.html
index 5ff4ff1da..1a755197d 100644
--- a/entrance_data/1623-2010-07.html
+++ b/entrance_data/1623-2010-07.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, 11:56 a.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,9 +14,12 @@
 <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, 11:56 a.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-2010-07</slug>
+<slug>1623-2010-07</slug> <!-- one entrance and one slug per entrance_data file -->
 <name>2010-07</name>
 <entrance_description>large shaft down 40m++
 no visible bolt
@@ -34,6 +39,7 @@ Not clear which data pertains to each in scans.
 Survey on surface runs from Tunnocks bolt.
 
 GPS 33T UTM</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo>franks camera 776-779, 780-783 see scanned notes</photo>
@@ -57,9 +63,11 @@ GPS 33T UTM</location_description>
 <alt>1832m</alt>
 <northing>411441</northing>
 <easting>5283142</easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2010-07</tag_station>
 <exact_station></exact_station>
-<other_station></other_station>
+<other_station>1623.gps2010-07</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2012-OW-7.html b/entrance_data/1623-2012-OW-7.html
index e3b730473..872ce5e5b 100644
--- a/entrance_data/1623-2012-OW-7.html
+++ b/entrance_data/1623-2012-OW-7.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Sept. 16, 2023, 12:10 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 12:08 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 -->
@@ -14,14 +14,15 @@ 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. 16, 2023, 12:10 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 12:08 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-OW-7</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
-<entrance_description></entrance_description>
+<entrance_description>Location from handwritten GPS in notes only
+<p> <img width=40% src="/expofiles/surveyscans/2017/2017%2310/notes.jpeg"></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
@@ -39,7 +40,7 @@ though, you do not need to do a data import as it happens automatically -->
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>?</marking> 
-<marking_comment></marking_comment>
+<marking_comment>Why is there no *fix for this ? WHY is it commented out in <a href="/survexfile/fixedpts/gps/gps17.svx">fixedpts/gps/gps17</a> ?</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
@@ -49,6 +50,8 @@ though, you do not need to do a data import as it happens automatically -->
 <alt>missing</alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84>47.69969</lat_wgs84> 
+<long_wgs84>13.82574</long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
diff --git a/entrance_data/1623-2012-js-01.html b/entrance_data/1623-2012-js-01.html
index c9cbd29fc..7cd4c2d0b 100644
--- a/entrance_data/1623-2012-js-01.html
+++ b/entrance_data/1623-2012-js-01.html
@@ -1,22 +1,35 @@
 <!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, 12:10 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, 12:10 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-js-01</slug>
+<slug>1623-2012-js-01</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Small slot behind boulder, slot opens onto small chamber which has window onto pitch.</entrance_description>
 <explorers>Frank Tully</explorers>
 <map_description></map_description>
 <location_description>Large bowl near 204d</location_description>
+<lastvisit></lastvisit>
 <approach>As for 204d</approach>
 <underground_description></underground_description>
-<photo><a href="/expofiles/photos/2016/Frank/CUCC2012JS1-1.JPG">tag photo</a><br/>
+<photo><img src="/expofiles/photos/2016/Frank/CUCC2012JS1-1.JPG">
+<a href="/expofiles/photos/2016/Frank/CUCC2012JS1-1.JPG">tag photo</a><br/>
 <a href="/expofiles/photos/2016/Frank/CUCC2012JS1-2.JPG">tag photo</a><br/>
 <a href="/expofiles/photos/2016/Frank/CUCC2012JS1-3.JPG">tag photo</a></photo>
 <!-- marking options: P  = Paint,
@@ -39,7 +52,9 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station></tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2012-js-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2013-03.html b/entrance_data/1623-2013-03.html
index a7b5f37a1..16e1108ce 100644
--- a/entrance_data/1623-2013-03.html
+++ b/entrance_data/1623-2013-03.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, 12:14 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, 12:14 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-2013-03</slug>
+<slug>1623-2013-03</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.p2013-03</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2014-BL888.html b/entrance_data/1623-2014-BL888.html
index 64de78cd5..3b5bd3bd7 100644
--- a/entrance_data/1623-2014-BL888.html
+++ b/entrance_data/1623-2014-BL888.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 3:09 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- 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 -->
@@ -14,7 +14,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 July 27, 2023, 3:09 p.m. UTC using the form documented at 
+<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>
@@ -49,9 +49,11 @@ though, you do not need to do a data import as it happens automatically -->
 <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.p2014-BL888</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-Blaubeer.html b/entrance_data/1623-Blaubeer.html
index 8da73ab0e..9843d9e69 100644
--- a/entrance_data/1623-Blaubeer.html
+++ b/entrance_data/1623-Blaubeer.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 26, 2023, 6 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:23 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 -->
@@ -14,7 +14,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 July 26, 2023, 6 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:23 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -25,7 +25,7 @@ though, you do not need to do a data import as it happens automatically -->
 <explorers></explorers>
 <map_description></map_description>
 <location_description></location_description>
-<lastvisit></lastvisit>
+<lastvisit>2002-08-17</lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -45,10 +45,12 @@ though, you do not need to do a data import as it happens automatically -->
                           L = Lost,
                           R = Refindable" -->
 <findability></findability>
-<findability_description></findability_description>
+<findability_description>No surface survey, so no located entrance.</findability_description>
 <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>
diff --git a/entrance_data/1623-Juttahoehle.html b/entrance_data/1623-Juttahoehle.html
index c8c9e5221..d879f8889 100644
--- a/entrance_data/1623-Juttahoehle.html
+++ b/entrance_data/1623-Juttahoehle.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 27, 2023, 12:03 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 10, 2023, 6:13 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 -->
@@ -14,7 +14,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 July 27, 2023, 12:03 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 10, 2023, 6:13 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -27,7 +27,7 @@ though, you do not need to do a data import as it happens automatically -->
 <location_description>; Locn:	flank of Vorderer Schwarzmoos Kgl, Loser Augst-Eck, Totes Gebirge, Austria
 ; Cave:	 1623/Juttahöhle</location_description>
 <lastvisit>1984.08.26</lastvisit>
-<approach></approach>
+<approach>No *entrance of *fix or any common survey points beween Juttahoehle and the surface survey of the same date.</approach>
 <underground_description></underground_description>
 <photo></photo>
 <!-- marking options: P  = Paint,
@@ -50,6 +50,8 @@ though, you do not need to do a data import as it happens automatically -->
 <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>
