mainly multi-language fixes