Better error messages
stuff...
Spacing and commenting changes only