Language fixes

Improvements to the language