diff --git a/1623/174/view.jpg b/1623/174/view.jpg
index b440edf74..a2286d755 100644
Binary files a/1623/174/view.jpg and b/1623/174/view.jpg differ
diff --git a/1623/174/view_small.jpg b/1623/174/view_small.jpg
index 716006a6c..d1796c030 100644
Binary files a/1623/174/view_small.jpg and b/1623/174/view_small.jpg differ
diff --git a/cave_data/1623-174.html b/cave_data/1623-174.html
index 193c2cfd1..c0bbd5bcf 100644
--- a/cave_data/1623-174.html
+++ b/cave_data/1623-174.html
@@ -1,64 +1,47 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on Oct. 6, 2023, 2:29 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 Oct. 6, 2023, 2:29 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-174</caveslug><!--(Ignored). Internal I.D. formerlly used. Using filename''  -->
-<official_name>Plateau Schacht 90/4</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>1/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>
+<unexplored>False</unexplored>
 
-    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>174</kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
-<unofficial_number>90/4</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>Plateau Schacht 90/4</official_name>
+<area>1623</area>
+<kataster_code>1/S +</kataster_code>
+<kataster_number>174</kataster_number> 
+<unofficial_number>90/4</unofficial_number>
 
 <entrance>
-  <entranceslug>1623-174</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-174+1623-174 'Z' == -->
-  <letter></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-174</entranceslug>
+  <letter></letter>
 </entrance>
 
-<explorers>Recorded CUCC 1990, descended by Adam ?</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/174/174.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>c 30m shaft, climbable for first 10m to rock bridge. Snow at bottom, but cobble floor also visible.</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. -->
-<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'. -->
-<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></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
-<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<explorers>Recorded CUCC 1990, descended by Adam ?</explorers>
+<survex_file>caves-1623/174/174.svx</survex_file>
+<underground_description>c 30m shaft, climbable for first 10m to rock bridge. Snow at bottom, but cobble floor also visible.</underground_description>
+<equipment></equipment>
+<references></references>
+<survey></survey>
+<notes></notes>
+<length></length>
+<depth></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/174/174.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-174.html b/entrance_data/1623-174.html
index 35ba64386..0ca498d63 100644
--- a/entrance_data/1623-174.html
+++ b/entrance_data/1623-174.html
@@ -1,23 +1,33 @@
 <!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-174</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>174</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
-<map_description></map_description>
 <location_description>Situated on fracture bearing 044&deg; which forms prominent banded cliff visible North of Top Camp on second low ridge.</location_description>
+<lastvisit></lastvisit>
 <approach>This cave is quite hard to find, even though the bearings get you very close. It is just below a cliff, which is almost the highest bit of cliff in the vicinity. The entrance is almost on the (E-W) axis on the ridge and the cliff faces SE. The number is easily missed.</approach>
 <underground_description></underground_description>
-<photo></p><table class="imgtable"><tr><td><a href="ent95.jpg"><img alt="Photo of entrance" src="ent95_small.jpg" /></a></td><td><a href="tag.jpg"><img alt="Tag" src="tag_small.jpg" /></a></td><td><a href="view.jpg"><img alt="" src="view_small.jpg" /></a></td><td><a href="wall.jpg"><img alt="" src="wall_small.jpg" /></a></td></tr><tr class="caption"><td>Robert Seebacher at the entrance in 1995</td><td>Tag and painted number</td><td>View back towards Brauning Wall, showing possible fault</td><td>Weathered rock on wall behind entrance shaft</td></tr></table><p>Photos &copy; Andy Waddington 1995 (1) and &copy; Olly Betts 2005 (2,3,4).</photo>
+<photo></p><table class="imgtable"><tr><td><a href="ent95.jpg"><img alt="Photo of entrance" src="ent95_small.jpg" /></a></td><td><a href="tag.jpg"><img alt="Tag" src="tag_small.jpg" /></a></td><td><a href="view.jpg"><img alt="" src="view_small.jpg" /></a></td><td><a href="wall.jpg"><img alt="" src="wall_small.jpg" /></a></td></tr><tr class="caption"><td>Robert Seebacher at the entrance in 1995</td><td>Tag and painted number</td><td>View back towards Brauning Wall, showing possible fault</td><td>Weathered rock on wall behind entrance shaft</td></tr></table><center><a href='/1623/174/l/174MAYBE.html'><img src='/1623/174/t/174MAYBE.jpg' /></a><br /><table class="imgtable"><tr class="caption"><td>Possibly this is 174</td></tr></table></center>&nbsp;<p>Photos &copy; Andy Waddington 1995, 97 (1,5) and &copy; Olly Betts 2005 (2,3,4).</photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -36,14 +46,12 @@
 <findability>S</findability>
 <findability_description></findability_description>
 <alt>1665m (by altimeter set 1610 at Bergrestaurant)</alt>
-<northing></northing>
-<easting></easting> 
+<lat_wgs84></lat_wgs84> 
+<long_wgs84></long_wgs84> 
 <tag_station>1623.p174</tag_station>
-<exact_station></exact_station>
 <other_station></other_station>
 <other_description></other_description>
-<bearings>Hinterer Schwarzmooskogel 088&deg; (1995, 1990:087&deg;) to right hand peak, Rightmost apparent peak of three on Vorderer Schwarzmooskogel 160&deg; (1990), Br&auml;uning Nase 188&deg; (1995, 1990:189&deg;), Br&auml;uning Zinken 221&deg; (1995, 1990:218&deg;)</bearings>
-<url></url>
+<bearings>Hinterer Schwarzmooskogel 088&deg; (1995, 1990:087&deg;) to right hand peak, Rightmost apparent peak of three on Vorderer Schwarzmooskogel 160&deg; (1990), Br&auml;uning Nase 188&deg; (1995, 1990:189&deg;), Br&auml;uning Zinken 221&deg; (1995, 1990:218&deg;)</bearings> <!-- this is now read-only and not editable on the forms-->
 </entrance>
 </body>
 </html>
diff --git a/folk/i/2015/aerw-at-home-2015.jpg b/folk/i/2015/aerw-at-home-2015.jpg
new file mode 100644
index 000000000..6249a6e30
Binary files /dev/null and b/folk/i/2015/aerw-at-home-2015.jpg differ
diff --git a/folk/i/2015/andy-2017-01-13.jpg b/folk/i/2015/andy-2017-01-13.jpg
new file mode 100644
index 000000000..e39eceee4
Binary files /dev/null and b/folk/i/2015/andy-2017-01-13.jpg differ


Robert Seebacher at the entrance in 1995	Tag and painted number	View back towards Brauning Wall, showing possible fault	Weathered rock on wall behind entrance shaft