minor changes
setLanguage() almost fixed