Minor tweaks in extraction algos and general interface. Hardening code for v2.6 release.