PageSiteMapGenerator update and other minor changes.