diff --git a/cave_data/1623-1999-OB-01.html b/cave_data/1623-1999-OB-01.html
index 56db3f26d..b22bac3c5 100644
--- a/cave_data/1623-1999-OB-01.html
+++ b/cave_data/1623-1999-OB-01.html
@@ -1,40 +1,64 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle on Oct. 6, 2023, 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, make sure you update the websites database -->
+<!-- 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. 6, 2023, 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-1999-OB-01</caveslug>
-<official_name></official_name>
-<area>1623</area>
-<area>1d</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>1999-OB-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-1999-OB-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><!-- 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>1999-OB-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-1999-OB-01</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-1999-OB-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-1999-OB-01+1623-1999-OB-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 1999 (Olly Betts)</explorers>
-<underground_description>Inside small cliff facing toward B.wall. Slightly draughting, 6m deep, with snow plug at bottom. Unexplored, not a promising lead.</underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
+<explorers>CUCC 1999 (Olly Betts)</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
+<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
+<underground_description>Inside small cliff facing toward B.wall. Slightly draughting, 6m deep, with snow plug at bottom. Unexplored, not a promising lead.</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
+<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
+<references></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
+<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
 <kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length></length>
-<depth></depth>
+<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
+<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
-<survex_file></survex_file>
-<description_file></description_file>
-<url>1623/1999-OB-01/1999-OB-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/1999-OB-01/1999-OB-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-2012-HW-02.html b/cave_data/1623-2012-HW-02.html
index 6d23f56a5..2438c6c7d 100644
--- a/cave_data/1623-2012-HW-02.html
+++ b/cave_data/1623-2012-HW-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. 6, 2023, 10:22 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. 6, 2023, 10:22 p.m. UTC using the form documented at
+the form documented at 
+<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
+<br>
+
 <cave>
 <non_public>False</non_public><!-- '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-HW-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><area>2d</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<area>1623</area><!-- e.g. "1623" -->
 <kataster_code>1T-</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-HW-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-HW-02+1623-2012-HW-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></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. -->
@@ -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></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-HW-02/index.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>
diff --git a/cave_data/1623-2023-EBH-01.html b/cave_data/1623-2023-EBH-01.html
index acf7076de..3ef9735fe 100644
--- a/cave_data/1623-2023-EBH-01.html
+++ b/cave_data/1623-2023-EBH-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Sept. 16, 2023, 12:11 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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-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:11 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10: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>
diff --git a/cave_data/1623-2023-EBH-02.html b/cave_data/1623-2023-EBH-02.html
index 32cd06201..d048f503b 100644
--- a/cave_data/1623-2023-EBH-02.html
+++ b/cave_data/1623-2023-EBH-02.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. 6, 2023, 10:22 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. 6, 2023, 10:22 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
diff --git a/cave_data/1623-2023-JS-03.html b/cave_data/1623-2023-JS-03.html
index d2ab469bb..3a13903dc 100644
--- a/cave_data/1623-2023-JS-03.html
+++ b/cave_data/1623-2023-JS-03.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Aug. 20, 2023, 5:23 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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 Aug. 20, 2023, 5:23 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10: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-2023-JS-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>Gardeners'World</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,12 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2023-JS-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-2023-JS-03+1623-2023-JS-03 'Z' =a= -->
-  <letter>a</letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <!-- DEBUG  1623-2023-JS-03+1623-2023-JS-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>Merryn Matthews, Joel Stobbart, Emily Mabbet, Tom Phillips, Lizzie Caisley</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. -->
-<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<survex_file></survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx -->
 <underground_description>About a 5m climb down to a boulder ledge. potentially way on under boulders to the East and West, however chossy and sketchy</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>rope useful if trying to push under bolders.</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-2023-MG-01.html b/cave_data/1623-2023-MG-01.html
index 3fcf7e0e4..32f5a1d11 100644
--- a/cave_data/1623-2023-MG-01.html
+++ b/cave_data/1623-2023-MG-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 9, 2023, 9:38 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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-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 9, 2023, 9:38 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10: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>
@@ -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-2023-mg-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
 
@@ -40,11 +40,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <entrance>
   <entranceslug>1623-2023-mg-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-2023-mg-01+1623-2023-mg-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>Martin Green, Will Kay</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/2023-mg-01/2023-mg-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 -->
+<survex_file>caves-1623/2023-mg-01/2023-mg-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><p>Tricky 3m climb down under dubious looking stone arch, leads to a small chamber.<a href='/1623/2023-mg-01/l/CUCC2023MG01arch.html'><img src='/1623/2023-mg-01/t/CUCC2023MG01arch.jpg' /></a>
 </p>
 
diff --git a/cave_data/1623-2023-hbrw-01.html b/cave_data/1623-2023-hbrw-01.html
index a2e3be015..9b12b5dca 100644
--- a/cave_data/1623-2023-hbrw-01.html
+++ b/cave_data/1623-2023-hbrw-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 3, 2023, 7:16 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10:42 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. 3, 2023, 7:16 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:42 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/entrance_data/1623-1999-OB-01.html b/entrance_data/1623-1999-OB-01.html
index c2c21d7c8..3f3947392 100644
--- a/entrance_data/1623-1999-OB-01.html
+++ b/entrance_data/1623-1999-OB-01.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. 6, 2023, 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. 6, 2023, 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-1999-OB-01</slug>
+<slug>1623-1999-OB-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></p><div class="centre"><img src="entrance.jpg"></a></div><p>Photo &copy; Olly Betts 1999</photo>
@@ -37,10 +49,12 @@
 <alt></alt>
 <northing></northing>
 <easting></easting> 
