diff --git a/1623/161/i/dscf0378.jpg b/1623/161/i/dscf0378.jpg
new file mode 100644
index 000000000..add44e89c
Binary files /dev/null and b/1623/161/i/dscf0378.jpg differ
diff --git a/1623/161/i/dscf0379.jpg b/1623/161/i/dscf0379.jpg
new file mode 100644
index 000000000..47faaa916
Binary files /dev/null and b/1623/161/i/dscf0379.jpg differ
diff --git a/1623/161/i/dscf0381.jpg b/1623/161/i/dscf0381.jpg
new file mode 100644
index 000000000..9f58bb4c2
Binary files /dev/null and b/1623/161/i/dscf0381.jpg differ
diff --git a/1623/161/i/dscf0382.jpg b/1623/161/i/dscf0382.jpg
new file mode 100644
index 000000000..77082442b
Binary files /dev/null and b/1623/161/i/dscf0382.jpg differ
diff --git a/1623/161/l/dscf0378.html b/1623/161/l/dscf0378.html
new file mode 100644
index 000000000..b70695137
--- /dev/null
+++ b/1623/161/l/dscf0378.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>
+dscf0378.jpg
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+</head>
+
+<body>
+<H1>dscf0378.jpg</H1>
+<div class="centre"><img alt="" src="/1623/161/i/dscf0378.jpg" />
+</div>
+
+<p><br /><br /></br /><br /></p>
+
+
+<p class="caption">Photo &copy; Julian Todd, 2009</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/161/l/dscf0379.html b/1623/161/l/dscf0379.html
new file mode 100644
index 000000000..fefbbb407
--- /dev/null
+++ b/1623/161/l/dscf0379.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>
+dscf0379.jpg
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+</head>
+
+<body>
+<H1>dscf0379.jpg</H1>
+<div class="centre"><img alt="" src="/1623/161/i/dscf0379.jpg" />
+</div>
+
+<p><br /><br /></br /><br /></p>
+
+
+<p class="caption">Photo &copy; Julian Todd, 2009</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/161/l/dscf0381.html b/1623/161/l/dscf0381.html
new file mode 100644
index 000000000..a813ed0d7
--- /dev/null
+++ b/1623/161/l/dscf0381.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>
+161f
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+</head>
+
+<body>
+<H1>161f</H1>
+<div class="centre"><img alt="" src="/1623/161/i/dscf0381.jpg" />
+</div>
+
+<p>from expofiles/photos<br /><br /></br /><br /></p>
+
+
+<p class="caption">Photo &copy; Julian Todd, 2009</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/161/l/dscf0382.html b/1623/161/l/dscf0382.html
new file mode 100644
index 000000000..5bf43a2ea
--- /dev/null
+++ b/1623/161/l/dscf0382.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>
+161f
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+</head>
+
+<body>
+<H1>161f</H1>
+<div class="centre"><img alt="" src="/1623/161/i/dscf0382.jpg" />
+</div>
+
+<p>Entrance tag<br /><br /></br /><br /></p>
+
+
+<p class="caption">Photo &copy; Julian Todd, 2009</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/161/t/dscf0378.jpg b/1623/161/t/dscf0378.jpg
new file mode 100644
index 000000000..7aff6dcb7
Binary files /dev/null and b/1623/161/t/dscf0378.jpg differ
diff --git a/1623/161/t/dscf0379.jpg b/1623/161/t/dscf0379.jpg
new file mode 100644
index 000000000..299bfb19b
Binary files /dev/null and b/1623/161/t/dscf0379.jpg differ
diff --git a/1623/161/t/dscf0381.jpg b/1623/161/t/dscf0381.jpg
new file mode 100644
index 000000000..6f58f1d6e
Binary files /dev/null and b/1623/161/t/dscf0381.jpg differ
diff --git a/1623/161/t/dscf0382.jpg b/1623/161/t/dscf0382.jpg
new file mode 100644
index 000000000..ee6ea5448
Binary files /dev/null and b/1623/161/t/dscf0382.jpg differ
diff --git a/cave_data/1623-161.html b/cave_data/1623-161.html
index 26ceb4f45..ef4bf975b 100644
--- a/cave_data/1623-161.html
+++ b/cave_data/1623-161.html
@@ -1,93 +1,71 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Nov. 2, 2023, 7:38 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, 7:38 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-161</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Kaninchenh&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>5/S/E x</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>161</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number></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>Kaninchenh&ouml;hle</official_name>
+<area>1623</area>
+<kataster_code>5/S/E x</kataster_code>
+<kataster_number>161</kataster_number> 
+<unofficial_number></unofficial_number>
 
 <entrance>
