Fixes Sitemap bug and updates atom model