improvements on the language