added extraction entity
various minor improvements

renaming, etc...
updated docs