Functional improvements to the parser