change language handling a little