diff --git a/cave_data/1623-1992-X01.html b/cave_data/1623-1992-X01.html
index 2d109829d..b21d59d03 100644
--- a/cave_data/1623-1992-X01.html
+++ b/cave_data/1623-1992-X01.html
@@ -1,63 +1,47 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 18, 2023, 2:10 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
 <!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 18, 2023, 2:10 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> 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-1992-X01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<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>1/S -</kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<non_public>False</non_public>
 
-    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>1992-X01</unofficial_number><!-- (This is any name. Either this or kataster_number is required). Initial temporary cave ID used until kataster number is allocated e.g. '2012-DD-01'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code>1/S -</kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>1992-X01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-1992-X01</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
-  <letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+  <entranceslug>1623-1992-X01</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>CUCC 1992 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 -->
+<explorers>CUCC 1992 Olly Betts</explorers>
+<survex_file></survex_file>
 <underground_description>Undescended. 2 second drop with a rattle for a bit.
-<a href="/logbookentry/1992-08-01/1992-08-01a">1992-08-01a</a></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. -->
-<equipment></equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
-<references>1992 logbook (1992.08.01)<a href="/logbookentry/1992-08-01/1992-08-01a">1992-08-01a</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-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)  -->
+<a href="/logbookentry/1992-08-01/1992-08-01a">1992-08-01a</a></underground_description>
+<equipment></equipment>
+<references>1992 logbook (1992.08.01)<a href="/logbookentry/1992-08-01/1992-08-01a">1992-08-01a</a></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2012-sw-01.html b/cave_data/1623-2012-sw-01.html
index 71735337c..39b54c832 100644
--- a/cave_data/1623-2012-sw-01.html
+++ b/cave_data/1623-2012-sw-01.html
@@ -1,64 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
+<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <!-- Only put one cave in this file -->
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- If you edit this 162x-nnn.html file by hand, and manually upload it to the server using git,
 make sure you update the database by doing a full data import. If you edit it using the online form
 though, you do not need to do a data import as it happens automatically -->
-<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 2, 2023, 8:14 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> 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-sw-01</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<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
+<non_public>False</non_public>
 
-    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-sw-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'-->
+<official_name></official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2012-sw-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2012-sw-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-sw-01+1623-2012-sw-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.  -->
+  <entranceslug>1623-2012-sw-01</entranceslug>
+  <letter></letter>
 </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>"the shaft on the way to Tunnocks was visited, labeled 20120SW01 with a handbolting kit and found to be 8-10m deep and chossed up at the bottom. It wasn't descended due to lack of rope but this could be done in the future and will only need to be done once, so was worth tagging for this reason." [logbook]</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>Only records are in <a href="/walletedit/2012:47">Wallet 2012#47</a> and <a href="/logbookentry/2012-08-01/2012-08-01e">Logbook 2012-08-01e</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
-<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status></kataster_status>
-<underground_centre_line></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 have entrance photo but the GPS data is lost as it was never transcribed or uploaded.</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)  -->
+<explorers></explorers>
+<survex_file></survex_file>
+<underground_description>"the shaft on the way to Tunnocks was visited, labeled 20120SW01 with a handbolting kit and found to be 8-10m deep and chossed up at the bottom. It wasn't descended due to lack of rope but this could be done in the future and will only need to be done once, so was worth tagging for this reason." [logbook]</underground_description>
+<equipment></equipment>
+<references>Only records are in <a href="/walletedit/2012:47">Wallet 2012#47</a> and <a href="/logbookentry/2012-08-01/2012-08-01e">Logbook 2012-08-01e</a></references>
+<survey></survey>
+<notes>We have entrance photo but the GPS data is lost as it was never transcribed or uploaded.</notes>
+<length></length>
+<depth></depth>
 <extent></extent>
 
-<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
-<url>1623/2012-sw-01/2012-sw-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')-->
+<description_file></description_file>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-1992-X01.html b/entrance_data/1623-1992-X01.html
index 8d025bb9d..781632668 100644
--- a/entrance_data/1623-1992-X01.html
+++ b/entrance_data/1623-1992-X01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Nov. 18, 2023, 2:10 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle  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,22 +14,21 @@ though, you do not need to do a data import as it happens automatically -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is generated by troggle</b> on Nov. 18, 2023, 2:10 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b>  using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
 <non_public>False</non_public>
- <!-- <slug> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
-<name></name>
-<entrance_description><img src="/years/1992/going-caves.jpg"></entrance_description>
+<slug>1623-1992-X01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>1992-X01</name>
+<entrance_description>..marked "CUCC -" 'cos we've run out of numbers. This one is where the 2 Puffball route variants merge/split.</entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description></location_description>
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><img src="/years/1992/going-caves.jpg">
+<br/><img src="/years/1992/callout-bit.jpg"></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -40,7 +39,7 @@ though, you do not need to do a data import as it happens automatically -->
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>U</marking> 
-<marking_comment></marking_comment>
+<marking_comment>" CUCC " because we had run out of numbers</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
diff --git a/entrance_data/1623-2012-sw-01.html b/entrance_data/1623-2012-sw-01.html
index 5f53fdf04..7ea16e7b9 100644
--- a/entrance_data/1623-2012-sw-01.html
+++ b/entrance_data/1623-2012-sw-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on Oct. 19, 2023, 8:57 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle  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,23 +14,21 @@ 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. 19, 2023, 8:57 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b>  using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
 <non_public>False</non_public>
- <!-- <slug> ignored, not needed. Now using filename -->
- <!-- <slug> ignored, not needed. Now using filename -->
-<name></name>
-<entrance_description><a href='/1623/2012-sw-01/l/2012-sw-01_i1.html'><img src='/1623/2012-sw-01/t/2012-sw-01_i1.jpg' /></a>
-<br>PHOTOS/2012/entranceoriginals/2012-sw-01/i/2012-sw-01_i1.jpg</entrance_description>
+<slug>1623-2012-sw-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2012-sw-01</name>
+<entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description></location_description>
 <lastvisit>2012-08-01</lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2012-sw-01/l/2012-sw-01_i1.html'><img src='/1623/2012-sw-01/t/2012-sw-01_i1.jpg' /></a>
+<br>PHOTOS/2012/entranceoriginals/2012-sw-01/i/2012-sw-01_i1.jpg</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -54,8 +52,7 @@ though, you do not need to do a data import as it happens automatically -->
 <tag_station></tag_station>
 <other_station></other_station>
 <other_description></other_description>
-<bearings></bearings>
-<url></url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
