Fixed a couple bugs; i18n updates