minor changes to Parser