Changes to expose some additional bits of information.

Signed-off-by: Jeremy Poulter <jeremy@bigjungle.net>