diff --git a/1623/159/i/159-branches.jpg b/1623/159/i/159-branches.jpg
new file mode 100644
index 000000000..765b53793
Binary files /dev/null and b/1623/159/i/159-branches.jpg differ
diff --git a/1623/159/i/159-hard-to-see.jpg b/1623/159/i/159-hard-to-see.jpg
new file mode 100644
index 000000000..151319f68
Binary files /dev/null and b/1623/159/i/159-hard-to-see.jpg differ
diff --git a/1623/159/i/159-tag.jpg b/1623/159/i/159-tag.jpg
new file mode 100644
index 000000000..7b7b08d68
Binary files /dev/null and b/1623/159/i/159-tag.jpg differ
diff --git a/1623/159/i/159-video-frame.jpg b/1623/159/i/159-video-frame.jpg
new file mode 100644
index 000000000..0e8ba803b
Binary files /dev/null and b/1623/159/i/159-video-frame.jpg differ
diff --git a/1623/159/l/159-branches.html b/1623/159/l/159-branches.html
new file mode 100644
index 000000000..7ed4bb2bb
--- /dev/null
+++ b/1623/159/l/159-branches.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<title>
+Branches hide the entrance
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>Branches hide the entrance</H1>
+<div class="centre"><img alt="" src="/1623/159/i/159-branches.jpg" />
+</div>
+
+<p>Many branches</p>
+
+
+<p class="caption">Photo &copy; Philip Sargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/159/l/159-hard-to-see.html b/1623/159/l/159-hard-to-see.html
new file mode 100644
index 000000000..5bd983178
--- /dev/null
+++ b/1623/159/l/159-hard-to-see.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<title>
+Inconveniently placed tag
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>Inconveniently placed tag</H1>
+<div class="centre"><img alt="" src="/1623/159/i/159-hard-to-see.jpg" />
+</div>
+
+<p>Looking down.</p>
+
+
+<p class="caption">Photo &copy; Philip Sargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/159/l/159-tag.html b/1623/159/l/159-tag.html
new file mode 100644
index 000000000..415e1b0ad
--- /dev/null
+++ b/1623/159/l/159-tag.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<title>
+159 tag
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>159 tag</H1>
+<div class="centre"><img alt="" src="/1623/159/i/159-tag.jpg" />
+</div>
+
+<p>Hanging vertically down</p>
+
+
+<p class="caption">Photo &copy; Philip Sargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/159/l/159-video-frame.html b/1623/159/l/159-video-frame.html
new file mode 100644
index 000000000..48b21462f
--- /dev/null
+++ b/1623/159/l/159-video-frame.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<title>
+159 tag
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>159 tag</H1>
+<div class="centre"><img alt="" src="/1623/159/i/159-video-frame.jpg" />
+</div>
+
+<p>From a video frame (by mistake)</p>
+
+
+<p class="caption">Photo &copy; Philip Sargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/159/t/159-branches.jpg b/1623/159/t/159-branches.jpg
new file mode 100644
index 000000000..2e95bdedc
Binary files /dev/null and b/1623/159/t/159-branches.jpg differ
diff --git a/1623/159/t/159-hard-to-see.jpg b/1623/159/t/159-hard-to-see.jpg
new file mode 100644
index 000000000..f7056fc34
Binary files /dev/null and b/1623/159/t/159-hard-to-see.jpg differ
diff --git a/1623/159/t/159-tag.jpg b/1623/159/t/159-tag.jpg
new file mode 100644
index 000000000..7bb75dc53
Binary files /dev/null and b/1623/159/t/159-tag.jpg differ
diff --git a/1623/159/t/159-video-frame.jpg b/1623/159/t/159-video-frame.jpg
new file mode 100644
index 000000000..b8e18c22c
Binary files /dev/null and b/1623/159/t/159-video-frame.jpg differ
diff --git a/1623/91/i/IMG_20240725_131239.jpg b/1623/91/i/IMG_20240725_131239.jpg
new file mode 100644
index 000000000..d9bc3a4bf
Binary files /dev/null and b/1623/91/i/IMG_20240725_131239.jpg differ
diff --git a/1623/91/l/IMG_20240725_131239.html b/1623/91/l/IMG_20240725_131239.html
new file mode 100644
index 000000000..0dc4e31f1
--- /dev/null
+++ b/1623/91/l/IMG_20240725_131239.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+<title>
+Entrance context
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>Entrance context</H1>
+<div class="centre"><img alt="" src="/1623/91/i/IMG_20240725_131239.jpg" />
+</div>
+
+<p>Entrance</p>
+
+
+<p class="caption">Photo &copy; Philip Sargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/91/t/IMG_20240725_131239.jpg b/1623/91/t/IMG_20240725_131239.jpg
new file mode 100644
index 000000000..c102bee99
Binary files /dev/null and b/1623/91/t/IMG_20240725_131239.jpg differ
diff --git a/cave_data/1623-159.html b/cave_data/1623-159.html
index 0747b12dd..aef80d3e5 100644
--- a/cave_data/1623-159.html
+++ b/cave_data/1623-159.html
@@ -1,40 +1,60 @@
 <!DOCTYPE html>
