a few language improvements