Added debugging code, a bit of parser cleanup, Daniel
7 files changed