diff --git a/1623/96/i/zoomin.jpg b/1623/96/i/zoomin.jpg
new file mode 100644
index 000000000..6da3b1250
Binary files /dev/null and b/1623/96/i/zoomin.jpg differ
diff --git a/1623/96/l/zoomin.html b/1623/96/l/zoomin.html
new file mode 100644
index 000000000..44139c16e
--- /dev/null
+++ b/1623/96/l/zoomin.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>
+Tag
+</title>
+<link rel="stylesheet" type="text/css" href="/css/main2.css" />
+</head>
+
+<body>
+<H1>Tag</H1>
+<div class="centre"><img alt="" src="/1623/96/i/zoomin.jpg" />
+</div>
+
+<p>zoomed in, we can see a tag in the place where the painted &quot;96&quot; has fasded completey.</p>
+
+
+<p class="caption">Photo &copy; PhilipSargent, 2024</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/96/t/zoomin.jpg b/1623/96/t/zoomin.jpg
new file mode 100644
index 000000000..d42d86991
Binary files /dev/null and b/1623/96/t/zoomin.jpg differ
diff --git a/1623/others/README.txt b/1623/others/README.txt
index 5811aad4d..d086c3f70 100644
--- a/1623/others/README.txt
+++ b/1623/others/README.txt
@@ -1,3 +1,5 @@
-All this stuff in 1623/others/ should really be in the /guidebook area of the site, as everything below /1623/ is expected to be a cave description.
+Much of this stuff in 1623/others/ should really be in the /guidebook area of the site, as everything below /1623/ is expected to be a cave description.
 
-We have not moved it yet because it would be pain editing all the URLs.
\ No newline at end of file
+We have not moved it yet because it would be pain editing all the URLs.
+
+But a lot of it _is_ caves, and needs to be moved to a cave folder
diff --git a/cave_data/1623-84.html b/cave_data/1623-84.html
index af37ef721..bfbacde5a 100644
--- a/cave_data/1623-84.html
+++ b/cave_data/1623-84.html
@@ -35,7 +35,7 @@ the form documented at
 <equipment></equipment>
 <references></references>
 <survey>Grade 1 extended elevation in Cambridge Underground <a href="/1623/others/80-86.png">expedition report</a>
-<a href="/1623/others/80-86.png"><img src="/1623/others/84-elev-extract.jpg"></survey>
+<a href="/1623/others/80-86.png"><img src="/1623/others/84-elev-extract.jpg"></a></survey>
 <notes></notes>
 <length></length>
 <depth></depth>
diff --git a/cave_data/1623-96.html b/cave_data/1623-96.html
index 2a7177481..a5653619d 100644
--- a/cave_data/1623-96.html
+++ b/cave_data/1623-96.html
@@ -1,60 +1,46 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 12, 2024, 9:23 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 July 12, 2024, 9:23 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></caveslug>--> <!-- Ignored. No longer required, we use the filename instead e.g. 1623-315 for 1623-315.html  -->
-<official_name>Br&auml;u Schacht 96</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>3/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>96</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'-->
+<official_name>Br&auml;u Schacht 96</official_name>
+<area>1623</area>
+<kataster_code>3/S +</kataster_code>
+<kataster_number>96</kataster_number> 
+<unofficial_number></unofficial_number>
 
 <entrance>
-  <entranceslug>1623-96</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.  -->
+  <entranceslug>1623-96</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>CUCC 1977 - Team Enthusiast.</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/96/96.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 -->
-<underground_description>Open shaft of 15m leads to a descending rift. Next pitch of 25m, then a short climb, 6m pitch and 15m pitch into a chamber where the water sinks. The upper level of a small rift leads to an abandoned passage and a series of increasingly muddy freeclimbs to a final squeeze and 5m pitch into a sordid little sump.</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></p><p><img alt="grade 1 elevation: 13k gif" width="640" height="900" src="96.png" /></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>105m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>CUCC 1977 - Team Enthusiast.</explorers>
+<survex_file>caves-1623/96/96.svx</survex_file>
+<underground_description>Open shaft of 15m leads to a descending rift. Next pitch of 25m, then a short climb, 6m pitch and 15m pitch into a chamber where the water sinks. The upper level of a small rift leads to an abandoned passage and a series of increasingly muddy freeclimbs to a final squeeze and 5m pitch into a sordid little sump.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></p><p><img alt="grade 1 elevation: 13k gif" width="640" height="900" src="96.png" /></survey>
+<notes></notes>
+<length></length>
+<depth>105m</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-84.html b/entrance_data/1623-84.html
index 6b6dd4aa2..d7a126fe7 100644
--- a/entrance_data/1623-84.html
+++ b/entrance_data/1623-84.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>
-
-
+<slug>1623-84</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
-<location_description>Plateau WNW of <a href="/1623/83/83.htm">Kat.83</a></location_description>
+<location_description>Plateau WNW of <a href="/1623/83/83.html">Kat.83</a></location_description>
+<lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
 <photo></photo>
@@ -36,14 +46,12 @@
 <findability>L</findability>
 <findability_description>Not seen since 1977 apparently</findability_description>
 <alt>c 1660m</alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station></tag_station>
-<exact_station></exact_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>
diff --git a/entrance_data/1623-96.html b/entrance_data/1623-96.html
index ff5f59289..faf6d9186 100644
--- a/entrance_data/1623-96.html
+++ b/entrance_data/1623-96.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 12, 2024, 9:23 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,13 +14,12 @@ 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 12, 2024, 9:23 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 -->
+<slug>1623-96</slug> <!-- one entrance and one slug per entrance_data file -->
 <name></name>
 <entrance_description></entrance_description>
 <explorers></explorers>
@@ -45,6 +44,9 @@ though, you do not need to do a data import as it happens automatically -->
 <a href='/1623/96/l/PXL_20240711_074632151.html'><img src='/1623/96/t/PXL_20240711_074632151.jpg' /></a>
 <a href='/1623/96/l/PXL_20240711_074558314.html'><img src='/1623/96/t/PXL_20240711_074558314.jpg' /></a>
 <a href='/1623/96/l/PXL_20240711_074617155.html'><img src='/1623/96/t/PXL_20240711_074617155.jpg' /></a>
+
+  
+  <a href='/1623/96/l/zoomin.html'><img src='/1623/96/t/zoomin.jpg' /></a>
 <p>Photos in 2024</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
