localization loading fixes and other improvements