some fixes and adapt for multi-lang
some fixes 2