diff --git a/tmp/author-wins.csv b/tmp/author-wins.csv
index 7d1c4e942..abe146841 100644
--- a/tmp/author-wins.csv
+++ b/tmp/author-wins.csv
@@ -5,11 +5,11 @@ Adrian_Mariano,1990_theorem,1992_adrian,
Aidan_Thornton,2005_aidan,
Alan_De_Smet,1998_chaos,
Albert_van_der_Horst,1992_albert,
-Alex_Deckmyn,2012_deckmyn,
Alexander_Prishchepov,2014_birken,
+Alex_Deckmyn,2012_deckmyn,
Anders_Gavare,2004_gavare,
-Andrea_Marangoni,1992_marangon,
Andreas_Gustafsson,1992_gson,
+Andrea_Marangoni,1992_marangon,
Andrew_Shapiro,1994_shapiro,
Andy_Sloane,2006_sloane,
Anonymous_1984,1984_anonymous,
@@ -17,8 +17,8 @@ Anonymous_2001,2001_anonymous,
Anonymous_2004,2004_anonymous,
Anonymous_2005,2005_anon,
Anonymous_2015,2015_endoh1,
-Anthony_C._Howe,1991_ant,1992_ant,1993_ant,2004_hibachi,2005_mynx,2015_howe,
-Anton_Älgmyr,2018_algmyr,
+Anthony_C_Howe,1991_ant,1992_ant,1993_ant,2004_hibachi,2005_mynx,2015_howe,
+Anton_Algmyr,2018_algmyr,
Arch_D_Robison,1988_robison,1989_robison,2000_robison,2013_robison,
Arne_Heizmann,2005_timwi,
Baruch_Nissenbaum,1990_baruch,
@@ -28,20 +28,21 @@ Bernd_Meyer,2000_bmeyer,
Brent_Burley,2004_burley,
Brian_Westley,1987_westley,1988_westley,1989_westley,1990_westley,1991_westley,1992_westley,1994_westley,1996_westley,2001_westley,
Bruce_Holloway,1986_holloway,
+Bsoup,2011_hamaji,
Byron_Rakitzis,1990_tbr,
+Carlos_Duarte,1995_cdua,
Carl_Banks,1998_banks,
Carl_Shapiro,1985_shapiro,
-Carlos_Duarte,1995_cdua,
Cel_Skeggs,2014_skeggs,
-Chris_King,2001_ctk,
Christian_Dupont,1991_cdupont,
Christopher_Mills,1990_cmills,1993_cmills,2013_mills,2015_mills1,2015_mills2,2018_mills,2019_mills
Christopher_Night,2006_night,
-Cody_Ferguson,2018_ferguson,2020_ferguson1,2020_ferguson2,
-Col._G._L._Sicherman,1985_sicherman,
+Chris_King,2001_ctk,
+Cody_Boone_Ferguson,2018_ferguson,2020_ferguson1,2020_ferguson2,
+Col_G_L_Sicherman,1985_sicherman,
Craig_Schneiderwent,2000_schneiderwent,
Daniel_Fischer,1998_df,
-Daniel_J._Bernstein,1991_brnstnd,
+Daniel_J_Bernstein,1991_brnstnd,
Daniel_Vik,2004_vik1,2004_vik2,2005_vik,2011_vik,2012_vik,2014_vik,
Dave_Burton,2015_burton,2018_burton1,2018_burton2,2019_burton,2020_burton,
Dave_Decot,1984_decot,
@@ -59,19 +60,19 @@ Don_Dodson,1994_dodsond1,1994_dodsond2,1995_dodsond1,1995_dodsond2,
Don_Yang,2000_dhyang,2004_omoikane,2011_akari,2012_omoikane,2013_misaka,2014_sinon,2015_yang,2018_yang,2019_yang,2020_yang,
Doron_Osovlanski,1990_baruch,
Doug_Beardsley,2001_dgbeards,
-E._Jay_Berkenbilt,1993_ejb,
-Ed_Luke,1992_lush,
-Ed_Lycklama,1985_lycklama,
Edward_Giles,2018_giles,2019_giles,2020_giles,
Edward_Rosten,2001_rosten,
+Ed_Luke,1992_lush,
+Ed_Lycklama,1985_lycklama,
Eric_Marshall,1986_marshall,
Eryk_Kopczynski,2004_kopczynski,
Esko_Nuutila,1989_jar.2,
Etienne_Duble,2015_duble,2019_duble,
+E_Jay_Berkenbilt,1993_ejb,
Fabrice_Bellard,2000_bellard,2001_bellard,2018_bellard,
Ferenc_Deak,2014_deak,
Francois_Boutines,2005_boutines,
-Frans van Dorsselaer,1998_dorssel,
+Frans_van_Dorsselaer,1998_dorssel,
Freek_Wiedijk,2014_wiedijk,
Garry_Glendown,1995_garry,
Gavin_Barraclough,2004_gavin,
@@ -85,12 +86,11 @@ Ian_Collier,1992_imc,1994_imc,
Ian_Phillipps,1988_phillipps,
Ilya_Kurdyukov,2020_kurdyukov1,2020_kurdyukov2,2020_kurdyukov3,2020_kurdyukov4,
Immanuel_Herrmann,2001_herrmann1,2001_herrmann2,
-J_David_Lowe,1998_dlowe,1998_dloweneil,2000_dlowe,2011_dlowe,2012_dlowe,2013_dlowe,
Jack_Applin,1985_applin,1986_applin,1988_applin,
-James_A._Woods,1990_jaw,
+James_A_Woods,1990_jaw,
James_Bonfield,1991_rince,1993_rince,2000_rince,
Jan_Stein,1986_stein,
-Jari_Arkko,1989_jar.1,1989_jar.2,2000_jarijyrki,
+Jari_Arkko,1989_jar1,1989_jar.2,2000_jarijyrki,
Jason_Orendorff,2001_jason,
Jay_Vosburgh,1989_fubar,
Jeff_Newbern,2004_newbern,
@@ -101,11 +101,12 @@ Jim_Hague,1986_hague,
John_Dalbec,1996_dalbec,2004_jdalbec,
John_Tromp,1989_tromp,2012_tromp,
John_Williams,2001_williams,
-Jon_Thingvold,1993_jonth,1996_jonth,
Jonathan_Hoyle,2004_hoyle,
+Jon_Thingvold,1993_jonth,1996_jonth,
Joshua_Karns,2019_karns,
Jyrki_Holopainen,1993_lmfjyh,2000_jarijyrki,
-Karl_F._Fox,1990_jaw,
+J_David_Lowe,1998_dlowe,1998_dloweneil,2000_dlowe,2011_dlowe,2012_dlowe,2013_dlowe,
+Karl_F_Fox,1990_jaw,
Ken_Huffman,1996_huffman,
Kevin_Pulo,2001_kev,
Kimmo_Fredriksson,2011_fredriksson,
@@ -113,38 +114,38 @@ Larry_Jones,1990_scjones,
Larry_Wall,1986_wall,1987_wall,
Laurion_Burchall,1994_ldb,
Lennart_Augustsson,1985_august,1986_august,1996_august,
-Leonid_A._Broukhis,1993_leo,1995_leo,
+Leonid_A_Broukhis,1993_leo,1995_leo,
Lord_Zarbon,2000_briddlebane,
Maarten_Litmaath,1988_litmaath,
Marcin_Ciura,2018_ciura,2019_ciura,
Mark_Biggar,1987_biggar,
-Mary_Ann_Horton,1994_horton,
Mark_Isaak,1988_isaak,
Mark_Plummer,1993_plummer,
Mark_Schnitzius,1993_schnitzi,1994_schnitzi,1995_schnitzi,1995_vanschnitz,1998_schnitzi,2004_schnitzi,
+Mary_Ann_Horton,1994_horton,
Matt_Zucker,2011_zucker,
Maurizio_Monge,2006_monge,
Mauro_Persano,2005_persano,
Michael_Ash,2005_mikeash,
Michael_Birken,2006_birken,2013_birken,2014_birken,
-Michael_H._Pawka,1986_pawka,
+Michael_H_Pawka,1986_pawka,
Michael_Savastio,1995_savastio,
Mike_Laman,1984_laman,
-Moxen_N._Briddlebane,2000_briddlebane,
-NATORI_Shin,2000_natori,
+Moxen_N_Briddlebane,2000_briddlebane,
Nathan_Otterness,2020_otterness,
Nathan_Sidwell,1992_nathan,
+NATORI_Shin,2000_natori,
Neil_Mix,1998_dloweneil,
Nicholas_Carlini,2020_carlini,
Nick_Johnson,2004_arachnid,
Nicolas_Ollinger,2001_ollinger,
-Ondřej_Adamovský,2019_adamovsky,
+Ondrej_Adamovsky,2019_adamovsky,
Ora_Lassila,1989_jar.2,
-Oscar_Toledo_G.,2005_toledo,2006_toledo1,2006_toledo2,2006_toledo3,2011_toledo,
+Oscar_Toledo,2005_toledo,2006_toledo1,2006_toledo2,2006_toledo3,2011_toledo,
Oskar_von_der_Luehe,1989_ovdluhe,
Paul_Dale,1988_dale,
-Paul_E._Black,1989_paul,
Paul_Eggert,1990_jaw,
+Paul_E_Black,1989_paul,
Paul_Heckbert,1987_heckbert,
Peter_Eastman,2011_eastman,
Peter_J_Ruczynski,1990_pjr,
@@ -156,7 +157,7 @@ Raphael_Meyer,2006_meyer,
Raymond_Cheong,2000_primenum,2001_cheong,
Robbert_van_Renesse,1984_mullender,
Robert_Heckendorn,1985_applin,
-Roemer_B._Lievaart,1987_lievaart,1989_roemer,
+Roemer_B_Lievaart,1987_lievaart,1989_roemer,
Ron_McFarland,1996_rcm,
Sandro_Maffiodo,2014_maffiodo1,2014_maffiodo2,
Scott_Vokes,2018_vokes,
@@ -177,21 +178,20 @@ Taketo_Konno,2011_konno,2012_konno,
Teemu_Rantanen,1994_tvr,
Tero_Kivinen,1992_kivinen,
Thaddaeus_Frogley,2000_thadgavin,
-Thomas_A._Fine,1991_fine,
+Thomas_A_Fine,1991_fine,
Thomas_P_John,2000_tomx,
Thomas_Stewart,2006_stewart,
Thor_Eldby,1996_eldby,
Timo_Poikola,2018_poikola,2019_poikola,
-Tom Torfs,1998_tomtorfs,
+Tom_Torfs,1998_tomtorfs,
Tony_Finch,1998_fanf,
+Tsoj,2020_tsoj,
Tsukasa_Hamano,2012_hamano,
Uri_Goren,2011_goren,
-V._Chia,2005_chia,
Vern_Paxson,1992_vern,
Vincent_Weaver,2005_vince,
Volker_Diels-Grabsch,2019_diels-grabsch1,2019_diels-grabsch2,
+V_Chia,2005_chia,
Walter_Bright,1986_bright,
Yusuke_Endoh,2012_endoh1,2012_endoh2,2013_endoh1,2013_endoh2,2013_endoh3,2013_endoh4,2014_endoh1,2014_endoh2,2015_endoh1,2015_endoh2,2015_endoh3,2015_endoh4,2018_endoh1,2018_endoh2,2019_endoh,2020_endoh1,2020_endoh2,2020_endoh3,
Yves-Marie_Morgan,2013_morgan1,2013_morgan2,2014_morgan,
-_tsoj,2020_tsoj,
-bsoup,2011_hamaji,
diff --git a/tmp/author_handle.txt b/tmp/author_handle.txt
index 4b4432398..78ece1642 100644
--- a/tmp/author_handle.txt
+++ b/tmp/author_handle.txt
@@ -27,6 +27,7 @@ Bernd_Meyer
Brent_Burley
Brian_Westley
Bruce_Holloway
+Bsoup
Byron_Rakitzis
Carl_Banks
Carl_Shapiro
@@ -40,7 +41,7 @@ Cody_Boone_Ferguson
Col_G_L_Sicherman
Craig_Schneiderwent
Daniel_Fischer
-Daniel_J._Bernstein
+Daniel_J_Bernstein
Daniel_Vik
Dave_Burton
Dave_Decot
@@ -70,7 +71,7 @@ Etienne_Duble
Fabrice_Bellard
Ferenc_Deak
Francois_Boutines
-Frans van Dorsselaer
+Frans_van_Dorsselaer
Freek_Wiedijk
Garry_Glendown
Gavin_Barraclough
@@ -104,7 +105,7 @@ Jon_Thingvold
Jonathan_Hoyle
Joshua_Karns
Jyrki_Holopainen
-Karl_F._Fox
+Karl_F_Fox
Ken_Huffman
Kevin_Pulo
Kimmo_Fredriksson
@@ -183,6 +184,7 @@ Thor_Eldby
Timo_Poikola
Tom_Torfs
Tony_Finch
+Tsoj
Tsukasa_Hamano
Uri_Goren
V_Chia
@@ -192,5 +194,3 @@ Volker_Diels-Grabsch
Walter_Bright
Yusuke_Endoh
Yves-Marie_Morgan
-bsoup
-tsoj
diff --git a/winners.html b/winners.html
index bd846f2f0..c9487283f 100644
--- a/winners.html
+++ b/winners.html
@@ -92,7 +92,12 @@ Contest