diff --git a/noinfo/cave_data/1623-2010-03.html b/noinfo/cave_data/1623-2010-03.html
index 18fdfeeb2..cac5ba273 100644
--- a/noinfo/cave_data/1623-2010-03.html
+++ b/noinfo/cave_data/1623-2010-03.html
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one cave in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<cave>
-<non_public>False</non_public>
-<caveslug>1623-2010-03</caveslug>
-<official_name>2010-03</official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2010-03</unofficial_number>
-
-<entrance>
-  <entranceslug>1623-2010-03</entranceslug>
-  <letter></letter>
-</entrance>
-
-<explorers>Noel Snape
-Ian Walker</explorers>
-<underground_description>Steep rock slop leads to 4m drop into rock floored passage. Totally choked</underground_description>
-<equipment>15m rope and sling </equipment>
-<references></references>
-<survey>2010-03</survey>
-<kataster_status>Not in kataster</kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length>17m</length>
-<depth>11m</depth>
-<extent>5m</extent>
-<survex_file>2010-03.svx</survex_file>
-<description_file>2010-03</description_file>
-<url>smkridge/2010-03</url>
-</cave>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Only put one cave in this file -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<cave>
+<non_public>False</non_public>
+<caveslug>1623-2010-03</caveslug>
+<official_name>2010-03</official_name>
+<area>1623</area>
+<kataster_code></kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2010-03</unofficial_number>
+
+<entrance>
+  <entranceslug>1623-2010-03</entranceslug>
+  <letter></letter>
+</entrance>
+
+<explorers>Noel Snape
+Ian Walker</explorers>
+<underground_description>Steep rock slop leads to 4m drop into rock floored passage. Totally choked</underground_description>
+<equipment>15m rope and sling </equipment>
+<references></references>
+<survey>2010-03</survey>
+<kataster_status>Not in kataster</kataster_status>
+<underground_centre_line></underground_centre_line>
+<notes></notes>
+<length>17m</length>
+<depth>11m</depth>
+<extent>5m</extent>
+<survex_file>2010-03.svx</survex_file>
+<description_file>2010-03</description_file>
+<url>smkridge/2010-03</url>
+</cave>
+</body>
+</html>
diff --git a/noinfo/cave_data/1623-2011-01.html b/noinfo/cave_data/1623-2011-01.html
index 900b68d46..47f8dd416 100644
--- a/noinfo/cave_data/1623-2011-01.html
+++ b/noinfo/cave_data/1623-2011-01.html
@@ -1,55 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one cave in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<cave>
-<non_public>False</non_public>
-<caveslug>1623-2011-01</caveslug>
-<official_name>Kugelzweitehöhle</official_name>
-<area>1623</area>
-<area>2d</area>
-<kataster_code>3S</kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2011-01 BS30</unofficial_number>
-
-<entrance>
-  <entranceslug>1623-2011-01</entranceslug>
-  <letter></letter>
-</entrance>
-
-<explorers>UBSS 1992, CUCC 2013</explorers>
-<underground_description><p><b>WARNING</b> In heavy weather the main pitch becomes very dangerous, with cobbles being washed down, as well as water coming from everywhere, especially the rift.</p>
-
-<p>Also known as Bullet Second Höhle</p>
-
-<p>A series of three short vertical entrances arranged along a north-south line.</p>
-
-<p>The southern most entrance contains a tight undescended hole in a boulder floor QM1C and a small passage though to the central entrance.</p>
-
-<p>The central entrance is a steep gully leading to head of approx. 5m pitch to the upper chamber, which takes some water when raining.</p>
-
-<p>The northern entrance leads to the top of a dry key hole passage, which initially has wedged boulders making a false floor.  A short sloped phreatic passage leads back to the central entrance.  A rope traverse can be rigged to a 5m pitch to the upper chamber.</p>
-
-<p>A classic keyhole passage continues downward out of the chamber, which has been rigged along the left hand wall to the head of the main pitch.  The main pitch descends rejoining the rift of the above  mentioned keyhole passage before reaching a ledge 25m down. The ledge leads to a bridge across the pitch.  This ledge can be used to rig a wide deviation, to avoid water from the main rift.</p>
-
-<p>Shortly after the deviation the pitch is rebelayed to a free hanging rebelay before opening out into a large chamber, with the floor a further 35m below</p>
-
-<p>The chamber has a bolder floor and is 30m long, 15m wide and about 20m tall.  A passage continues from the top of the chamber near where the rope drops in.  This passage continues upwards, with a moderately unstable boulder floor.  A further small passage heads of the bottom of the chamber which could be a digging project.  There may be a passage going of the far end of the chamber near the ceiling.</underground_description>
-<equipment>It is estimated that 60m + 90m rope should do.</equipment>
-<references><a href="/others/ubss/UBSS_Proc_19_3_347-358.pdf">UBSS Totes Gebirge Expedition 1992</a></references>
-<survey><a href="2011-01highres.png"><img src="2011-01lowres.png"/></a></survey>
-<kataster_status>not in kataster</kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length></length>
-<depth></depth>
-<extent></extent>
-<survex_file>caves/2011-01/2011-01.svx</survex_file>
-<description_file></description_file>
-<url>smkridge/2011-01/2011-01.html</url>
-</cave>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Only put one cave in this file -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<cave>
+<non_public>False</non_public>
+<caveslug>1623-2011-01</caveslug>
+<official_name>Kugelzweitehöhle</official_name>
+<area>1623</area>
+<area>2d</area>
+<kataster_code>3S</kataster_code>
+<kataster_number></kataster_number> 
+<unofficial_number>2011-01 BS30</unofficial_number>
+
+<entrance>
+  <entranceslug>1623-2011-01</entranceslug>
+  <letter></letter>
+</entrance>
+
+<explorers>UBSS 1992, CUCC 2013</explorers>
+<underground_description><p><b>WARNING</b> In heavy weather the main pitch becomes very dangerous, with cobbles being washed down, as well as water coming from everywhere, especially the rift.</p>
+
+<p>Also known as Bullet Second Höhle</p>
+
+<p>A series of three short vertical entrances arranged along a north-south line.</p>
+
+<p>The southern most entrance contains a tight undescended hole in a boulder floor QM1C and a small passage though to the central entrance.</p>
+
+<p>The central entrance is a steep gully leading to head of approx. 5m pitch to the upper chamber, which takes some water when raining.</p>
+
+<p>The northern entrance leads to the top of a dry key hole passage, which initially has wedged boulders making a false floor.  A short sloped phreatic passage leads back to the central entrance.  A rope traverse can be rigged to a 5m pitch to the upper chamber.</p>
+
+<p>A classic keyhole passage continues downward out of the chamber, which has been rigged along the left hand wall to the head of the main pitch.  The main pitch descends rejoining the rift of the above  mentioned keyhole passage before reaching a ledge 25m down. The ledge leads to a bridge across the pitch.  This ledge can be used to rig a wide deviation, to avoid water from the main rift.</p>
+
+<p>Shortly after the deviation the pitch is rebelayed to a free hanging rebelay before opening out into a large chamber, with the floor a further 35m below</p>
+
+<p>The chamber has a bolder floor and is 30m long, 15m wide and about 20m tall.  A passage continues from the top of the chamber near where the rope drops in.  This passage continues upwards, with a moderately unstable boulder floor.  A further small passage heads of the bottom of the chamber which could be a digging project.  There may be a passage going of the far end of the chamber near the ceiling.</underground_description>
+<equipment>It is estimated that 60m + 90m rope should do.</equipment>
+<references><a href="/others/ubss/UBSS_Proc_19_3_347-358.pdf">UBSS Totes Gebirge Expedition 1992</a></references>
+<survey><a href="2011-01highres.png"><img src="2011-01lowres.png"/></a></survey>
+<kataster_status>not in kataster</kataster_status>
+<underground_centre_line></underground_centre_line>
+<notes></notes>
+<length></length>
+<depth></depth>
+<extent></extent>
+<survex_file>caves/2011-01/2011-01.svx</survex_file>
+<description_file></description_file>
+<url>smkridge/2011-01/2011-01.html</url>
+</cave>
+</body>
+</html>
diff --git a/noinfo/entrance_data/1623-2001-02.html b/noinfo/entrance_data/1623-2001-02.html
index 64bb4be41..0be69ad1b 100644
--- a/noinfo/entrance_data/1623-2001-02.html
+++ b/noinfo/entrance_data/1623-2001-02.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance2001-02_1.JPG">
-<img alt="2001-02 tag location" src="entrance2001-02_1-small.jpg"></a>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance2001-02_1.JPG">
+<img alt="2001-02 tag location" src="entrance2001-02_1-small.jpg"></a>
 <p>2001-02 tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2001-03.html b/noinfo/entrance_data/1623-2001-03.html
