add I18n and specs fixes