Added a parser to deal with quoted sheets and some minor improvements