Localization Improvements

Improvements to the localization system and its offline tools