Some fixes according to #18
Sitemap Added, another fix for #18