Translations refactoring and some fixes.