Added userid to comment, fixed user links in comments