Fix detail extraction

Now to fix the docs to match the reality.  But as far as the
functionality goes, I think I'm done.