completed extraction, bugfixes