+<!-- This file is generated by troggle on July 26, 2024, 9:01 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 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 July 26, 2024, 9:01 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-159</caveslug>
-<official_name>Winded Hole</official_name>
-<area>1623</area>
-<area>1a</area>
-<kataster_code>2/S +</kataster_code>
-<kataster_number>159</kataster_number> 
-<unofficial_number></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></caveslug>--> <!-- Ignored. No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html  -->
+<official_name>Winded Hole</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>2/S +</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>159</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number></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'-->
 
 <entrance>
-  <entranceslug>1623-159</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-159</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 entrance then the letter needs to be given. Must match the entranceslug ID.  -->
 </entrance>
 
-<explorers>CUCC 1988 (1st pitch Chris &amp; Becka, bottomed by Chris).</explorers>
-<underground_description>Two bolts in entrance for Y-hang to give c40m vertical to a boulder floor, then a further 20m in a big boulder chamber. A "nice skeleton" and an old colander (!) were found on the terminal choke in 1988.</underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length></length>
-<depth>c50m</depth>
+<explorers>CUCC 1988 (1st pitch Chris &amp; Becka, bottomed by Chris).</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>Two bolts in entrance for Y-hang to give c40m vertical to a boulder floor, then a further 20m in a big boulder chamber. A "nice skeleton" and an old colander (!) were found on the terminal choke in 1988.</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. -->
+<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
+<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
+<depth>c50m</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/159/159.html</url>
+
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 </cave>
 </body>
 </html>
diff --git a/cave_data/1623-91.html b/cave_data/1623-91.html
index 021aa7107..f22372a8b 100644
--- a/cave_data/1623-91.html
+++ b/cave_data/1623-91.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 26, 2024, 8:09 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 26, 2024, 8:14 p.m. UTC using the form documented at /handbook/survey/caveentry.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
@@ -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, 2024, 8:09 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 26, 2024, 8: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>
diff --git a/entrance_data/1623-159.html b/entrance_data/1623-159.html
index a591ef0c6..77afce819 100644
--- a/entrance_data/1623-159.html
+++ b/entrance_data/1623-159.html
@@ -1,23 +1,45 @@
 <!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 July 26, 2024, 9:01 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 July 26, 2024, 9:01 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-159</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description>Near 'crapping region' of Top Camp (1990). Cave is on the same fault/joint as <a href="/1623/90/90.html">1623/90</a>, <a href="/1623/207/207.html">1623/207</a> and  <a href="/1623/208/208.html">1623/208</a>, but further out from the Br&auml;uning Wall, c 100m on 067&deg;.</location_description>
+<lastvisit></lastvisit>
 <approach>Cave relocated 1990, 1996 and surveyed to in 1998. Entrance reached in two minutes from upper top camp by heading west and dropping down one terrace.</approach>
 <underground_description></underground_description>
