tweaks and extract()
Merge branch 'master' of https://github.com/Ironholds/rfc