minor edits to parser