diff --git a/1623/2018-aa-01/i/2018AA01.jpg b/1623/2018-aa-01/i/2018AA01.jpg
new file mode 100644
index 000000000..173734894
Binary files /dev/null and b/1623/2018-aa-01/i/2018AA01.jpg differ
diff --git a/1623/2018-aa-01/l/2018AA01.html b/1623/2018-aa-01/l/2018AA01.html
new file mode 100644
index 000000000..14cf1a104
--- /dev/null
+++ b/1623/2018-aa-01/l/2018AA01.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>
+2018-AA-01
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2018-AA-01</H1>
+<div class="centre"><img alt="" src="/1623/2018-aa-01/i/2018AA01.jpg" />
+</div>
+
+<p>2018-AA-01 entrance photo with tag</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2018-aa-01/t/2018AA01.jpg b/1623/2018-aa-01/t/2018AA01.jpg
new file mode 100644
index 000000000..a12e5d5e3
Binary files /dev/null and b/1623/2018-aa-01/t/2018AA01.jpg differ
diff --git a/1623/2023-JS-01/i/20230712_132119.jpg b/1623/2023-JS-01/i/20230712_132119.jpg
new file mode 100644
index 000000000..05d98463b
Binary files /dev/null and b/1623/2023-JS-01/i/20230712_132119.jpg differ
diff --git a/1623/2023-JS-01/l/20230712_132119.html b/1623/2023-JS-01/l/20230712_132119.html
new file mode 100644
index 000000000..ad6ce2990
--- /dev/null
+++ b/1623/2023-JS-01/l/20230712_132119.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>
+2023-JS-01
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-JS-01</H1>
+<div class="centre"><img alt="" src="/1623/2023-JS-01/i/20230712_132119.jpg" />
+</div>
+
+<p>Plan View, Modelled by Joel.</p>
+
+
+<p class="caption">Photo &copy; Merryn Matthews, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-JS-01/t/20230712_132119.jpg b/1623/2023-JS-01/t/20230712_132119.jpg
new file mode 100644
index 000000000..bcb7f47bf
Binary files /dev/null and b/1623/2023-JS-01/t/20230712_132119.jpg differ
diff --git a/1623/2023-mg-02/i/2023MG02Ent.jpg b/1623/2023-mg-02/i/2023MG02Ent.jpg
new file mode 100644
index 000000000..ae9b627d3
Binary files /dev/null and b/1623/2023-mg-02/i/2023MG02Ent.jpg differ
diff --git a/1623/2023-mg-02/l/2023MG02Ent.html b/1623/2023-mg-02/l/2023MG02Ent.html
new file mode 100644
index 000000000..0ee75476f
--- /dev/null
+++ b/1623/2023-mg-02/l/2023MG02Ent.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>
+2023-MG-02 entrance
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-MG-02 entrance</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-02/i/2023MG02Ent.jpg" />
+</div>
+
+<p>2023-MG-02 entrance</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mg-02/t/2023MG02Ent.jpg b/1623/2023-mg-02/t/2023MG02Ent.jpg
new file mode 100644
index 000000000..03cd50a41
Binary files /dev/null and b/1623/2023-mg-02/t/2023MG02Ent.jpg differ
diff --git a/1623/2023-mg-03/i/2023-mg-03AtoB.jpg b/1623/2023-mg-03/i/2023-mg-03AtoB.jpg
new file mode 100644
index 000000000..89ccf7a2f
Binary files /dev/null and b/1623/2023-mg-03/i/2023-mg-03AtoB.jpg differ
diff --git a/1623/2023-mg-03/i/2023-mg-03c.jpg b/1623/2023-mg-03/i/2023-mg-03c.jpg
new file mode 100644
index 000000000..08287723d
Binary files /dev/null and b/1623/2023-mg-03/i/2023-mg-03c.jpg differ
diff --git a/1623/2023-mg-03/i/2023-mg03CandD.jpg b/1623/2023-mg-03/i/2023-mg03CandD.jpg
new file mode 100644
index 000000000..b5d1caeb3
Binary files /dev/null and b/1623/2023-mg-03/i/2023-mg03CandD.jpg differ
diff --git a/1623/2023-mg-03/l/2023-mg-03AtoB.html b/1623/2023-mg-03/l/2023-mg-03AtoB.html
new file mode 100644
index 000000000..7ec4cb56a
--- /dev/null
+++ b/1623/2023-mg-03/l/2023-mg-03AtoB.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>
+2023-MG-03 A and B entrances
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-MG-03 A and B entrances</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-03/i/2023-mg-03AtoB.jpg" />
+</div>
+
+<p>Zac and Janis surveying between 2023-MG-03 A and B entrances.  With A being the high entrances and B being the lower entrance.</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mg-03/l/2023-mg-03c.html b/1623/2023-mg-03/l/2023-mg-03c.html
new file mode 100644
index 000000000..c83e72fd7
--- /dev/null
+++ b/1623/2023-mg-03/l/2023-mg-03c.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>
+2023-MG-03C entrance
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-MG-03C entrance</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-03/i/2023-mg-03c.jpg" />
+</div>
+
+<p>2023-MG-03C entrance</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mg-03/l/2023-mg03CandD.html b/1623/2023-mg-03/l/2023-mg03CandD.html
new file mode 100644
index 000000000..6bb54f798
--- /dev/null
+++ b/1623/2023-mg-03/l/2023-mg03CandD.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>
+2023-MG-03 C and D
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-MG-03 C and D</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-03/i/2023-mg03CandD.jpg" />
+</div>
+
+<p>2023-MG-03 C (above) and D (below)</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mg-03/t/2023-mg-03AtoB.jpg b/1623/2023-mg-03/t/2023-mg-03AtoB.jpg
new file mode 100644
index 000000000..c5fbc8f79
Binary files /dev/null and b/1623/2023-mg-03/t/2023-mg-03AtoB.jpg differ
diff --git a/1623/2023-mg-03/t/2023-mg-03c.jpg b/1623/2023-mg-03/t/2023-mg-03c.jpg
new file mode 100644
index 000000000..50c9cc8f2
Binary files /dev/null and b/1623/2023-mg-03/t/2023-mg-03c.jpg differ
diff --git a/1623/2023-mg-03/t/2023-mg03CandD.jpg b/1623/2023-mg-03/t/2023-mg03CandD.jpg
new file mode 100644
index 000000000..39740946a
Binary files /dev/null and b/1623/2023-mg-03/t/2023-mg03CandD.jpg differ
diff --git a/1623/2023-mg-04/i/2023-mg-04_ent.jpg b/1623/2023-mg-04/i/2023-mg-04_ent.jpg
new file mode 100644
index 000000000..9468cf4c3
Binary files /dev/null and b/1623/2023-mg-04/i/2023-mg-04_ent.jpg differ
diff --git a/1623/2023-mg-04/l/2023-mg-04_ent.html b/1623/2023-mg-04/l/2023-mg-04_ent.html
new file mode 100644
index 000000000..70cf3d2c2
--- /dev/null
+++ b/1623/2023-mg-04/l/2023-mg-04_ent.html
@@ -0,0 +1,21 @@
+<!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>2023-mg-04 entrance</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-mg-04 entrance</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-04/i/2023-mg-04_ent.jpg" />
+</div>
+
+<p>Second smaller entrance of 2023-mg-04 entrance</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr /></body>
+</html>
diff --git a/1623/2023-mg-04/t/2023-mg-04_ent.jpg b/1623/2023-mg-04/t/2023-mg-04_ent.jpg
new file mode 100644
index 000000000..7c0240ba8
Binary files /dev/null and b/1623/2023-mg-04/t/2023-mg-04_ent.jpg differ
diff --git a/1623/2023-mg-05/i/2023-mg-05.jpg b/1623/2023-mg-05/i/2023-mg-05.jpg
new file mode 100644
index 000000000..9e1059696
Binary files /dev/null and b/1623/2023-mg-05/i/2023-mg-05.jpg differ
diff --git a/1623/2023-mg-05/l/2023-mg-05.html b/1623/2023-mg-05/l/2023-mg-05.html
new file mode 100644
index 000000000..1c56d0600
--- /dev/null
+++ b/1623/2023-mg-05/l/2023-mg-05.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>
+2023-mg-05
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>2023-mg-05</H1>
+<div class="centre"><img alt="" src="/1623/2023-mg-05/i/2023-mg-05.jpg" />
+</div>
+
+<p>Entrance of 2023-mg-05</p>
+
+
+<p class="caption">Photo &copy; Martin Green, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mg-05/t/2023-mg-05.jpg b/1623/2023-mg-05/t/2023-mg-05.jpg
new file mode 100644
index 000000000..ee985b30e
Binary files /dev/null and b/1623/2023-mg-05/t/2023-mg-05.jpg differ
diff --git a/1623/2023-mm-01/i/signal-2023-07-13-22-07-26-777.jpg b/1623/2023-mm-01/i/signal-2023-07-13-22-07-26-777.jpg
new file mode 100644
index 000000000..f50ad91e5
Binary files /dev/null and b/1623/2023-mm-01/i/signal-2023-07-13-22-07-26-777.jpg differ
diff --git a/1623/2023-mm-01/l/signal-2023-07-13-22-07-26-777.html b/1623/2023-mm-01/l/signal-2023-07-13-22-07-26-777.html
new file mode 100644
index 000000000..f7b88a32a
--- /dev/null
+++ b/1623/2023-mm-01/l/signal-2023-07-13-22-07-26-777.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 2023-MM-01
+</title>
+<link rel="stylesheet" type="text/css" href="../../../css/main2.css" />
+</head>
+
+<body>
+<H1>Entrance 2023-MM-01</H1>
+<div class="centre"><img alt="" src="/1623/2023-mm-01/i/signal-2023-07-13-22-07-26-777.jpg" />
+</div>
+
+<p>Tom, Emily and Lizzie looking down on Merryn in the rift.</p>
+
+
+<p class="caption">Photo &copy; Joel Stobbart, 2023</p>
+
+
+<hr />
+</body>
+</html>
diff --git a/1623/2023-mm-01/t/signal-2023-07-13-22-07-26-777.jpg b/1623/2023-mm-01/t/signal-2023-07-13-22-07-26-777.jpg
new file mode 100644
index 000000000..48a6bce80
Binary files /dev/null and b/1623/2023-mm-01/t/signal-2023-07-13-22-07-26-777.jpg differ
diff --git a/cave_data/1623-2018-aa-01.html b/cave_data/1623-2018-aa-01.html
index 5872b5cc1..cb5000667 100644
--- a/cave_data/1623-2018-aa-01.html
+++ b/cave_data/1623-2018-aa-01.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 7, 2023, 10:21 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 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 7, 2023, 10:21 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 13, 2023, 9 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/cave_data/1623-2023-JS-01.html b/cave_data/1623-2023-JS-01.html
new file mode 100644
index 000000000..bfb2299a2
--- /dev/null
+++ b/cave_data/1623-2023-JS-01.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- This file is generated by troggle on July 13, 2023, 8:42 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
+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 13, 2023, 8:42 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><!-- '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-2023-JS-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<official_name>Sunglasses disapointment</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<kataster_code></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></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2023-JS-01</unofficial_number><!-- (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-2023-JS-01</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 entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+</entrance>
+
+<explorers>Joel and Merryn</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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<underground_description>Blind vertical rift 8m deep.</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>8m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<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/2023-JS-01/2023-JS-01.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')-->
+</cave>
+</body>
+</html>
diff --git a/cave_data/1623-2023-MM-01.html b/cave_data/1623-2023-MM-01.html
new file mode 100644
index 000000000..87e7ab287
--- /dev/null
+++ b/cave_data/1623-2023-MM-01.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- This file is generated by troggle on July 13, 2023, 9:14 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
+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 13, 2023, 9: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>
+
+<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-2023-MM-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
+<official_name></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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
+<kataster_code></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></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
+<unofficial_number>2023-MM-01</unofficial_number><!-- (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-2023-MM-01</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 entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
+</entrance>
+
+<explorers>Merryn Matthews, Joel Stobbart, Emily Mabbet, Tom Phillips, Lizzie Caisley</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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<underground_description>8m Deep Vertical Rift.</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>Free Climb To East.</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>Completed</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>8m</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
+<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/2023-mm-01/2023-mm-01.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')-->
+</cave>
+</body>
+</html>
diff --git a/cave_data/1623-2023-mg-02.html b/cave_data/1623-2023-mg-02.html
index 185eb9bcb..cfb98bbfa 100644
--- a/cave_data/1623-2023-mg-02.html
+++ b/cave_data/1623-2023-mg-02.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 13, 2023, 9:49 a.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 6:14 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 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 13, 2023, 9:49 a.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 13, 2023, 6: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>
@@ -49,7 +49,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 
 <p>The left hand entrance goes 4m in an angled phreatic bedding before choking.</p>
 
-<p>The right hand entrance is a climb down a keyhole passage, with bolders jammed over the rift.  This goes to a small chamber, with a rift below being too tight.  A 2m climb up the far sie leads to a a horizontal flat out phreatic bedding and angular rocky floor.  Condensation was noted on the ceiling along with a couple of small solution pockets.  After 5m the crawl becomes too tight, with the passage continuing for at least another 5m.</p></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. -->
+<p>The right hand entrance is a climb down a keyhole passage, with bolders jammed over the rift.  This goes to a small chamber, with a rift below being too tight.  A 2m climb up the far sie leads to a a horizontal flat out phreatic bedding and angular rocky floor.  Condensation was noted on the ceiling along with a couple of small solution pockets.  After 5m the crawl becomes too low, with the passage continuing for at least another 3m.</p></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>None</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. -->
diff --git a/cave_data/1623-2023-mg-03.html b/cave_data/1623-2023-mg-03.html
index 777f1a34d..db7d4a23c 100644
--- a/cave_data/1623-2023-mg-03.html
+++ b/cave_data/1623-2023-mg-03.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 9, 2023, 5:33 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:19 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 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 9, 2023, 5:33 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 13, 2023, 9:19 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -18,7 +18,7 @@ the form documented at
 <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-2023-mg-03</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
-<official_name></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-->
+<official_name>Salamanderhoehle</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><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
 <kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
 code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
@@ -39,16 +39,33 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <unofficial_number>2023-mg-03</unofficial_number><!-- (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-2023-mg-03</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 -->
+  <entranceslug>1623-2023-mg-03C</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 entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
-<explorers></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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<underground_description></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. -->
+<entrance>
+  <entranceslug>1623-2023-mg-03a</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>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.  -->
+</entrance>
+
+<entrance>
+  <entranceslug>1623-2023-mg-03b</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>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.  -->
+</entrance>
+
+<entrance>
+  <entranceslug>1623-2023-mg-03d</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>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.  -->
+</entrance>
+
+<explorers>Martin Green, Janis, Zac Woodford</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>1623.2023-mg-03</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<underground_description><p>Salamanderhoehle is formed along an obvious surfacee weakness going from SW to NE.  In 2023 the most south westely entrance (A), could be down climbed for 2m to a snow pile.  This was descended with the aid of a handline into a significant chamber.  A few metres to the North East another shaft (B) also entered but with a pitch down to the snow slope.  The chamber is deorated with several 4m long icicles and a stationary Salamander.</p>
+
+<p>To the North East of the chamber a bould strewn passage, skirted by ice flows and icicles, before snow piles are intercept from the two north easterly entances (C and D).  Carrying on a phreatic tube QM1 can be seen descending and becoming blocked with snow.</p></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. -->
+<survey>Drawn up in tunnel</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 -->
diff --git a/cave_data/1623-2023-mg-04.html b/cave_data/1623-2023-mg-04.html
index f044a9ae1..02255878b 100644
--- a/cave_data/1623-2023-mg-04.html
+++ b/cave_data/1623-2023-mg-04.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 9, 2023, 5:30 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:39 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 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 9, 2023, 5:30 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 13, 2023, 9:39 p.m. UTC using the form documented at
 the form documented at 
 <a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
 <br>
@@ -43,12 +43,12 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
   <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.  -->
 </entrance>
 
-<explorers></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/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
-<underground_description></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. -->
+<explorers>Martin Green and Janis Huns</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>1623.2023-mg-04</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx -->
+<underground_description>Shaft in a entrance weakness also containing 2023-mg-03 and 2023-mg-05.  In 2023 it contained a snow slope going down 10m, to a small gap between the rock and the snow, which drafted very slighly out and looked to go down for a futher 10m.</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>~30m rope and a sling</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. -->
+<survey>Drawn in Tunnel</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 -->
diff --git a/cave_data/1623-2023-mg-05.html b/cave_data/1623-2023-mg-05.html
index 391bcea0f..5e3a74c12 100644
--- a/cave_data/1623-2023-mg-05.html
+++ b/cave_data/1623-2023-mg-05.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file is generated by troggle on July 9, 2023, 5:31 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:42 p.m. UTC using the form documented at /handbook/survey/caveentry.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,
 make sure you update the database by doing a full data import. If you edit it using the online form
@@ -10,12 +10,11 @@ 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 9, 2023, 5:31 p.m. UTC using the form documented at
+<b>This file is generated by troggle</b> on July 13, 2023, 9:42 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><!-- '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-2023-mg-05</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195'  -->
@@ -39,10 +38,9 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <kataster_number></kataster_number> <!-- (Either this or unofficial_number is required). Official number in Austrian kataster if one has been allocated  -->
 <unofficial_number>2023-mg-05</unofficial_number><!-- (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-2023-mg-05</entranceslug>
-  <letter></letter>
+  <entranceslug>1623-2023-mg-05</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 entrace then the letter needs to be given. Generally matches the entranceslug ID.  -->
 </entrance>
 
 <explorers></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. -->
diff --git a/cave_data/1626-359.html b/cave_data/1626-359.html
index 902020fd2..57cd5e0f4 100644
--- a/cave_data/1626-359.html
+++ b/cave_data/1626-359.html
@@ -310,7 +310,7 @@ immediately reaches another two way junction.</p>
 <depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent></extent>
 
-<description_file>1626/359/359.html</description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
+<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
 <url>1626/359/359.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')-->
 </cave>
 </body>
diff --git a/entrance_data/1623-2018-aa-01.html b/entrance_data/1623-2018-aa-01.html
index c58e449b2..4cd5a29bc 100644
--- a/entrance_data/1623-2018-aa-01.html
+++ b/entrance_data/1623-2018-aa-01.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 7, 2023, 10:21 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9 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 7, 2023, 10:21 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 13, 2023, 9 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach>Approximately 1/3 of the way from the stone bridge to Fischgesicht, directly on the cairned path.</approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2018-aa-01/l/2018AA01.html'><img src='/1623/2018-aa-01/t/2018AA01.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-2023-JS-01.html b/entrance_data/1623-2023-JS-01.html
new file mode 100644
index 000000000..32c406867
--- /dev/null
+++ b/entrance_data/1623-2023-JS-01.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on July 13, 2023, 8:42 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 13, 2023, 8:42 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-2023-JS-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description></entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo><a href='/1623/2023-JS-01/l/20230712_132119.html'><img src='/1623/2023-JS-01/t/20230712_132119.jpg' /></a></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>U</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station>p2023-js-01</other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1623-2023-MM-01.html b/entrance_data/1623-2023-MM-01.html
new file mode 100644
index 000000000..e0b6b249f
--- /dev/null
+++ b/entrance_data/1623-2023-MM-01.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on July 13, 2023, 9: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 -->
+
+    <!-- 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 13, 2023, 9:14 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-2023-MM-01</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>2023-MM-01</name>
+<entrance_description></entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo><a href='/1623/2023-mm-01/l/signal-2023-07-13-22-07-26-777.html'><img src='/1623/2023-mm-01/t/signal-2023-07-13-22-07-26-777.jpg' /></a></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>U</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station>P2023-MM-01</other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1623-2023-mg-02.html b/entrance_data/1623-2023-mg-02.html
index 90a948e16..dc61b0c7d 100644
--- a/entrance_data/1623-2023-mg-02.html
+++ b/entrance_data/1623-2023-mg-02.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 5:32 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 6:13 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 9, 2023, 5:32 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 13, 2023, 6:13 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2023-mg-02/l/2023MG02Ent.html'><img src='/1623/2023-mg-02/t/2023MG02Ent.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-2023-mg-03.html b/entrance_data/1623-2023-mg-03.html
index e9c8933f8..8ebda8f2d 100644
--- a/entrance_data/1623-2023-mg-03.html
+++ b/entrance_data/1623-2023-mg-03.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 5:33 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:13 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,13 +14,13 @@ 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 9, 2023, 5:33 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 13, 2023, 9:13 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-2023-mg-03</slug> <!-- one entrance and one slug per entrance_data file -->
-<name></name>
+<slug>1623-2023-mg-03C</slug> <!-- one entrance and one slug per entrance_data file -->
+<name>c</name>
 <entrance_description></entrance_description>
 <explorers></explorers>
 <map_description></map_description>
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2023-mg-03/l/2023-mg-03c.html'><img src='/1623/2023-mg-03/t/2023-mg-03c.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
@@ -51,7 +51,7 @@ though, you do not need to do a data import as it happens automatically -->
 <easting></easting> 
 <tag_station></tag_station>
 <exact_station></exact_station>
-<other_station>1623.p2023-mg-03</other_station>
+<other_station>1623.p2023-mg-03.9</other_station>
 <other_description></other_description>
 <bearings></bearings>
 <url></url>
diff --git a/entrance_data/1623-2023-mg-03a.html b/entrance_data/1623-2023-mg-03a.html
new file mode 100644
index 000000000..8f18eebcb
--- /dev/null
+++ b/entrance_data/1623-2023-mg-03a.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on July 13, 2023, 9:09 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 13, 2023, 9:09 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-2023-mg-03a</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description></entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo><a href='/1623/2023-mg-03/l/2023-mg-03AtoB.html'><img src='/1623/2023-mg-03/t/2023-mg-03AtoB.jpg' /></a></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>R</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station>1623.2023-mg-03.tag</tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1623-2023-mg-03b.html b/entrance_data/1623-2023-mg-03b.html
new file mode 100644
index 000000000..2a29c648f
--- /dev/null
+++ b/entrance_data/1623-2023-mg-03b.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on July 13, 2023, 9:10 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 13, 2023, 9:10 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-2023-mg-03b</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description></entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>U</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station>1623.2023-mg-03.11</other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1623-2023-mg-03d.html b/entrance_data/1623-2023-mg-03d.html
new file mode 100644
index 000000000..9a3ffb628
--- /dev/null
+++ b/entrance_data/1623-2023-mg-03d.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Only put one entrance in this file -->
+<!-- This file is generated by troggle on July 13, 2023, 9:18 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 13, 2023, 9:18 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-2023-mg-03d</slug> <!-- one entrance and one slug per entrance_data file -->
+<name></name>
+<entrance_description></entrance_description>
+<explorers></explorers>
+<map_description></map_description>
+<location_description></location_description>
+<lastvisit></lastvisit>
+<approach></approach>
+<underground_description></underground_description>
+<photo><a href='/1623/2023-mg-03/l/2023-mg03CandD.html'><img src='/1623/2023-mg-03/t/2023-mg03CandD.jpg' /></a></photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>U</marking> 
+<marking_comment></marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description></findability_description>
+<alt></alt>
+<northing></northing>
+<easting></easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url></url>
+</entrance>
+</body>
+</html>
diff --git a/entrance_data/1623-2023-mg-04.html b/entrance_data/1623-2023-mg-04.html
index c6f2a6d36..fe6612113 100644
--- a/entrance_data/1623-2023-mg-04.html
+++ b/entrance_data/1623-2023-mg-04.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 5:30 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:37 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 9, 2023, 5:30 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 13, 2023, 9:37 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2023-mg-04/l/2023-mg-04_ent.html'><img src='/1623/2023-mg-04/t/2023-mg-04_ent.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/entrance_data/1623-2023-mg-05.html b/entrance_data/1623-2023-mg-05.html
index f8f16a0a9..55cb92162 100644
--- a/entrance_data/1623-2023-mg-05.html
+++ b/entrance_data/1623-2023-mg-05.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Only put one entrance in this file -->
-<!-- This file is generated by troggle on July 9, 2023, 5:31 p.m. UTC using the form documented at handbook/survey/ententry.html -->
+<!-- This file is generated by troggle on July 13, 2023, 9:42 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 9, 2023, 5:31 p.m. UTC using the form documented at 
+<b>This file is generated by troggle</b> on July 13, 2023, 9:42 p.m. UTC using the form documented at 
 <a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
 <br>
 <entrance>
@@ -28,7 +28,7 @@ though, you do not need to do a data import as it happens automatically -->
 <lastvisit></lastvisit>
 <approach></approach>
 <underground_description></underground_description>
-<photo></photo>
+<photo><a href='/1623/2023-mg-05/l/2023-mg-05.html'><img src='/1623/2023-mg-05/t/2023-mg-05.jpg' /></a></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
                       T  = Tag,
diff --git a/years/2023/logbook.html b/years/2023/logbook.html
index 852b92212..e78d0bf73 100644
--- a/years/2023/logbook.html
+++ b/years/2023/logbook.html
@@ -99,12 +99,12 @@ Bolts used:
 <p><b>Unknown Territory</b></p>
 <p>
     Setting off down the phreatic rift, we quickly entered the beginning of The Second Coming, where a truly massive gust can be felt. A brief, pleasent passage, was shortly followed by a number of both protected (traverse line), and unprotected traverses with varying degrees of exposure. A fall on any of these without a safety could be catastrophic. This is crossed to a calcited, blackened ledge at the end of a travese line an feels like an obvious end to the first section. Following this, the ante is uped and the traveses become more techinical, involving some harder climbing and some crossing of loose-ish collapses. Eventually, the end of the rift is reached and a sharp leftward bend is found. <i>A number of sumps, puddles, and a few brilliant white formations can be seen on the journey. </i>
-    Immediately after this bend, a deep cross-rift is found and a swiss-cheese like maze of passage is entered upon crossing the rift (this needs properly surveying and is the end of the currently surveyed passage). Passing through this and trending left (following the draught) leads to a pre-rigged traverse line which continues again in a high-level passage which followed to a Y-hang. Descending this leads to an upward-trending wall traverse which terminates in a 2/3 bolt Y/tri-hang. This hangs over The Lizard King and is descended over something like 50m via a 1-bolt rebelay, a deviation, and two further 2-bolt rebelays, eventually either reaching the floor (we had a good look around here and it didn't appear to be very useful) or a higher level muddy ledge facing away from the rebelay and on the right. This was already bolted and leads to the start of another deep rift.
+    Immediately after this bend, a deep cross-rift is found and a swiss-cheese like maze of passage is entered upon crossing the rift (this needs properly surveying and is the end of the currently surveyed passage, we have named this "Swiss Cheese"). Passing through this and trending left (following the draught) leads to a pre-rigged traverse line which continues again in a high-level passage which followed to a Y-hang. Descending this leads to an upward-trending wall traverse which terminates in a 2/3 bolt Y/tri-hang. This hangs over The Lizard King and is descended over something like 50m via a 1-bolt rebelay, a deviation, and two further 2-bolt rebelays, eventually either reaching the floor (we had a good look around here and it didn't appear to be very useful) or a higher level muddy ledge facing away from the rebelay and on the right. This was already bolted and leads to the start of another deep rift.
 </p>
 
 <p><b>It begins</b></p>
 <p>
-    Following a new set of bolts placed by myself (the first bolt is at a funky angle and could be replaced but is likely fine), a new traverse line is followed up the roof of the rift along steep-walls. This is easy with a traverse line but is more thought provoking to bolt, rig, and de-rig. Much like the top of The Lizard King, a Y-hang is reached (there is another bolt further used for exploring but was deemed to be useless) and is descended into War of Attrition. A 95m rope was used to righ from the the top of The Lizard King to the Y-hang dropping into War of Attrition. A 1-bolt rebelay is reached and a deviation is used on the opposite wall. This is finally descended to a ledge with another 1-bolt rebelay. Here the intention is to continue down to reach a to-be-bolted Y-hang in the right in an attempt to decrease rope-rub. This would be descended about 7m to a vague ledge system and followed further into the large phreatic tube via a traverse line. 
+    Following a new set of bolts placed by myself (the first bolt is at a funky angle and could be replaced but is likely fine), a new traverse line is followed up the roof of the rift along steep-walls. This is easy with a traverse line but is more thought provoking to bolt, rig, and de-rig. Much like the top of The Lizard King, a Y-hang is reached (there is another bolt further used for exploring but was deemed to be useless) and is descended into War of Attrition. A 95m rope was used to righ from the the top of The Salamander Queen 2 (previously named "The Lizard King") to the Y-hang dropping into War of Attrition. A 1-bolt rebelay is reached and a deviation is used on the opposite wall. This is finally descended to a ledge with another 1-bolt rebelay. Here the intention is to continue down to reach a to-be-bolted Y-hang in the right in an attempt to decrease rope-rub. This would be descended about 7m to a vague ledge system and followed further into the large phreatic tube via a traverse line (later called The Salamander Queen). 
 
 <div class="timeug">T/U 12.5 hrs</div>
 <hr />
@@ -207,7 +207,7 @@ at about 5pm. Charlotte and Harry were both very grumpy walking back with very h
 <div class="trippeople"><u>Joel</u>,Jonty, Buck </div>
 <div class="triptitle">Fishface - Rigging and pitch-measuring trip </div>
 
-<p>An ambitious day which slowly went increasingly wrong. The group departed base camp at a stunning 8.20AM, blitzed up the plateau and promtly became mired in several hours of faff which soon  descended into more festering. The plan had been to rig the entrance series of Fishface down to the bottom of Blitzen Boulevard (4th pitch), from where we expected everything to be left rigged. However, confusion about rope lengths and metalwork and some impressively long grike trips meant that the two shallow pushing groups planning to explore from Blitzen and Liquid Luck caught us up at Top Camp. Uncle Mike was not amused. We swiftly bombed down to FF in 25 mins and started rigging. Joel was left to do everything as Jonty's light 'broke'.
+<p>An ambitious day which slowly went increasingly\ wrong. The group departed base camp at a stunning 8.20AM, blitzed up the plateau and promtly became mired in several hours of faff which soon  descended into more festering. The plan had been to rig the entrance series of Fishface down to the bottom of Blitzen Boulevard (4th pitch), from where we expected everything to be left rigged. However, confusion about rope lengths and metalwork and some impressively long grike trips meant that the two shallow pushing groups planning to explore from Blitzen and Liquid Luck caught us up at Top Camp. Uncle Mike was not amused. We swiftly bombed down to FF in 25 mins and started rigging. Joel was left to do everything as Jonty's light 'broke'.
 <p>The entrance pitch/spiral traverse thing was completed on a 40m rope. Tasteful noods (2nd pitch) didn't quite go on a 27m due to rerigging around the top rebelay to avoid rub, so Joel initially reached the bottom on a knot pass and Jonty rerigged to the bottom on a 32m. The traverse at the bottom of Tasteful Noods (2A) and pitch 3 both had rope left from last year but not rigged - some of the knots didn't line up and required rerigging but the lengths were fine. Pendulum pitch needs some more bolts at the bottom, possibly as a traverse, to make getting on and off the pitch less deathy. Uncle Mike rigged Blitzen for us as we got too scared, he insisted the step over the huge rift with no traverse was fine, so we left him to it. There may or may not be a bolt there now 
 <p>past Blitzen, everything remained rigged in situ from last year. We checked everything to the traverse at the bottom of Liquid Luck (pitch 6) and apart from some loose bolts all ropes were fine and hangers non-corroded. On the way back, we measured pitch lengths using the ULSA disto and Jonty drew up a definitive rigging topo that takes into account the route changes last year. The pitch lengths will be entered into the box below when Jonty reappears at Base Camp.
 <p>[Ed. Needs finishing here]
@@ -327,7 +327,7 @@ We went canyoning on a rest day. The "Strubklamm" canyon is located near Saltzbu
 	In return for taking her caving, Becka had promised to teach me how to calibrate Wookey's DistoX. Unfortunately, the Disto was unwilling to connect to the phone and allow itself to be calibrated. Not wanting to be discouraged by this small defeat, Oakem and I followed the the other group into the cave. They were waiting at the top of of <b>Radagast</b>, since the ope had gotten stuck under the boulder at the bottom of the pitch and Charlotte was in the process of getting it unstuck.
 </p>
 <p>
-	The entrance series took us about an hour and fifteen, with about as much more to <b>Swiss Cheese</b> (PT10). From there we traversed for about 50 metres before dropping into Salamander Queen II. A small stash of rigging equipment and food (for a possible future camping trip) had been left there by the previous team. Following the rope took us into a respectably sized traverse (<b>German Engineering</b>), the first pitch into <b>War of Attrition</b>, which is where Chi and me had stopped bolting on Friday.
+  The entrance series took us about an hour and fifteen, with about as much more to <b>Swiss Cheese</b> (PT10). From there we traversed for about 50 metres before dropping into <b>Salamander Queen II</b>. A small stash of rigging equipment and food (for a possible future camping trip) had been left there by the previous team. Following the rope took us into a respectably sized traverse (<b>German Engineering</b>), the first pitch into <b>War of Attrition</b>, which is where Chi and me had stopped bolting on Friday.
 </p>
 
 <p>
@@ -371,7 +371,5 @@ The Amphitheater Hoehle is named after its entrance which resembles an amphithea
 We went on a via ferrata located close to the Loseralm parking lot. The via ferrata route is graded D. Car is best parked on the side of the toll road, below the parking lot, next to a big pile of rocks. Getting to the start of the via ferrata requires a short (200m ?) hike up on steep terrain with many small loose boulders, which make the hike anoying. 
 <p>The via ferrata route goes up the mountain (it's vertical) and it is very exposed. It requires using the upper body quite a lot and does not have many aids besides the metal wire. The route ends next to a metal cross at the peak of the mountain. One hikes down to get to the car. The description says that the via ferrata takes between 1 and 2 hours but it took us 50 minutes, with a 5 min photo break in the middle.
 <div class="timeug">T/U: 0.0 hours</div>
-<hr />
-
-</body>
+<hr /></body>
 </html>
