Some improvements on the language and editor