intl, ideas, refactoring and more