Updates to parser and scanner - towards handling cons nodes and lookahead