more multilingual, plus fixes #112 (with test)