Updated URLs and some tags too