Grammar and language improvements