Some clean up. Named urls and url tag.