fixed some todos an i18n labels