More cleaning, fixes, localisations