Before some major code changes
Before removing the workaround perference.
Fixes and updates to localization.