Add Mattijs and Jelte as co-authors.

Fix some more stuff.
Fix merge conflict
Affiliation added