Added comments/author tags as appropriate.