some language and id fixes