-<tag_station>1623.p99ob01 commented out of database</tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p99ob01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
-<other_description></other_description>
+<other_description>1623.p99ob01 commented out of database</other_description>
 <bearings>VSK 151, HSK 065, Sch 010, BZW 222 (from top of small cliff). (from NotKH 1996- book p110)</bearings>
 <url></url>
 </entrance>
diff --git a/entrance_data/1623-2012-HW-02.html b/entrance_data/1623-2012-HW-02.html
index 4cca8b02a..dfe327061 100644
--- a/entrance_data/1623-2012-HW-02.html
+++ b/entrance_data/1623-2012-HW-02.html
@@ -1,23 +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. 6, 2023, 10:22 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. 6, 2023, 10:22 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-HW-02</slug>
+<slug>1623-2012-HW-02</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description>Very broken, fluted shaft, partially choked with frost breakdown, in a 10 m x 5 m depression. Shaft is approximately 2 m x 1 m at top. Opens out and shelves under after approx 5 m. Possibly connects to adjacent choked shaft 2 m up dip.</entrance_description>
-<explorers>CUCC Expo
-
-Discovered 2012
-
-</explorers>
+<explorers>CUCC ExpoDiscovered 2012</explorers>
 <map_description></map_description>
 <location_description>On north side of Niederes Augsteck.</location_description>
+<lastvisit></lastvisit>
 <approach>From 204 camp follow cairns towards Tunnockschacht. From last ridge en route to Tunnockscacht, head north and up dip.</approach>
 <underground_description></underground_description>
 <photo><p><a href="i/2012HW02_01.jpg"><img src="t/2012HW02_01.jpg"/></a></p><p><a href="i/2012HW02_02.jpg"><img src="t/2012HW02_02.jpg"/></a></p></photo>
@@ -41,12 +49,14 @@ Discovered 2012
 <alt></alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station>1623.p2012-HW-02</other_station>
+<other_station>1623.p2012-hw-02</other_station>
 <other_description>gps</other_description>
 <bearings></bearings>
-<url>1623/2012-HW-02_entrance.html</url>
+<url></url>
 </entrance>
 </body>
 </html>
diff --git a/entrance_data/1623-2023-EBH-01.html b/entrance_data/1623-2023-EBH-01.html
index 05d6c67b0..c953fdb2c 100644
--- a/entrance_data/1623-2023-EBH-01.html
+++ b/entrance_data/1623-2023-EBH-01.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:11 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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 -->
@@ -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 Sept. 16, 2023, 12:11 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:40 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -50,7 +50,9 @@ though, you do not need to do a data import as it happens automatically -->
 <alt>1764</alt>
 <northing></northing>
 <easting></easting> 
-<tag_station>1623.p2023-ebh-03</tag_station>
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
+<tag_station>1623.p2023-ebh-01</tag_station>
 <exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
diff --git a/entrance_data/1623-2023-EBH-02.html b/entrance_data/1623-2023-EBH-02.html
index 7e06f6ad3..63f24e937 100644
--- a/entrance_data/1623-2023-EBH-02.html
+++ b/entrance_data/1623-2023-EBH-02.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. 6, 2023, 10:22 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 Sept. 16, 2023, 12:10 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:22 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>1754</alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station>1623.p2023-EBH-02</other_station>
+<other_station>1623.p2023-ebh-02</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2023-JS-03.html b/entrance_data/1623-2023-JS-03.html
index 3211b6af6..6582fdd30 100644
--- a/entrance_data/1623-2023-JS-03.html
+++ b/entrance_data/1623-2023-JS-03.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Aug. 20, 2023, 5:22 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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 Aug. 20, 2023, 5:22 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:23 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>1742</alt>
 <northing></northing>
 <easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station>1623.p2023-JS-03</other_station>
+<other_station>1623.p2023-js-03</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2023-hbrw-01.html b/entrance_data/1623-2023-hbrw-01.html
index 5a1016bff..c86836eae 100644
--- a/entrance_data/1623-2023-hbrw-01.html
+++ b/entrance_data/1623-2023-hbrw-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 8, 2023, 6:59 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10:42 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 8, 2023, 6:59 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:42 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>caves-1623.p2023-hbrw-01</other_station>
+<other_station>1623.p2023-hbrw-01</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2023-mg-01.html b/entrance_data/1623-2023-mg-01.html
index 227eb4eff..9e9016c5b 100644
--- a/entrance_data/1623-2023-mg-01.html
+++ b/entrance_data/1623-2023-mg-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 9:06 a.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on Oct. 6, 2023, 10: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 -->
@@ -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 9, 2023, 9:06 a.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on Oct. 6, 2023, 10:43 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -50,9 +50,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>1623.2023-mg-01</other_station>
+<other_station>1623.p2023-mg-01</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