-  <entranceslug>1623-161a</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-161+1623-161a '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.  -->
+  <entranceslug>1623-161a</entranceslug>
+  <letter>a</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161b</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-161+1623-161b 'Z' =b= -->
-  <letter>b</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-161b</entranceslug>
+  <letter>b</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161c</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-161+1623-161c 'Z' =c= -->
-  <letter>c</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-161c</entranceslug>
+  <letter>c</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161d</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-161+1623-161d 'Z' =d= -->
-  <letter>d</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-161d</entranceslug>
+  <letter>d</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161e</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-161+1623-161e 'Z' =e= -->
-  <letter>e</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-161e</entranceslug>
+  <letter>e</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161f</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-161+1623-161f 'Z' =f= -->
-  <letter>f</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-161f</entranceslug>
+  <letter>f</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161g</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-161+1623-161g 'Z' =g= -->
-  <letter>g</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-161g</entranceslug>
+  <letter>g</letter>
 </entrance>
 
 <entrance>
-  <entranceslug>1623-161h</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-161+1623-161h 'Z' =h= -->
-  <letter>h</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-161h</entranceslug>
+  <letter>h</letter>
 </entrance>
 
-<explorers>CUCC 1988-98dd</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/161/161.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 -->
+<explorers>CUCC 1988-98dd</explorers>
+<survex_file>caves-1623/161/161.svx</survex_file>
 <underground_description>Rather than adopting the usual approach of describing every side passage in the main description, which makes the 
 'normal' descent route hard to follow, this description describes each main route down the cave first, mentioning side passages only where 
 necessary to make the correct main route clear. Various side passages and connecting routes are described subsequently, area by area. The 
@@ -148,19 +126,16 @@ draughty passage known as <a href="sibria.htm#siberia">Siberia</a>, which was le
 pushed in 1997 and 1998 down two very large pitches to a new deep point 534m below the 136 entrance at 1258m altitude.</p><p>There is just one 
 section of <a href="deepwy.htm#elevel">horizontal level</a> at c1400m, which is not very extensive to date, and similarly a tantalising glimpse 
 of what appears to have been very large trunk passage below 1300m in Siberia, but this is comprehensively choked in both directions.</p><p>This 
-overview is currently mostly updated to reflect exploration to 1995, though the line plots are up to 1996.</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>? grade 5</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>In dataset</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>26284m (2017)</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth>526m (2017)</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+overview is currently mostly updated to reflect exploration to 1995, though the line plots are up to 1996.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey>? grade 5</survey>
+<notes></notes>
+<length>26284m (2017)</length>
+<depth>526m (2017)</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/161/161.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-161f.html b/entrance_data/1623-161f.html
index 48a17d29e..44bbcbf02 100644
--- a/entrance_data/1623-161f.html
+++ b/entrance_data/1623-161f.html
@@ -1,23 +1,34 @@
 <!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>
+<slug>1623-161f</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>161f</name>
 <entrance_description></entrance_description>
 <explorers>CUCC 1988-98</explorers>
-<map_description></map_description>
 <location_description></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description><a href="pheast.htm#id161f">Click here for underground description</a></underground_description>
-<photo></photo>
+<photo><a href='/1623/161/l/dscf0382.html'><img src='/1623/161/t/dscf0382.jpg' /></a>&nbsp;<a href='/1623/161/l/dscf0378.html'><img src='/1623/161/t/dscf0378.jpg' /></a>&nbsp;
+<a href='/1623/161/l/dscf0379.html'><img src='/1623/161/t/dscf0379.jpg' /></a>&nbsp;</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -28,7 +39,7 @@
                       U  = Unmarked,
                       ?  = Unknown" -->
 <marking>T</marking> 
-<marking_comment></marking_comment>
+<marking_comment>CUCC 1623-161F</marking_comment>
 <!-- findability options: ? = To be confirmed ...,
                           S = Surveyed,
                           L = Lost,
@@ -36,14 +47,12 @@
 <findability>S</findability>
 <findability_description></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.p161f</other_station>
 <other_description></other_description>
-<bearings></bearings>
-<url>1623/161/161f.htm</url>
+<bearings></bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
diff --git a/folk/to-do/becka-2004.jpg b/folk/to-do/becka-2004.jpg
new file mode 100644
index 000000000..7a3ffbe5a
Binary files /dev/null and b/folk/to-do/becka-2004.jpg differ
