langfix
lang fixes
merge