diff --git a/cave_data/1623-2001-06.html b/cave_data/1623-2001-06.html
index 7e527f2ae..574e83b02 100644
--- a/cave_data/1623-2001-06.html
+++ b/cave_data/1623-2001-06.html
@@ -1,17 +1,26 @@
 <!DOCTYPE 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 file, make sure you update the websites database -->
+<!-- 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 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>
-<caveslug>1623-2001-06</caveslug>
-<official_name>Erb&auml;rmlichbaumh&ouml;hle</official_name>
+<unexplored>True</unexplored>
+
+<official_name>Erb&auml;rmlichbaumh&ouml;hle (Sorry Tree Hole)</official_name>
 <area>1623</area>
-<area>2b</area>
 <kataster_code>-0</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2001-06</unofficial_number>
@@ -22,19 +31,17 @@
 </entrance>
 
 <explorers>Entrance noted CUCC 2001 Olly B, Martin</explorers>
-<underground_description></underground_description>
+<survex_file></survex_file>
+<underground_description>Entrance is a hading rift by very sad looking pine tree (2001), originally blocked by loose rocks, now removed. Descent gives rock slope with several seconds rattle.</underground_description>
 <equipment></equipment>
-<references></references>
-<survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
+<references>logbook <a href="/logbookentry/2002-08-18/2002-08-18a">2002-08-18a</a></references>
+<survey>Lack of light prevented exploration on discovery, and repeat visit in 2002 aborted due to rain.</survey>
+<notes>On east side of Vord., access (in 2001) by cairned path from "portal row" (route between 40a and 40 s/e/h) to Schwartzmooss&auml;ttel (the col), leaving path uphill into l&auml;rchen.</notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file></survex_file>
+
 <description_file></description_file>
-<url>1623/2001-06/2001-06.html</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2001-07.html b/cave_data/1623-2001-07.html
index 9fd780352..786e75d56 100644
--- a/cave_data/1623-2001-07.html
+++ b/cave_data/1623-2001-07.html
@@ -1,18 +1,27 @@
 <!DOCTYPE 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 file, make sure you update the websites database -->
+<!-- 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 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>
-<caveslug>1623-2001-07</caveslug>
+<unexplored>True</unexplored>
+
 <official_name>Hoffnungschacht</official_name>
 <area>1623</area>
-<area>2b</area>
-<kataster_code>=</kataster_code>
+<kataster_code>1/T=</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2001-07</unofficial_number>
 
@@ -22,19 +31,19 @@
 </entrance>
 
 <explorers>Entrance noted CUCC 2001 Olly B, Martin; partial descent 2002 Wookey</explorers>
-<underground_description>Shaft entrance has good flake to rig off. Ledge at -8m then another at -11, now into wider rift. 2 rope protectors required as rock is very sharp. Bottoms at -22m. Choked floor. Can see through to continuation below but not suitable for exploration in shorts + T-shirt so not pushed. Draughts inwards if at all, not strongly. </underground_description>
+<survex_file></survex_file>
+<underground_description>Hopeful Shaft. <p>
+Shaft entrance has good flake to rig off. Ledge at -8m then another at -11, now into wider rift. 2 rope protectors required as rock is very sharp. Bottoms at -22m. Choked floor. Can see through to continuation below but not suitable for exploration in shorts + T-shirt so not pushed. Draughts inwards if at all, not strongly.</underground_description>
 <equipment>2 hangers, some rope, 2 protectors</equipment>
-<references>See 2002 logbook entry (2002-08-05)</references>
-<survey>? wookey (grade 2 sketch)</survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
+<references>See 2002 logbook entry <a href="/logbookentry/2002-08-05/2002-08-05a">(2002-08-05)</a></references>
+<survey>? wookey (grade 2 sketch).<p>
+"Very narrow hole in rift with [??, could be "fern"] in entrance. Very good rattle when you throw rocks. Good flake to rig off allows descent. Ledge at -8m then another at -11, now into wider rift. 2 'tectors needed as rock very sharp. Bottoms at -22m. Choked floor. Can see through to continuation below but not suitable for shorts + T-shirt (the whole cave isn't really!) so not checked out to bitter end. If there is a draught it is in not out and isn't strong. Ought to be finished off one day. Put in tag/rig backup bolt. Photoed. Grade 2 survey." - logbook entry</survey>
 <notes>Marked on Olly's GPS as "RATTLE", owing to the impressive sound on throwing rocks down</notes>
 <length>22m</length>
 <depth>22m</depth>
 <extent></extent>
-<survex_file></survex_file>
+
 <description_file></description_file>
-<url>1623/2001-07/2001-07.html</url>
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-2001-08.html b/cave_data/1623-2001-08.html
index 2217e68d5..daf564091 100644
--- a/cave_data/1623-2001-08.html
+++ b/cave_data/1623-2001-08.html
@@ -1,17 +1,26 @@
 <!DOCTYPE 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 file, make sure you update the websites database -->
+<!-- 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 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>
-<caveslug>1623-2001-08</caveslug>
+<unexplored>False</unexplored>
+
 <official_name>Schneeoberlichtschacht</official_name>
 <area>1623</area>
-<area>2b</area>
 <kataster_code>0</kataster_code>
 <kataster_number></kataster_number> 
 <unofficial_number>2001-08</unofficial_number>
@@ -22,19 +31,18 @@
 </entrance>
 
 <explorers>CUCC 2001 Olly B, Martin; CUCC 2002 Olly B, Wookey</explorers>
-<underground_description>Descended from single thread over a few rubs to reach bottom. Very photogenic inside. Checked out thoroughly - it doesn't go.</underground_description>
+<survex_file></survex_file>
+<underground_description>Descended from single thread over a few rubs to reach bottom. Very photogenic inside. Checked out thoroughly - it doesn't go.<p>
+Entrance 20m deep onto snowplug lit by skylight on the far side.</underground_description>
 <equipment>20m rope minimum</equipment>
-<references>See 2002 logbook entry (2002-08-05)</references>
-<survey>? wookey (grade 2 sketch)</survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
+<references>See 2002 logbook entry <a href="/logbookentry/2002-08-05/2002-08-05a">(2002-08-05)</a></references>
+<survey>? wookey (grade 2 sketch).</survey>
 <notes></notes>
 <length></length>
 <depth></depth>
 <extent></extent>
-<survex_file></survex_file>
+
 <description_file></description_file>
-<url>1623/2001-08/2001-08.html</url>
 </cave>
 </body>
 </html>
diff --git a/entrance_data/1623-2001-07.html b/entrance_data/1623-2001-07.html
index d8b1962b0..f670476fb 100644
--- a/entrance_data/1623-2001-07.html
+++ b/entrance_data/1623-2001-07.html
@@ -1,20 +1,30 @@
 <!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  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>  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>
-<entrance_description></entrance_description>
+<slug>1623-2001-07</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2001-07</name>
+<entrance_description>Entrance is narrow (less than 1x1m) shaft with vegetation around it in a small depression in the pavement. Rocks fall for 2s followed by a long rattle.</entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description>Above Eish&ouml;hle portal row area, somewhat east across choss bowl from 237 and 2001-08</location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></p><div class="centre"> <a href="2001-07ent.jpg"><img src="2001-07ent_small.jpg"></a></div><p>Photo &copy; Wookey 2002</photo>
@@ -34,16 +44,14 @@
                           L = Lost,
                           R = Refindable" -->
 <findability>S</findability>
-<findability_description></findability_description>
+<findability_description>Access by cairned path from portal row (40a - 40e/s/h) to the col, leave path into l&auml;rchen.</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>1623.gps02olly.2001-07</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>
