diff --git a/.mailmap b/.mailmap
index fe3f6bb7e..eef3dcae2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,37 +1,39 @@
-Olexandr Konovalov <obk1@st-andrews.ac.uk> Alexander Konovalov <alexk@mcs.st-andrews.ac.uk>
-Olexandr Konovalov <obk1@st-andrews.ac.uk> Alexander Konovalov <alex-konovalov@users.noreply.github.com>
-Chris Jefferson <caj21@st-andrews.ac.uk> Chris Jefferson <chris@bubblescope.net>
-Chris Russell <cr66@st-andrews.ac.uk> ChristopherRussell <cr66@st-andrews.ac.uk>
+Stuart Burrell <stuartburrell1994@gmail.com> <stuartburrell@users.noreply.github.com>
+Stuart Burrell <stuartburrell1994@gmail.com> stuartburrell <unknown>
+Reinis Cirpons <rc234@st-andrews.ac.uk> Reinis Cirpons <43414125+reiniscirpons@users.noreply.github.com>
+Tom Conti-Leslie <tom.contileslie@gmail.com> Tom Conti-Leslie <54725378+tomcontileslie@users.noreply.github.com>
+Joe Edwards <je53@st-andrews.ac.uk> Joe Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
+Luke Elliott <le27@st-andrews.ac.uk> le27 <le27@st-andrews.ac.uk>
 Fernando Flores Brito <ffloresbrito@gmail.com> Fernando Flores Brito <ffb3@st-andrews.ac.uk>
-Finn Smith <fls3@st-andrews.ac.uk> Finlay Smith <fls3@st-andrews.ac.uk>
-Finn Smith <fls3@st-andrews.ac.uk> Finn Smith <finnishing@gmail.com>
-Finn Smith <fls3@st-andrews.ac.uk> flsmith <finnishing@gmail.com>
-James Mitchell <jdm3@st-andrews.ac.uk> <james-d-mitchell@users.noreply.github.com>
+Nick Ham <nicholas.charles.ham@gmail.com>
+Robert Hancock <hancock@informatik.uni-heidelberg.de> Robert Hancock <unknown>
+Max Horn <horn@mathematik.uni-kl.de> Max Horn <max@quendi.de>
+Chris Jefferson <caj21@st-andrews.ac.uk> Chris Jefferson <chris@bubblescope.net>
+Julius Jonusas <j.jonusas@gmail.com> Julius <jj252@st-andrews.ac.uk>
+Julius Jonusas <j.jonusas@gmail.com> Julius <unknown>
+Julius Jonusas <j.jonusas@gmail.com> jj <unknown>
+Olexandr Konovalov <obk1@st-andrews.ac.uk> Alexander Konovalov <alex-konovalov@users.noreply.github.com>
+Olexandr Konovalov <obk1@st-andrews.ac.uk> Alexander Konovalov <alexk@mcs.st-andrews.ac.uk>
+Artemis Konstantinidi <ak316@st-andrews.ac.uk> artemiskonst <97620468+artemiskonst@users.noreply.github.com>
 James Mitchell <jdm3@st-andrews.ac.uk> <jdm3@st-and.ac.uk>
 James Mitchell <jdm3@st-andrews.ac.uk> <jdm3@st-andrews.ac.uk>
 James Mitchell <jdm3@st-andrews.ac.uk> <jenkyfunds@gmail.com>
+James Mitchell <jdm3@st-andrews.ac.uk> James Mitchell <james-d-mitchell@users.noreply.github.com>
+James Mitchell <jdm3@st-andrews.ac.uk> james-d-mitchell <james-d-mitchell@users.noreply.github.com>
 James Mitchell <jdm3@st-andrews.ac.uk> jamesm <unknown>
-Artemis Konstantinidi <ak316@st-andrews.ac.uk> artemiskonst <97620468+artemiskonst@users.noreply.github.com>
-Julius Jonusas <j.jonusas@gmail.com> Julius <jj252@st-andrews.ac.uk>
-Julius Jonusas <j.jonusas@gmail.com> Julius <unknown>
-Julius Jonusas <j.jonusas@gmail.com> jj <unknown>
-Luke Elliott <le27@st-andrews.ac.uk> le27 <le27@st-andrews.ac.uk>
-Markus Pfeiffer <markus.pfeiffer@morphism.de> Markus Pfeiffer <markusp@mcs.st-andrews.ac.uk>
+Dima Pasechnik <dmitrii.pasechnik@cs.ox.ac.uk> Dima Pasechnik <dimpase@gmail.com>
 Markus Pfeiffer <markus.pfeiffer@morphism.de> Markus Pfeiffer <markus.pfeiffer@st-andrews.ac.uk>
