Improved some of the language