Added comments and author tags