Some fixes and localization file