Develop

Various tidying and i18n stuff.