localization, validations, unit tests added