add comments n tags too