localization fixes wip