Bug fixies and SEO optimization