i18n and bugfixing