More SEO fixes and some clean up.