diff --git a/cave_data/1623-2015-DL-01.html b/cave_data/1623-2015-DL-01.html
index 1e950c2a0..aa76056c8 100644
--- a/cave_data/1623-2015-DL-01.html
+++ b/cave_data/1623-2015-DL-01.html
@@ -1,68 +1,54 @@
 <!DOCTYPE html>
-
-<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
+<!-- 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 -->
-
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-<b>This file is can be generated by troggle 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. -->
-<official_name>Shagged Spit H&ouml;hle</official_name><!-- Name of the cave (normally in German)  Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
-<area>1623</area><!-- e.g. "1623" -->
-<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
-code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
+<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>2015-DL-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>Shagged Spit H&ouml;hle</official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2015-DL-01</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-2015-DL-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 -->
-  <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.  -->
+  <entranceslug>1623-2015-DL-01</entranceslug>
+  <letter>a</letter>
 </entrance>
 
 <explorers>Dan Lenartowicz
-Matt Watson</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/2015-dl-01/2015-dl-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 -->
+Matt Watson</explorers>
+<survex_file>caves-1623/2015-dl-01/2015-dl-01.svx</survex_file>
 <underground_description>p7 leads into chossy rift, small crawl that would need digging. No other ways on.
-<img width=30% src="/expofiles/surveyscans/2015/2015%2316/notes.jpg"></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>2 Hangers, 2 slings, 20m Rope</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. -->
+<img width=30% src="/expofiles/surveyscans/2015/2015%2316/notes.jpg"></underground_description>
+<equipment>2 Hangers, 2 slings, 20m Rope</equipment>
 <references>Presumably on the same trip that found 2015-dl-02, near organhohle too <a href="logbookentry/2015-07-16/2015-07-16a">2015-07-16a</a>
 2015#16, 
-2017#54,55,56</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'. -->
+2017#54,55,56</references>
+<survey></survey>
 <notes>On 2018-06-06 04:24 +0100, Wookey wrote:
 Last week the GMH centreline work was completed and checked in, and the therionising progressed a bit and we eventually (with a lot of
 email) got to the bottom of the 'is Shagged Spit/GutenMorgenHoehle the same cave' mystery. Thanks to all who contributed - it was hard work, but we got there.
 
-(The answer is no, there are two entrances, originally believed to be the same cave, the upper (tagged, explored, described, unsurveyed, unlocated, unphotoed) one is SS and the lower (explored, surveyed, photoed, undescribed, located) one is GMH).</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
-<length>10m</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth>7m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+(The answer is no, there are two entrances, originally believed to be the same cave, the upper (tagged, explored, described, unsurveyed, unlocated, unphotoed) one is SS and the lower (explored, surveyed, photoed, undescribed, located) one is GMH).</notes>
+<length>10m</length>
+<depth>7m</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/entrance_data/1623-2015-DL-01.html b/entrance_data/1623-2015-DL-01.html
index 868668d23..fed1a8684 100644
--- a/entrance_data/1623-2015-DL-01.html
+++ b/entrance_data/1623-2015-DL-01.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
+<!-- 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 -->
@@ -13,17 +14,17 @@ 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 was hand-edited, see
+<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>
-<name></name>
+<slug>1623-2015-DL-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2015-DL-01</name>
 <entrance_description>7m shaft with stone bridge across top.
 
 4x3m and 2x2m</entrance_description>
 <explorers>Dan LenartowiczMatt Watson</explorers>
-<map_description></map_description>
 <location_description>On 2018-06-06 04:24 +0100, Wookey wrote:
 Last week the GMH centreline work was completed and checked in, and the therionising progressed a bit and we eventually (with a lot of
 email) got to the bottom of the 'is Shagged Spit/GutenMorgenHoehle the same cave' mystery. Thanks to all who contributed - it was hard work, but we got there.
@@ -33,20 +34,30 @@ email) got to the bottom of the 'is Shagged Spit/GutenMorgenHoehle the same cave
 <approach></approach>
 <underground_description>p7 leads to chossy rift</underground_description>
 <photo></photo>
-
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
 <marking>T</marking> 
 <marking_comment>CUCC 15DL01</marking_comment>
-
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
 <findability>S</findability>
 <findability_description>GPS data available on Anthony Day's GPS</findability_description>
 <alt></alt>
 <lat_wgs84></lat_wgs84> 
 <long_wgs84></long_wgs84> 
-<tag_station>1623.gmh</tag_station>
+<tag_station>1623.p2015-dl-01</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>
