Fix line endings in the grammar
Add spans and some more error reporting