Fixed up the parsing to deal with quotation marks