Grammar fixes and better error messages