multi language and other fixes