i18n updates, continue on guide work