Added i18n stuff, and much more...