Address comments and add author tag.