Update docs and minor changes for cleaner i18n support