Performance fixes and multi-language support