Adding tags and some comments