QA issues and adding better way to handle languages.