Improve authors and affiliations

This fixes #122 and #146