diff --git a/index.md b/index.md
index d660be6..281e2ac 100644
--- a/index.md
+++ b/index.md
@@ -16,7 +16,7 @@ GAP-packages [homalg/CAP](http://homalg.math.rwth-aachen.de/)
 Algebras).
 
 The school will be followed by a coding sprint to mutally integrate
-the homalg/CAP packages and QPA. It will end on Wednesday the 23rd at
+the GAP-packages homalg/CAP and QPA. It will end on Wednesday the 23rd at
 13:00.
 
 
diff --git a/location.md b/location.md
index c5f9902..b5b63f1 100644
--- a/location.md
+++ b/location.md
@@ -12,14 +12,18 @@ You can find the organizers in room [854 SBII](http://s.mazemap.com/1HfrWqg).
 
 <h3>Accommodation</h3>
 
-All participants will be accommodated in [XXX](http://XXX).  If you
-fly to Trondheim, then the easiest way to get to Trondheim from the
-airport is to take one of the airport bus services
+All participants will be accommodated in
+[Scandic Bakklandet](http://www.scandichotels.com/Hotels/Norway/Trondheim/Bakklandet/).
+If you fly to Trondheim, then the easiest way to get to Trondheim from
+the airport is to take one of the airport bus services
 [Flybussen](http://www.flybussen.no/en/Trondheim/) or
 [Værnesekspressen](http://vaernesekspressen.no/index.php/vaernes_eng/vaernes/nyheter).
-Remember to buy a return ticket as this is cheaper.
+The most convenient one is the latter, as the bus stop Bakkegata is
+directly outside the hotel.  The closest bus stop for Flybussen is
+Søndre gt.  Remember to buy a return ticket as this
+is cheaper.
 
 It takes
-about 25 minutes to walk from the hotel to the university following
+about 22 minutes to walk from the hotel to the university following
 this
-[route](https://www.google.no/maps/dir/Comfort+Hotel+Trondheim,+Krambugata,+Trondheim/O.+S.+Bragstads+Plass,+7034+Trondheim/@63.4260487,10.3916404,15z/data=!4m14!4m13!1m5!1m1!1s0x466d319954dcb017:0x5aa2bf3a275e6903!2m2!1d10.402387!2d63.432879!1m5!1m1!1s0x466d3195ac4846ab:0x5e9e02c69e447a36!2m2!1d10.4012339!2d63.4187854!3e2?hl=no). 
+[route](https://www.google.no/maps/dir/Rica+Bakklandet+Hotel,+Nedre+Bakklandet,+Trondheim/O.+S.+Bragstads+Plass,+7034+Trondheim/@63.4254069,10.3941919,15z/data=!3m1!4b1!4m14!4m13!1m5!1m1!1s0x466d319929da2d9d:0xb3ed87ec72458acf!2m2!1d10.406931!2d63.432029!1m5!1m1!1s0x466d3195ac4846ab:0x5e9e02c69e447a36!2m2!1d10.4012339!2d63.4187854!3e2?hl=no).
diff --git a/program.md b/program.md
index d2a0847..38b85be 100644
--- a/program.md
+++ b/program.md
@@ -8,13 +8,13 @@ theory of algebras and homological algebra in GAP. The talks will
 provide
 
 * a general introduction to programming in GAP, talks given by
-[Max Horn](mailto:max.horn@math.uni-giessen.de), 
+[Max Horn](http://www.quendi.de/math.php), 
 * an introduction to parallel programming in GAP, talks given by
 [Markus Pfeiffer](http://www.morphism.de/~markusp/), 
 * an introduction to the GAP-package [homalg/CAP](http://homalg.math.rwth-aachen.de/)
 (homological algebra and category theory in GAP), talks given by
-[Mohamed Barakat](mailto:mohamed.barakat@rwth-aachen.de), Sebastian
-Gutsche and Sebastian Posur, 
+[Mohamed Barakat](http://www.mathematik.uni-kl.de/~barakat/en/index), [Sebastian
+Gutsche](http://wwwb.math.rwth-aachen.de/~gutsche/) and [Sebastian Posur](http://wwwb.math.rwth-aachen.de/Mitarbeiter/posur.php), 
 * an introduction to the GAP-package [QPA](http://www.math.ntnu.no/~oyvinso/QPA/) (Quivers and Path
 Algebras), talks given by
 [Øystein Skartsæterhagen](http://www.math.ntnu.no/~oysteini/) and
diff --git a/registration.html b/registration.html
index 7b0be0d..dd0b874 100644
--- a/registration.html
+++ b/registration.html
@@ -103,10 +103,10 @@
   </div>
   <div class="form-field-description">
     <strong>Accommodation:</strong> We have reserved rooms in <a
-  href="https://www.nordicchoicehotels.no/comfort/comfort-hotel-trondheim/">Comfort
-    Hotel Trondheim</a>  
-    at special university rates (single room XXX per night, double room
-    YYY per person per night), and we expect as a default option that participants
+    href="http://www.scandichotels.com/Hotels/Norway/Trondheim/Bakklandet/">Scandic
+    Bakklandet</a>
+    at special university rates (single room 940 NOK per night, double room
+    590 NOK per person per night), and we expect as a default option that participants
     share double rooms.  So please indicate under 
     <strong>Wishes</strong> if <strong>(i)</strong> you have any other
     participant you would like to share a double room with, or