minor changes to parser