+Markus Pfeiffer <markus.pfeiffer@morphism.de> Markus Pfeiffer <markusp@mcs.st-andrews.ac.uk>
+Chris Russell <cr66@st-andrews.ac.uk> ChristopherRussell <cr66@st-andrews.ac.uk>
+Jack Schmidt <jack.schmidt@uky.edu> Jack Schmidt <github@mowsey.org>
+Finn Smith <fls3@st-andrews.ac.uk> Finlay Smith <fls3@st-andrews.ac.uk>
+Finn Smith <fls3@st-andrews.ac.uk> Finn Smith <finnishing@gmail.com>
+Finn Smith <fls3@st-andrews.ac.uk> flsmith <finnishing@gmail.com>
+Nicolas Thiéry <nthiery@users.sf.net> Nicolas M. Thiéry <nthiery@users.sf.net>
+Murray Whyte <mw231@st-andrews.ac.uk> Murray Whyte <42549861+MTWhyte@users.noreply.github.com>
+Wilf Wilson <gap@wilf-wilson.net> Wilf Wilson <wilf@wilf-wilson.net>
+Wilf Wilson <gap@wilf-wilson.net> wilfwilson <wilf@wilf-wilson.net>
 Michael Young <mct25@st-andrews.ac.uk> <mct25@st-andrews.ac.uk>
 Michael Young <mct25@st-andrews.ac.uk> <mtorpey@mtorpey-debtest>
 Michael Young <mct25@st-andrews.ac.uk> mct25 <unknown>
 Michael Young <mct25@st-andrews.ac.uk> mtorpey <unknown>
-Murray Whyte <mw231@st-andrews.ac.uk> Murray Whyte <42549861+MTWhyte@users.noreply.github.com>
-Nick Ham <nicholas.charles.ham@gmail.com>
-Stuart Burrell <stuartburrell1994@gmail.com> <stuartburrell@users.noreply.github.com>
-Stuart Burrell <stuartburrell1994@gmail.com> stuartburrell <unknown>
-Tom Conti-Leslie <tom.contileslie@gmail.com> Tom Conti-Leslie <54725378+tomcontileslie@users.noreply.github.com>
-Wilf Wilson <gap@wilf-wilson.net> wilfwilson <wilf@wilf-wilson.net>
-Wilf Wilson <gap@wilf-wilson.net> Wilf Wilson <wilf@wilf-wilson.net>
-Joe Edwards <je53@st-andrews.ac.uk> Joe Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
-Robert Hancock <hancock@informatik.uni-heidelberg.de> Robert Hancock <unknown>
-Nicolas Thiéry <nthiery@users.sf.net> Nicolas M. Thiéry <nthiery@users.sf.net>
-Dima Pasechnik <dmitrii.pasechnik@cs.ox.ac.uk> Dima Pasechnik <dimpase@gmail.com>
-Jack Schmidt <jack.schmidt@uky.edu> Jack Schmidt <github@mowsey.org>
-Max Horn <horn@mathematik.uni-kl.de> Max Horn <max@quendi.de>
diff --git a/PackageInfo.g b/PackageInfo.g
index 41fc71b03..b016f9c92 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -82,11 +82,8 @@ Persons := [
     FirstNames    := "Thomas",
     IsAuthor      := true,
     IsMaintainer  := false,
-    Email         := "mam49@st-andrews.ac.uk",
-    PostalAddress := _STANDREWSMATHS,
-    Place         := "St Andrews",
-    Institution   := "University of St Andrews",
-    WWWHome       := "https://github.com/marinaanagno"),
+    Email         := "sam@math.rwth-aachen.de",
+    WWWHome       := "https://www.math.rwth-aachen.de/~Thomas.Breuer/"),
 
   rec(
     LastName      := "Burrell",