Added introspection and control; closes #22