some clean ups
merge with origin/i18n