- minor refactoring
- i18n;
- beans minor refactoring;