TCA optimizations
Misc updates

Localization behavior enhanced