index 3b58bb61e..2c1c2f1cc 100644
--- a/noinfo/entrance_data/1623-2001-03.html
+++ b/noinfo/entrance_data/1623-2001-03.html
@@ -15,9 +15,9 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance2001-03_1.JPG">
-<img alt="2001-03 tag location" src="entrance2001-03_1-small.jpg"></a>
-<p>2001-03 tag position</p></div>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance2001-03_1.JPG">
+<img alt="2001-03 tag location" src="entrance2001-03_1-small.jpg"></a>
+<p>2001-03 tag position</p></div>
 </photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2002-AD-04.html b/noinfo/entrance_data/1623-2002-AD-04.html
index 006d14a35..f1bcd66ab 100644
--- a/noinfo/entrance_data/1623-2002-AD-04.html
+++ b/noinfo/entrance_data/1623-2002-AD-04.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach>Further round and higher up on the same side of the col as <a href="../2002-AD-03/2002-AD-03.html">2002-AD-03</a> are three holes.</approach>
 <underground_description></underground_description>
-<photo><p><a href="i/klippenhoele_1.jpg"><img src="t/klippenhoele_1.jpg"/></a></p><p><a href="i/klippenhoele_2.jpg"><img src="t/klippenhoele_2.jpg"/></a></p><p><a
-href="i/klippenhoele_3.jpg"><img 
+<photo><p><a href="i/klippenhoele_1.jpg"><img src="t/klippenhoele_1.jpg"/></a></p><p><a href="i/klippenhoele_2.jpg"><img src="t/klippenhoele_2.jpg"/></a></p><p><a
+href="i/klippenhoele_3.jpg"><img 
 src="t/klippenhoele_3.jpg"/></a></p></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2012-HW-01.html b/noinfo/entrance_data/1623-2012-HW-01.html
