Fix regression, add some parsing stuff
Refine error checking, validation
More raising instead of printing