Woking on consumer and fixing minor issues in the parser