index 13fc562b4..49ff11b4c 100644
--- a/noinfo/entrance_data/1623-2012-HW-01.html
+++ b/noinfo/entrance_data/1623-2012-HW-01.html
@@ -10,8 +10,8 @@
 <slug>1623-2012-HW-01</slug>
 <name></name>
 <entrance_description>Shattered near-vertical shaft near top of hill. Shaft approx 3 m diameter, approx 5 to 10 m deep. Pool of water in bottom of shaft. No discernable air flow. Shaft quite green and drippy.</entrance_description>
-<explorers>CUCC Expo
-
+<explorers>CUCC Expo
+
 Discovered 2012</explorers>
 <map_description></map_description>
 <location_description>Near top of Niederes Augsteck, on north west side.</location_description>
diff --git a/noinfo/entrance_data/1623-2012-HW-02.html b/noinfo/entrance_data/1623-2012-HW-02.html
index 50cf3dd7e..d6d576255 100644
--- a/noinfo/entrance_data/1623-2012-HW-02.html
+++ b/noinfo/entrance_data/1623-2012-HW-02.html
@@ -10,10 +10,10 @@
 <slug>1623-2012-HW-02</slug>
 <name></name>
 <entrance_description>Very broken, fluted shaft, partially choked with frost breakdown, in a 10 m x 5 m depression. Shaft is approximately 2 m x 1 m at top. Opens out and shelves under after approx 5 m. Possibly connects to adjacent choked shaft 2 m up dip.</entrance_description>
-<explorers>CUCC Expo
-
-Discovered 2012
-
+<explorers>CUCC Expo
+
+Discovered 2012
+
 </explorers>
 <map_description></map_description>
 <location_description>On north side of Niederes Augsteck.</location_description>
