Some fixes + localization