diff --git a/biblio.bib b/biblio.bib
index 70c956d..0d8aa3c 100644
--- a/biblio.bib
+++ b/biblio.bib
@@ -309,7 +309,7 @@
 }
 
 @inproceedings{BojanczykL12,
-	author    = {Miko{\l}aj Boja{\'{n}}czyk and
+	author    = {Mikolaj Bojanczyk and
 	             Slawomir Lasota},
 	editor    = {Artur Czumaj and
 	             Kurt Mehlhorn and
@@ -331,7 +331,7 @@
 }
 
 @inproceedings{BojanczykBKL12,
-	author    = {Miko{\l}aj Boja{\'{n}}czyk and
+	author    = {Mikolaj Bojanczyk and
 	             Laurent Braud and
 	             Bartek Klin and
 	             Slawomir Lasota},
@@ -352,7 +352,7 @@
 }
 
 @article{BojanczykKL14,
-	author    = {Miko{\l}aj Boja{\'{n}}czyk and
+	author    = {Mikolaj Bojanczyk and
 	             Bartek Klin and
 	             Slawomir Lasota},
 	title     = {Automata theory in nominal sets},
@@ -367,6 +367,31 @@
 	bibsource = {dblp computer science bibliography, https://dblp.org}
 }
 
+@inproceedings{BojanczykKLT13,
+	author    = {Mikolaj Bojanczyk and
+	             Bartek Klin and
+	             Slawomir Lasota and
+	             Szymon Torunczyk},
+	title     = {Turing Machines with Atoms},
+	booktitle = {28th Annual {ACM/IEEE} Symposium on Logic in Computer Science, {LICS}
+	             2013, New Orleans, LA, USA, June 25-28, 2013},
+	pages     = {183--192},
+	year      = {2013},
+	url       = {https://doi.org/10.1109/LICS.2013.24},
+	doi       = {10.1109/LICS.2013.24},
+	timestamp = {Thu, 25 May 2017 00:42:40 +0200},
+	biburl    = {https://dblp.org/rec/bib/conf/lics/BojanczykKLT13},
+	bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
+@book{Bojanczyk18,
+	author    = {Mikolaj Bojanczyk},
+	title     = {Slightly Infinite Sets},
+	publisher = {Draft December 4, 2018},
+	year      = {2018},
+	url       = {https://www.mimuw.edu.pl/~bojan/upload/main-6.pdf}
+}
+
 @article{BolligHKL08,
 	author    = {Benedikt Bollig and
 	             Peter Habermehl and
@@ -1407,7 +1432,7 @@
 
 @inproceedings{KopczynskiT16,
 	author    = {Eryk Kopczynski and
-	             Szymon Toru{\'{n}}czyk},
+	             Szymon Torunczyk},
 	editor    = {Tim King and
 	             Ruzica Piskac},
 	title     = {{LOIS:} an Application of {SMT} Solvers},
@@ -1427,7 +1452,7 @@
 
 @inproceedings{KopczynskiT17,
 	author    = {Eryk Kopczynski and
-	             Szymon Toru{\'{n}}czyk},
+	             Szymon Torunczyk},
 	editor    = {Giuseppe Castagna and
 	             Andrew D. Gordon},
 	title     = {{LOIS:} syntax and semantics},
@@ -2374,32 +2399,8 @@
 
 
 
-@book{Bojanczyk18,
-  author    = {Miko{\l}aj Boja{\'{n}}czyk},
-  title     = {Slightly Infinite Sets},
-  publisher = {Draft December 4, 2018},
-  year      = {2018},
-  url       = {https://www.mimuw.edu.pl/~bojan/upload/main-6.pdf}
-}
 
 
-@inproceedings{BojanczykKLT13,
-  author    = {Miko{\l}aj Boja{\'{n}}czyk and
-               Bartek Klin and
-               Slawomir Lasota and
-               Szymon Toru{\'{n}}czyk},
-  title     = {Turing Machines with Atoms},
-  booktitle = {28th Annual {ACM/IEEE} Symposium on Logic in Computer Science, {LICS}
-               2013, New Orleans, LA, USA, June 25-28, 2013},
-  pages     = {183--192},
-  year      = {2013},
-  url       = {https://doi.org/10.1109/LICS.2013.24},
-  doi       = {10.1109/LICS.2013.24},
-  timestamp = {Thu, 25 May 2017 00:42:40 +0200},
-  biburl    = {https://dblp.org/rec/bib/conf/lics/BojanczykKLT13},
-  bibsource = {dblp computer science bibliography, https://dblp.org}
-}
-
 @inproceedings{GabbayP99,
   author    = {Murdoch Gabbay and
                Andrew M. Pitts},
diff --git a/environment/bib.tex b/environment/bib.tex
index 78faae7..e80beca 100644
--- a/environment/bib.tex
+++ b/environment/bib.tex
@@ -20,10 +20,15 @@
 
 % The dblp database ignores Pauls nice a-breve and s-comma
 \btxremapauthor [Paul Fiterau{-}Brostean] [Paul Fiterău-Broștean]
-% These two don't work well...
-%\btxremapauthor [Michal Szynwelski] [Micha\l{} Szynwelski]
-%\btxremapauthor [Slawomir Lasota] [S\l{}awomir Lasota]
-\btxremapauthor [Eryk Kopczynski] [Eryk Kopczy\'nski]
+
+% The \l does not work well, but unicode is fine
+\btxremapauthor [Michal Szynwelski] [Michał Szynwelski]
+\btxremapauthor [Slawomir Lasota] [Sławomir Lasota]
+\btxremapauthor [Eryk Kopczynski] [Eryk Kopczyński]
+\btxremapauthor [Mikolaj Bojanczyk] [Mikołaj Bojańczyk]
+\btxremapauthor [Szymon Torunczyk] [Szymon Toruńczyk]
+
+% We use the short version, as he does himself
 \btxremapauthor [Adenilso da Silva Simão] [Adenilso Simão]
 
 \def\citenp[#1]{\cite[left=,right=][#1]}   % Bla and Foo, 2015
diff --git a/environment/headers.tex b/environment/headers.tex
index e353f3d..1227288 100644
--- a/environment/headers.tex
+++ b/environment/headers.tex
@@ -9,8 +9,8 @@
 % How numbers are shown
 \setuphead[part][placehead=yes, command=\MyPart, header=empty]
 \setuphead[chapter][sectionsegments=chapter, command=\MyChapter, header=empty]
-\setuphead[section][sectionsegments=section]
-\setuphead[subsection][sectionsegments=section:subsection]
+\setuphead[section][sectionsegments=section, style=\tfb\it]
+\setuphead[subsection][sectionsegments=section:subsection, style=\tfa\it]
 
 \define[2]\MyChapter
   {\framed[frame=off, width=max, align={flushleft,nothyphenated,verytolerant}, offset=0cm, toffset=1cm]{#1\\#2}}