Cleaning up.  Also tweaked deduplication of authors more