reworking options, adding 18n