new options, i18n and fixed some bugs