Extractor wizard enchancements...