improve introspection tools