Some fixes after presentation to Jorge and i18n support