sitemap changes post core refactor

Sitemap stuff re: #225  Two things not yet addressed are left unchecked in the issue.