Improved Translations and behaviour