Multilanguage and some improvements