updated todos
Merge branch 'i18n'