some code reorganization
i18n reload handling added