more cosmetic changes and localization