some fixes and localization