diff --git a/noinfo/entrance_data/1623-2012-OK-01.html b/noinfo/entrance_data/1623-2012-OK-01.html
index 6e9e34216..4075132a5 100644
--- a/noinfo/entrance_data/1623-2012-OK-01.html
+++ b/noinfo/entrance_data/1623-2012-OK-01.html
@@ -15,8 +15,8 @@
 <location_description>On the plateau between Augsteck and Niederes Augsteck.</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><A href="i/2012-OK-01-01.JPG"><IMG src="t/2012-OK-01-01.JPG" /></A><BR/><BR/>
-<A href="i/2012-OK-01-02.JPG"><IMG src="t/2012-OK-01-02.JPG" /></A><BR/><BR/>
+<photo><A href="i/2012-OK-01-01.JPG"><IMG src="t/2012-OK-01-01.JPG" /></A><BR/><BR/>
+<A href="i/2012-OK-01-02.JPG"><IMG src="t/2012-OK-01-02.JPG" /></A><BR/><BR/>
 <A href="i/2012-OK-01-03.JPG"><IMG src="t/2012-OK-01-03.JPG" /></A><BR/><BR/></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2012-OK-02.html b/noinfo/entrance_data/1623-2012-OK-02.html
index 5335b5810..171eb705a 100644
--- a/noinfo/entrance_data/1623-2012-OK-02.html
+++ b/noinfo/entrance_data/1623-2012-OK-02.html
@@ -15,7 +15,7 @@
 <location_description>On the plateau between Augsteck and Niederes Augsteck.</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><A href="i/2012-OK-02-01.JPG"><IMG src="t/2012-OK-02-01.JPG" /></A><BR/><BR/>
+<photo><A href="i/2012-OK-02-01.JPG"><IMG src="t/2012-OK-02-01.JPG" /></A><BR/><BR/>
 <A href="i/2012-OK-02-02.JPG"><IMG src="t/2012-OK-02-02.JPG" /></A><BR/><BR/></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2012-OK-03.html b/noinfo/entrance_data/1623-2012-OK-03.html
index ef75e8229..bab20cb14 100644
--- a/noinfo/entrance_data/1623-2012-OK-03.html
+++ b/noinfo/entrance_data/1623-2012-OK-03.html
@@ -15,7 +15,7 @@
 <location_description>Located in the valley where the winter ski route from Wildenseealm onto the plateau is marked. Relatively far up in the valley and relatively high on its southern slope. Can also be approached by a 45 minute walk from the entrance to Tunnocksschacht across the limestone plateau.</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><A href="i/2012-OK-03-01.JPG"><IMG src="t/2012-OK-03-01.JPG" /></A><BR/><BR/>
+<photo><A href="i/2012-OK-03-01.JPG"><IMG src="t/2012-OK-03-01.JPG" /></A><BR/><BR/>
 <A href="i/2012-OK-03-02.JPG"><IMG src="t/2012-OK-03-02.JPG" /></A><BR/><BR/></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-2012-ns-03.html b/noinfo/entrance_data/1623-2012-ns-03.html
