Added more tags and some cosmetic changes