diff --git a/handbook/computer.html b/handbook/computer.html
index cfc1cc5d2..98740d692 100644
--- a/handbook/computer.html
+++ b/handbook/computer.html
@@ -28,12 +28,7 @@ as the Gasthof is probably paying per GB to their supplier.
 will need to use the Gasthof WiFi 'staudnwirt'. This takes you to a login page on a web browser and it will 
 log you out if you stop using it or whenever it thinks you have been on too long. Get instructions from the 
 Gasthof campsite reception.
-<div class="onright">
-<figure>
-<a href="/piclinks/typing.htm"><img src="/images/typing.jpg"></a>
-<br><figcaption>Basecamp computer in 1991 - in the old potato hut</figcaption>
-</figure>
-</div>
+
 <h3>Expo laptop</h3>
 
 <p>The <em>Expo laptop</em> in the tatty hut is a Dell Latitude E4200 laptop (on loan from Philip
@@ -42,12 +37,16 @@ Sargent) which is connected to the router by a cable and also by WiFi
 also has an external numberpad as a couple of vital keys are dead
 (e.g. down-arrow). It runs Linux (Debian) and has installed all the software
 for talking to the server for:
-
+<div class="onright">
+<figure>
+<a href="/piclinks/typing.htm"><img src="/images/typing.jpg"></a>
+<br><figcaption>Basecamp computer in 1991 - in the old potato hut</figcaption>
+</figure>
+</div>
 <ul>
 <li>Typing in survey data
 <li>Uploading survey data
 <li>Uploading photos and GPS tracks
-<li>Controlling the music system
 <li>Reading this Handbook
 </ul>
 
@@ -57,10 +56,12 @@ are advised to use the <em>Expo laptop</em> first to see how it all works.</p>
 
 <p>The laptop is usually connected to an extra LCD screen so that you can see surveys more easily as the laptop itself is small.
 
-<p>Either the <em>Expo laptop</em> or your own laptop will use the version control system to 
-synchronise cave data. It's easier to use the <em>Expo laptop</em> as the software is already set up. 
-But if you set up your own computer then you will get a more familiar environment. See 
-the <a href="computing/onlinesystems.html">Expo Online Systems Manual</a> for info on how to do that.</p>
+<p>For experienced expo surveyers the <em>Expo laptop</em> is also set up to use the version control system to 
+synchronise cave data. New expoers should use the web forms, which work from any browser on any laptop. You can 
+configure your own laptop to do bulk upload of many files and manage the version control yourself, but 
+initially it is easier to use the <em>Expo laptop</em> as the software is already set up (cryptographic key 
+exchange etc. is pre-configured). See the <a href="computing/basiclaptop.html">Basic Expo Laptop</a> for info 
+on how to do that.</p>
 
 <P>Through the miracle of the distributed version control system, everyone can edit the 
 data on multiple laptops at the same time and it should all get merged.</p>
diff --git a/handbook/computing/basiclaptop.html b/handbook/computing/basiclaptop.html
index 74d23f096..d2892a0f3 100644
--- a/handbook/computing/basiclaptop.html
+++ b/handbook/computing/basiclaptop.html
@@ -58,7 +58,7 @@ href="manual.html">data maintenance manual</a>.
 <ol>
   <li>Register an SSH key</a> with an expo nerd i.e 'get a login'. (see "Key Configuration" below)</li>
   <li>Install <a href="#software">git version control software</a> to download ("clone"), view and edit caving data.</li>
-  <li>Clone two <a href="../computing/repos.html">expo repositories</a> <var>loser</var> and <var>drawings</var> so you have the files on your machine. (Use the <a href="qstart-git.html">git reminder</a> for how to do this, e.g. <em>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</em> [actually <var>loser</var> is still (Oct.2021) using mercurial not git, so this won't work.]</li>
+  <li>Clone two <a href="../computing/repos.html">expo repositories</a> <var>loser</var> and <var>drawings</var> so you have the files on your machine. (Use the <a href="qstart-git.html">git reminder</a> for how to do this, e.g. <em>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</em> .</li>
   <li>Install survex, and therion or tunnel for editing cave data.
   <li>Install image editing software such as Irfanview or gimp.
   <li>If you are also planning on extensive work rewriting parts of the handbook, then you will also need the <a href="../computing/repos.html">expo repository</a> <var>expoweb</var>.