Working on some more Localization
Fixing conflicts