index ac4e82e8b..4aeaf9d2f 100644
--- a/noinfo/entrance_data/1623-2012-ns-03.html
+++ b/noinfo/entrance_data/1623-2012-ns-03.html
@@ -1,55 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one entrance in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-2012-ns-03</slug>
-<name>Moth Cave</name>
-<entrance_description>Small entrance at very S end of escarpment. Crawl into passage over sharp rocks</entrance_description>
-<explorers>Julian Todd
-Noel Snape
-</explorers>
-<map_description></map_description>
-<location_description>In E facing escarpent at S end, near highest point of hill. </location_description>
-<approach>Take german path N of tunnocks. Cross one "valley" running roughly E-W. After ascending out of valley on cairned route, follow level section around several large shakjeholes/broken shafts. Turn right where the bunder thins (near the end of the hill). Upon reaching the edge of the escarpemt facing E from the top of this hill, follow it to the S end and the cave should be at the end, hidden by a boulder until you are upon it.</approach>
-<underground_description>sharp floored crawl</underground_description>
-<photo>/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-a1.JPG
-
-/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-a2.JPG
-
-
-
-</photo>
-<!-- marking options: P  = Paint,
-                      P? = Paint (?),
-                      T  = Tag,
-                      T? = Tag (?),
-                      R  = Retagged,
-                      S  = Spit,
-                      S? = Spit (?),
-                      U  = Unmarked,
-                      ?  = Unknown" -->
-<marking>T</marking> 
-<marking_comment>cucc 2012-ns-13</marking_comment>
-<!-- findability options: ? = To be confirmed ...,
-                          S = Surveyed,
-                          L = Lost,
-                          R = Refindable" -->
-<findability>S</findability>
-<findability_description>Co-ords in UTM, need converting</findability_description>
-<alt>1885</alt>
-<northing>0411650</northing>
-<easting>5233408</easting> 
-<tag_station></tag_station>
-<exact_station></exact_station>
-<other_station></other_station>
-<other_description></other_description>
-<bearings></bearings>
-<url>entrance/new/1623-2012-ns-03</url>
-</entrance>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Only put one entrance in this file -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<entrance>
+<non_public>False</non_public>
+<slug>1623-2012-ns-03</slug>
+<name>Moth Cave</name>
+<entrance_description>Small entrance at very S end of escarpment. Crawl into passage over sharp rocks</entrance_description>
+<explorers>Julian Todd
+Noel Snape
+</explorers>
+<map_description></map_description>
+<location_description>In E facing escarpent at S end, near highest point of hill. </location_description>
+<approach>Take german path N of tunnocks. Cross one "valley" running roughly E-W. After ascending out of valley on cairned route, follow level section around several large shakjeholes/broken shafts. Turn right where the bunder thins (near the end of the hill). Upon reaching the edge of the escarpemt facing E from the top of this hill, follow it to the S end and the cave should be at the end, hidden by a boulder until you are upon it.</approach>
+<underground_description>sharp floored crawl</underground_description>
+<photo>/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-a1.JPG
+
+/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-a2.JPG
+
+
+
+</photo>
+<!-- marking options: P  = Paint,
+                      P? = Paint (?),
+                      T  = Tag,
+                      T? = Tag (?),
+                      R  = Retagged,
+                      S  = Spit,
+                      S? = Spit (?),
+                      U  = Unmarked,
+                      ?  = Unknown" -->
+<marking>T</marking> 
+<marking_comment>cucc 2012-ns-13</marking_comment>
+<!-- findability options: ? = To be confirmed ...,
+                          S = Surveyed,
+                          L = Lost,
+                          R = Refindable" -->
+<findability>S</findability>
+<findability_description>Co-ords in UTM, need converting</findability_description>
+<alt>1885</alt>
+<northing>0411650</northing>
+<easting>5233408</easting> 
+<tag_station></tag_station>
+<exact_station></exact_station>
+<other_station></other_station>
+<other_description></other_description>
+<bearings></bearings>
+<url>entrance/new/1623-2012-ns-03</url>
+</entrance>
+</body>
+</html>
diff --git a/noinfo/entrance_data/1623-2012-ns-13b.html b/noinfo/entrance_data/1623-2012-ns-13b.html
index a9d06c6fe..1045d27d8 100644
--- a/noinfo/entrance_data/1623-2012-ns-13b.html
+++ b/noinfo/entrance_data/1623-2012-ns-13b.html
@@ -1,48 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one entrance in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<entrance>
-<non_public>False</non_public>
-<slug>1623-2012-ns-13b</slug>
-<name>Moth Cave</name>
-<entrance_description>Low slot in cliff, facing S close to a</entrance_description>
-<explorers>Noel Snape
-Julian Todd</explorers>
-<map_description></map_description>
-<location_description>Just around corner from a, on S side of cliff</location_description>
-<approach>as per a</approach>
-<underground_description></underground_description>
-<photo>/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-b1</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>entrance/new/1623-2012-ns-13/</url>
-</entrance>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!-- Only put one entrance in this file -->
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<entrance>
+<non_public>False</non_public>
+<slug>1623-2012-ns-13b</slug>
+<name>Moth Cave</name>
+<entrance_description>Low slot in cliff, facing S close to a</entrance_description>
+<explorers>Noel Snape
+Julian Todd</explorers>
+<map_description></map_description>
+<location_description>Just around corner from a, on S side of cliff</location_description>
+<approach>as per a</approach>
+<underground_description></underground_description>
+<photo>/home/expo/expofiles/expoimages/photos/2012/Noel/2012-ns-13-b1</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>entrance/new/1623-2012-ns-13/</url>
+</entrance>
+</body>
+</html>
diff --git a/noinfo/entrance_data/1623-204f.html b/noinfo/entrance_data/1623-204f.html
index 4dc760805..55f437d73 100644
--- a/noinfo/entrance_data/1623-204f.html
+++ b/noinfo/entrance_data/1623-204f.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG">
-<img alt="204f tag location" src="i/entrance204f-small.jpg"></a>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG">
+<img alt="204f tag location" src="i/entrance204f-small.jpg"></a>
 <p>204f tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-231b.html b/noinfo/entrance_data/1623-231b.html
