Minor Tweaks & i18n Progress