Add I18n and fixes to specs