fix up extraction procedures
7 files changed