fill in missing contributors, rearrange

(long overdue...)