fix validation and added some i18n