Improved the reliability of the parser and added som more elements of the intermediate representation