more fixes in language and inputs