added links to edit, make comments, and included no/yes/extra-www