Improved error messages
Whitespace fix