Localisation and a few tweaks.