Upgrade modules from CPAN.
Refactor data extraction system.
Wide-ranging tidy up.