fixes, localization etc