Improvements on the language