Added comment link and more things