some language improvements