minor changes to extractor and analyzer