some fixes
localization