Made some cleanups and fixed i18n issues