SEO fix and bug fixes