Text refactoring and fixes.