Updates to parser
merged