some mroe updates to the parser