Added in affiliations; fixed history click bug