Fixes and better localization