diff --git a/handbook/survey/getin.htm b/handbook/survey/getin.htm
index b519331e0..a0231c7b6 100644
--- a/handbook/survey/getin.htm
+++ b/handbook/survey/getin.htm
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>CUCC Expo Surveying Handbook: Entering data</title>
 <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
 </head>
@@ -32,19 +33,18 @@ on the expo laptop. These instructions assume that you are using the expo laptop
 
 <p>Where to put your data: <b>If in doubt, ask!</b>. These instructions assume 
 that you are typing it in on the <em>expo laptop</em>. (You can do it fom your own
-laptop if you have been initiated into the deep magic of the "loser" repository
+laptop if you have been initiated into the deep magic of the ":loser:" repository
 of the distributed version control system - see the
 <a href="../manual.html#repositories">list of repos</a>.
 
 <ul><li>If it is a surface
-survey, it goes in the "surface" directory; 
+survey, it goes in the :loser:/surface" directory; 
 <li>if it is a file of fixed points
-(like GPS fixes, or map coordinates), it goes in the "fixedpts" directory; 
+(like GPS fixes, or map coordinates), it goes in the ":loser:/fixedpts" directory; 
 <li>if
-it is a new cave on the near-plateau, put it in a new directory under "caves-1623".
-</ul>
+it is a new cave on the near-plateau, put it in a new directory under ":loser:/caves-1623".
 <li>Underground data for Steinbr&uuml;ckenh&ouml;hle goes in one of the
-subdirectories under caves-1623/204; it may well be clear which one from what it
+subdirectories under :loser:/caves-1623/204/; it may well be clear which one from what it
 links to, but if not, ask.</p>
 </li>
 </ul>
@@ -52,25 +52,27 @@ links to, but if not, ask.</p>
 <h3>Use a template</h3>
 
 
-<p>It will be easiest if you start from one of the existing template files,
-as these have lines to remind you to add various details - make sure you
+<p>The beginner should start from the existing template file :loser:/template/template.svx 
+as this has lines to remind you to add various details - make sure you
 don't leave any blanks! Copy <em>and rename this</em>  to where you want to put your data
 <em>before</em> editing it. Too many people have overwritten the
 template in the past, try not to do this yourself.
+<p>Working by editing a .svx file from another bit of the same cave may seem like a short cut but whoever edited it may have deleted some of the helpful and useful hints that are in the template.svx file - so don't do this please, until you really know what you are doing.
 
-<h3><a id="filenames">Filename and data-entry conventions</a></h3>
+<h3><a id="filenames">Filename and data-entry conventions in svx files</a></h3>
 
 <ul>
 <li>Use Unix line endings (i.e. \n not \r\n).
 
 <li>Use UTF-8 character encoding.
+<li>NO UMLAUTS.
 
 <li>Cave numbers are written without any leading zeros at all (in filenames,
   survey names, or anything else!).
 
-<li>Entrances have station names such as p204b.  In the event of the tag
+<li>Entrances have station names such as <b>p204b</b>.  In the event of the tag
   location being different from the entrance location, the tag point
-  should be named with a "t" instead, e.g. t204b.
+  should be named with a "t" instead, e.g. <b>t204b</b>.
 
 <li>No full stop (.) characters in station names.
 
@@ -117,8 +119,8 @@ it can be a good idea to nest surveys in one file:
 *end 2050-01
 </pre>
 or you can create several .svx files. 
-Creating several .svx files seemsto be current practice as it 
-simplifies the manual process of knitting several different people's trips together.
+Creating several .svx files seems to be current practice as it 
+simplifies the manual process of knitting several different people's trips together (though the online wallet system can only record one of these at the moment).
 
 <p>There is no restriction on the length of these names, but as they can be
 displayed in aven, tunnel and other such programs, it helps not to have
@@ -126,7 +128,7 @@ anything too elaborate. Older versions of survex required each prefix to be
 unique in its first eight characters, and this is not a bad guideline to
 follow.</p></li>
 
-<h3>Station names</h3>
+<h3 id="stationanmes">Station names</h3>
 
 <p>Every station should have a number <em>within your survey</em> even if it
 is an existing station to which you have connected. Any survey stations which
@@ -143,6 +145,8 @@ cryptic for the uninitiated, it may be best not to try to link your survey to
 everything else so skip the next bit and read on <a href="#concrete">from
 here</a>.</p>
 
+<h3 id="plumbing">Plumbing your survey into the rest of the cave</h3>
+
 <p>However, if you need to see your survey in relation to the rest of the
 dataset:</p>
 
@@ -183,7 +187,7 @@ successfully, and numbered it within your own survey as station 0. Then you
 might create the following file: (note we don't use umlauts)</p>
 <!-- Stolen, with apologies to Martin and Lucia, from
 caves/204/swings/ermintrude.svx. --> 
-<pre><i>File wibble.svx</i>
+<pre><code><i>File wibble.svx</i>
 *begin wibble
 
 ; Locn:	Totes Gebirge, Austria - Loser/Augst-Eck Plateau (kataster group 1623)
@@ -211,18 +215,19 @@ caves/204/swings/ermintrude.svx. -->
 ;stn	L	R	U	D	Desc
 ;1	0.7	0.4	0.3	0.5	RP top of boulder
 <i>[and the rest of the station details]</i>
-*end wibble
+*end wibble</code>
 </pre>
 
-<p>That lot would be typed by copying caves-1623/204/template.svx to
-caves-1623/204/swings/wibble.svx and then filling in the blanks and adding your
+<p>That lot would be typed by copying :loser:/template/template.svx to
+:loser:/caves-1623/204/swings/wibble.svx and then filling in the blanks and adding your
 data. If you are linking to the rest of the survey then in the file
-caves-1623/204/swings/allswings.svx add the lines:</p>
+:loser:/caves-1623/204/swings/allswings.svx add the lines:</p>
 
-<pre>
-*include wibble
+<pre><code>*include wibble
 *equate wibble.0 swings5.2
-</pre>
+</code></pre>
+
+<h3 id="split">Split surface and underground files</h3>
 
 <p>Remember not to put surface data and underground data in the same file,
 even if they are part of one continuous survey. You need to create two
@@ -230,6 +235,7 @@ files, with a defined station for the entrance, and a suitable equate in
 the file which includes both surface stuff and underground stuff.</p>
 <!-- Did whoever surveyed bogenhoehle read this? -->
 
+<h3 id="postprocess">Postprocessing and Update</h3>
 <p>Once you have your data typed in and checked, it must be run through the
 survey software (which on expo will be <a
 href="http://www.survex.com/">survex</a>) and a centre line printed, both for
@@ -237,7 +243,7 @@ plan and for extended elevation. Measure the print out to check that it really
 has printed at the scale you wanted (typically 1:500), as this has sometimes
 caused problems in the past.</p>
 
-<p>Now see the "<a href="drawup.htm">Drawing it up</a>" page.</p>
+<p>Return to  "<a href="newcave.html#survexformat">Survey handbook - survex format</a>".</p>
 
 <hr />
 
diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html
index 3daea3d7e..7c2347006 100644
--- a/handbook/survey/qmentry.html
+++ b/handbook/survey/qmentry.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
 <title>Handbook - Doing a new cave - QMs</title>
 <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
 </head>
@@ -84,6 +83,7 @@ drawings correctly with this sort of thing.
 <h3>Conclusion</h3>
 <p>Survey data recorded in .svx files is incomplete if there is no QM List data and
 cave description data!
+<p>Return to  "<a href="newcave.html#survexformat">Survey handbook - survex format</a>".</p>
 
 <hr />
 
