changed little details
changed strings to I18n