added custom field
cleanup and bugfix i18n