Rename some header guards
Changes to errro handling
Beginnings of a CHR reader + test code.