#31 adding comments + links