Added better links to comments