Added some comments, i18n