Clean up the ast a bit, add an options class, stop at first error for now