small changes to parser