Added it localization, improved building