updates in parser - fixes