-<photo></p><table class="imgtable"><tr><td><a href="/1623/others/l/159.htm"><img alt="entrance photo - link to 56k jpeg" src="/1623/others/t/159.jpg" /></td><td><a href="ent2005.jpg"><img src="ent2005_small.jpg" /></a></td></tr><tr class="caption"><td>View towards col</td><td>View down shaft (note tag on shaft wall just below number board)</td></tr></table><p>Photos &copy; Andy Waddington 1998 and David Loeffler 2005</photo>
+<photo></p><table class="imgtable"><tr><td><a href="/1623/others/l/159.htm"><img alt="entrance photo - link to 56k jpeg" src="/1623/others/t/159.jpg" /></td><td><a href="ent2005.jpg"><img src="ent2005_small.jpg" /></a></td></tr><tr class="caption"><td>View towards col</td><td>View down shaft (note tag on shaft wall just below number board)</td></tr></table><p>Photos &copy; Andy Waddington 1998 and David Loeffler 2005
+
+<p>
+Re-visited in 2024: the entrance is now heavily overgrown and the tag very inconveniently positioned among branches.
+<p><a href='/1623/159/l/159-tag.html'><img src='/1623/159/t/159-tag.jpg' /></a>
+&nbsp;
+
+<a href='/1623/159/l/159-hard-to-see.html'><img src='/1623/159/t/159-hard-to-see.jpg' /></a>
+  &nbsp;
+  <a href='/1623/159/l/159-video-frame.html'><img src='/1623/159/t/159-video-frame.jpg' /></a>
+  &nbsp;
+
+  <a href='/1623/159/l/159-branches.html'><img src='/1623/159/t/159-branches.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -28,7 +50,8 @@
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>T</marking> 
-<marking_comment>orange number "159" facing north. 1998 tag "1623 159 CUCC 1988" attached to more northerly of two Y-hang bolts, just below surface. This is the anchor visible in the photograph (with an orange circle painted round it), taken before the tag was attached.</marking_comment>
+<marking_comment>orange number "159" facing north. 1998 tag "1623 159 CUCC 1988" attached to more northerly of two Y-hang bolts, just below surface. This is the anchor visible in the photograph (with an orange circle painted round it), taken before the tag was attached.
+<p></marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
@@ -36,14 +59,12 @@
 <findability>S</findability>
 <findability_description></findability_description>
 <alt></alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station>1623.t159</tag_station>
-<exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
-<bearings>1990 Bearings (we have no idea where these came from and they aren't remotely in the right place): HSK 116&deg;, Nipple 174&deg;, Br&auml;uning Nase 199&deg;, Br&auml;uning Zinken 216&deg;</p><p>1996: HSK 059&deg;, VSK nipple 111&deg;, Br&auml;uning Nase 152&deg;, Kleine Wild Kogel 009&deg;(left) and 010&deg;(right), Br&auml;uning Wall pt. 1828 209&deg;, Br&auml;uning Wall pt. 1835 221&deg;, Br&auml;uning Zinken 232&deg; </bearings>
-<url></url>
+<bearings>1990 Bearings (we have no idea where these came from and they aren't remotely in the right place): HSK 116&deg;, Nipple 174&deg;, Br&auml;uning Nase 199&deg;, Br&auml;uning Zinken 216&deg;</p><p>1996: HSK 059&deg;, VSK nipple 111&deg;, Br&auml;uning Nase 152&deg;, Kleine Wild Kogel 009&deg;(left) and 010&deg;(right), Br&auml;uning Wall pt. 1828 209&deg;, Br&auml;uning Wall pt. 1835 221&deg;, Br&auml;uning Zinken 232&deg; </bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
diff --git a/entrance_data/1623-91.html b/entrance_data/1623-91.html
index e27d21c69..be7e6365a 100644
--- a/entrance_data/1623-91.html
+++ b/entrance_data/1623-91.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 26, 2024, 8:09 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 26, 2024, 8: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 -->
@@ -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, 2024, 8:09 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 26, 2024, 8:14 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -35,14 +35,18 @@ though, you do not need to do a data import as it happens automatically -->
 
 
 </table>
+  <p>
+
+<a width=10% href='/1623/91/l/1623-91-tag-position.html'><img src='/1623/91/i/1623-91-tag-position.jpg' /></a>
+    
 <p>
 <a href='/1623/91/l/1623-91.html'><img src='/1623/91/t/1623-91.jpg' /></a>
 
-<a width=10% href='/1623/91/l/1623-91-tag-position.html'><img src='/1623/91/i/1623-91-tag-position.jpg' /></a>
 
 <p><a href='/1623/91/l/IMG_20240725_131219.html'><img width=10% src='/1623/91/i/IMG_20240725_131219.jpg' /></a>
-
-
+<p>
+  <a href='/1623/91/l/IMG_20240725_131239.html'><img src='/1623/91/t/IMG_20240725_131239.jpg' /></a>
+<p>
 (Photos &copy; Andy Waddington 1990 and Olly Betts 1999. Photos 2024 &copy; Expo.)</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),


View towards col	View down shaft (note tag on shaft wall just below number board)