index 2c7bd3f22..8f9fd64e8 100644
--- a/noinfo/entrance_data/1623-231b.html
+++ b/noinfo/entrance_data/1623-231b.html
@@ -15,13 +15,13 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231b_1.JPG">
-<img alt="231b tag location" src="entrance231b_1-small.jpg"></a>
-<p>231b tag position</p></div>
-
-<div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231b_3.JPG">
-<img alt="231b view of entrance looking south" src="entrance231b_3-small.jpg"></a>
-<p>231b view of entrance looking south</p></div>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231b_1.JPG">
+<img alt="231b tag location" src="entrance231b_1-small.jpg"></a>
+<p>231b tag position</p></div>
+
+<div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231b_3.JPG">
+<img alt="231b view of entrance looking south" src="entrance231b_3-small.jpg"></a>
+<p>231b view of entrance looking south</p></div>
 </photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-231c.html b/noinfo/entrance_data/1623-231c.html
index fad26e7b3..3aff03569 100644
--- a/noinfo/entrance_data/1623-231c.html
+++ b/noinfo/entrance_data/1623-231c.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231c_2.JPG">
-<img alt="231c tag location" src="entrance231c_2-small.jpg"></a>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231c_2.JPG">
+<img alt="231c tag location" src="entrance231c_2-small.jpg"></a>
 <p>231c tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-231g.html b/noinfo/entrance_data/1623-231g.html
index 1977a0d06..9d5e5af16 100644
--- a/noinfo/entrance_data/1623-231g.html
+++ b/noinfo/entrance_data/1623-231g.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231g_2.JPG">
-<img alt="231g tag location" src="entrance231g_2-small.jpg"></a>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231g_2.JPG">
+<img alt="231g tag location" src="entrance231g_2-small.jpg"></a>
 <p>231g tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-231i.html b/noinfo/entrance_data/1623-231i.html
index a821d1b70..5d863b06f 100644
--- a/noinfo/entrance_data/1623-231i.html
+++ b/noinfo/entrance_data/1623-231i.html
@@ -15,8 +15,8 @@
 <location_description></location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231i_1.JPG">
-<img alt="231i tag location" src="entrance231i_1-small.jpg"></a>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance231i_1.JPG">
+<img alt="231i tag location" src="entrance231i_1-small.jpg"></a>
 <p>231i tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),
diff --git a/noinfo/entrance_data/1623-244.html b/noinfo/entrance_data/1623-244.html
index 974cafb2e..fb8b24f57 100644
--- a/noinfo/entrance_data/1623-244.html
+++ b/noinfo/entrance_data/1623-244.html
@@ -15,13 +15,13 @@
 <location_description>Immediately above and behind the 204 stone bridge bivvy</location_description>
 <approach></approach>
 <underground_description></underground_description>
-<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance244_1.JPG">
-<img alt="244 tag location" src="entrance244_1-small.jpg"></a>
-<p>244 tag position</p></div>
-
-<div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance244_2.JPG">
-<img alt="244 looking down entrance shaft, tag top right-hand corner" src="entrance244_2-small.jpg"></a>
-<p>244 looking down entrance shaft, tag top right-hand corner</p></div>
+<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance244_1.JPG">
+<img alt="244 tag location" src="entrance244_1-small.jpg"></a>
+<p>244 tag position</p></div>
+
+<div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance244_2.JPG">
+<img alt="244 looking down entrance shaft, tag top right-hand corner" src="entrance244_2-small.jpg"></a>
+<p>244 looking down entrance shaft, tag top right-hand corner</p></div>
 </photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),