more language improvements, dank @frankgr