Fix stuff and "add avatars"
Start with i18n