refactoring, map folding works again, i18n prototype