added some checks on users, added i18n for internationalization